diff --git a/.classpath b/.classpath deleted file mode 100644 index 984ca24..0000000 --- a/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..d2f07e4 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +hFactions \ No newline at end of file diff --git a/.idea/artifacts/hFactions_jar.xml b/.idea/artifacts/hFactions_jar.xml new file mode 100644 index 0000000..18cf21f --- /dev/null +++ b/.idea/artifacts/hFactions_jar.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/classes/artifacts/hFactions_jar + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..2ce2490 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_6.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_6.xml new file mode 100644 index 0000000..d671bdf --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d30d09e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..52786fd --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 712cd0d..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - hFactions - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 3a21537..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/README.md b/README.md index 1e9d169..4c3a5c6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # HCRealms-Old-Core -Old core + +* Updated to maven +* Universal use now for intellij or eclipse + +* Credits to Happy | NoobDev#4539 for converting it to maven \ No newline at end of file diff --git a/dep/ExoSpigot.jar b/dep/ExoSpigot.jar new file mode 100644 index 0000000..7fbcfb1 Binary files /dev/null and b/dep/ExoSpigot.jar differ diff --git a/dep/PermissionsEx-1.22.10.jar b/dep/PermissionsEx-1.22.10.jar new file mode 100644 index 0000000..38b735b Binary files /dev/null and b/dep/PermissionsEx-1.22.10.jar differ diff --git a/dep/ProtocolLib.jar b/dep/ProtocolLib.jar new file mode 100644 index 0000000..3a79b59 Binary files /dev/null and b/dep/ProtocolLib.jar differ diff --git a/dep/Vault.jar b/dep/Vault.jar new file mode 100644 index 0000000..63fc042 Binary files /dev/null and b/dep/Vault.jar differ diff --git a/dep/lombok.jar b/dep/lombok.jar new file mode 100644 index 0000000..bf5378a Binary files /dev/null and b/dep/lombok.jar differ diff --git a/dep/worldedit-bukkit-6.0_1.jar b/dep/worldedit-bukkit-6.0_1.jar new file mode 100644 index 0000000..f623d07 Binary files /dev/null and b/dep/worldedit-bukkit-6.0_1.jar differ diff --git a/hFactions.iml b/hFactions.iml new file mode 100644 index 0000000..ad71c5a --- /dev/null +++ b/hFactions.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7015833 --- /dev/null +++ b/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + us.hcrealms.hcf + hFactions + 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + + + + org.projectlombok + lombok + 1.18.6 + provided + + + \ No newline at end of file diff --git a/src/compat/com/google/common/collect/FluentIterableCompat.java b/src/main/java/compat/com/google/common/collect/FluentIterableCompat.java similarity index 100% rename from src/compat/com/google/common/collect/FluentIterableCompat.java rename to src/main/java/compat/com/google/common/collect/FluentIterableCompat.java diff --git a/src/compat/com/google/common/collect/GuavaCompat.java b/src/main/java/compat/com/google/common/collect/GuavaCompat.java similarity index 100% rename from src/compat/com/google/common/collect/GuavaCompat.java rename to src/main/java/compat/com/google/common/collect/GuavaCompat.java diff --git a/src/gnu/trove/TByteCollection.java b/src/main/java/gnu/trove/TByteCollection.java similarity index 100% rename from src/gnu/trove/TByteCollection.java rename to src/main/java/gnu/trove/TByteCollection.java diff --git a/src/gnu/trove/TCharCollection.java b/src/main/java/gnu/trove/TCharCollection.java similarity index 100% rename from src/gnu/trove/TCharCollection.java rename to src/main/java/gnu/trove/TCharCollection.java diff --git a/src/gnu/trove/TCollections.java b/src/main/java/gnu/trove/TCollections.java similarity index 100% rename from src/gnu/trove/TCollections.java rename to src/main/java/gnu/trove/TCollections.java diff --git a/src/gnu/trove/TDecorators.java b/src/main/java/gnu/trove/TDecorators.java similarity index 100% rename from src/gnu/trove/TDecorators.java rename to src/main/java/gnu/trove/TDecorators.java diff --git a/src/gnu/trove/TDoubleCollection.java b/src/main/java/gnu/trove/TDoubleCollection.java similarity index 100% rename from src/gnu/trove/TDoubleCollection.java rename to src/main/java/gnu/trove/TDoubleCollection.java diff --git a/src/gnu/trove/TFloatCollection.java b/src/main/java/gnu/trove/TFloatCollection.java similarity index 100% rename from src/gnu/trove/TFloatCollection.java rename to src/main/java/gnu/trove/TFloatCollection.java diff --git a/src/gnu/trove/TIntCollection.java b/src/main/java/gnu/trove/TIntCollection.java similarity index 100% rename from src/gnu/trove/TIntCollection.java rename to src/main/java/gnu/trove/TIntCollection.java diff --git a/src/gnu/trove/TLongCollection.java b/src/main/java/gnu/trove/TLongCollection.java similarity index 100% rename from src/gnu/trove/TLongCollection.java rename to src/main/java/gnu/trove/TLongCollection.java diff --git a/src/gnu/trove/TShortCollection.java b/src/main/java/gnu/trove/TShortCollection.java similarity index 100% rename from src/gnu/trove/TShortCollection.java rename to src/main/java/gnu/trove/TShortCollection.java diff --git a/src/gnu/trove/Version.java b/src/main/java/gnu/trove/Version.java similarity index 100% rename from src/gnu/trove/Version.java rename to src/main/java/gnu/trove/Version.java diff --git a/src/gnu/trove/decorator/TByteByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteListDecorator.java b/src/main/java/gnu/trove/decorator/TByteListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteListDecorator.java rename to src/main/java/gnu/trove/decorator/TByteListDecorator.java diff --git a/src/gnu/trove/decorator/TByteLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TByteSetDecorator.java b/src/main/java/gnu/trove/decorator/TByteSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteSetDecorator.java rename to src/main/java/gnu/trove/decorator/TByteSetDecorator.java diff --git a/src/gnu/trove/decorator/TByteShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TByteShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TByteShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TByteShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharListDecorator.java b/src/main/java/gnu/trove/decorator/TCharListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharListDecorator.java rename to src/main/java/gnu/trove/decorator/TCharListDecorator.java diff --git a/src/gnu/trove/decorator/TCharLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TCharSetDecorator.java b/src/main/java/gnu/trove/decorator/TCharSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharSetDecorator.java rename to src/main/java/gnu/trove/decorator/TCharSetDecorator.java diff --git a/src/gnu/trove/decorator/TCharShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TCharShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TCharShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TCharShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleListDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleListDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleListDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleSetDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleSetDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleSetDecorator.java diff --git a/src/gnu/trove/decorator/TDoubleShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TDoubleShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TDoubleShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TDoubleShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatListDecorator.java b/src/main/java/gnu/trove/decorator/TFloatListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatListDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatListDecorator.java diff --git a/src/gnu/trove/decorator/TFloatLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TFloatSetDecorator.java b/src/main/java/gnu/trove/decorator/TFloatSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatSetDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatSetDecorator.java diff --git a/src/gnu/trove/decorator/TFloatShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TFloatShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TFloatShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TFloatShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntListDecorator.java b/src/main/java/gnu/trove/decorator/TIntListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntListDecorator.java rename to src/main/java/gnu/trove/decorator/TIntListDecorator.java diff --git a/src/gnu/trove/decorator/TIntLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TIntSetDecorator.java b/src/main/java/gnu/trove/decorator/TIntSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntSetDecorator.java rename to src/main/java/gnu/trove/decorator/TIntSetDecorator.java diff --git a/src/gnu/trove/decorator/TIntShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TIntShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TIntShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TIntShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongListDecorator.java b/src/main/java/gnu/trove/decorator/TLongListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongListDecorator.java rename to src/main/java/gnu/trove/decorator/TLongListDecorator.java diff --git a/src/gnu/trove/decorator/TLongLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TLongSetDecorator.java b/src/main/java/gnu/trove/decorator/TLongSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongSetDecorator.java rename to src/main/java/gnu/trove/decorator/TLongSetDecorator.java diff --git a/src/gnu/trove/decorator/TLongShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TLongShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TLongShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TLongShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TObjectShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TObjectShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TObjectShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TObjectShortMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortByteMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortByteMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortByteMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortByteMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortCharMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortCharMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortCharMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortCharMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortDoubleMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortDoubleMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortDoubleMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortDoubleMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortFloatMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortFloatMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortFloatMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortFloatMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortIntMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortIntMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortIntMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortIntMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortListDecorator.java b/src/main/java/gnu/trove/decorator/TShortListDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortListDecorator.java rename to src/main/java/gnu/trove/decorator/TShortListDecorator.java diff --git a/src/gnu/trove/decorator/TShortLongMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortLongMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortLongMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortLongMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortObjectMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortObjectMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortObjectMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortObjectMapDecorator.java diff --git a/src/gnu/trove/decorator/TShortSetDecorator.java b/src/main/java/gnu/trove/decorator/TShortSetDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortSetDecorator.java rename to src/main/java/gnu/trove/decorator/TShortSetDecorator.java diff --git a/src/gnu/trove/decorator/TShortShortMapDecorator.java b/src/main/java/gnu/trove/decorator/TShortShortMapDecorator.java similarity index 100% rename from src/gnu/trove/decorator/TShortShortMapDecorator.java rename to src/main/java/gnu/trove/decorator/TShortShortMapDecorator.java diff --git a/src/gnu/trove/function/TByteFunction.java b/src/main/java/gnu/trove/function/TByteFunction.java similarity index 100% rename from src/gnu/trove/function/TByteFunction.java rename to src/main/java/gnu/trove/function/TByteFunction.java diff --git a/src/gnu/trove/function/TCharFunction.java b/src/main/java/gnu/trove/function/TCharFunction.java similarity index 100% rename from src/gnu/trove/function/TCharFunction.java rename to src/main/java/gnu/trove/function/TCharFunction.java diff --git a/src/gnu/trove/function/TDoubleFunction.java b/src/main/java/gnu/trove/function/TDoubleFunction.java similarity index 100% rename from src/gnu/trove/function/TDoubleFunction.java rename to src/main/java/gnu/trove/function/TDoubleFunction.java diff --git a/src/gnu/trove/function/TFloatFunction.java b/src/main/java/gnu/trove/function/TFloatFunction.java similarity index 100% rename from src/gnu/trove/function/TFloatFunction.java rename to src/main/java/gnu/trove/function/TFloatFunction.java diff --git a/src/gnu/trove/function/TIntFunction.java b/src/main/java/gnu/trove/function/TIntFunction.java similarity index 100% rename from src/gnu/trove/function/TIntFunction.java rename to src/main/java/gnu/trove/function/TIntFunction.java diff --git a/src/gnu/trove/function/TLongFunction.java b/src/main/java/gnu/trove/function/TLongFunction.java similarity index 100% rename from src/gnu/trove/function/TLongFunction.java rename to src/main/java/gnu/trove/function/TLongFunction.java diff --git a/src/gnu/trove/function/TObjectFunction.java b/src/main/java/gnu/trove/function/TObjectFunction.java similarity index 100% rename from src/gnu/trove/function/TObjectFunction.java rename to src/main/java/gnu/trove/function/TObjectFunction.java diff --git a/src/gnu/trove/function/TShortFunction.java b/src/main/java/gnu/trove/function/TShortFunction.java similarity index 100% rename from src/gnu/trove/function/TShortFunction.java rename to src/main/java/gnu/trove/function/TShortFunction.java diff --git a/src/gnu/trove/impl/Constants.java b/src/main/java/gnu/trove/impl/Constants.java similarity index 100% rename from src/gnu/trove/impl/Constants.java rename to src/main/java/gnu/trove/impl/Constants.java diff --git a/src/gnu/trove/impl/HashFunctions.java b/src/main/java/gnu/trove/impl/HashFunctions.java similarity index 100% rename from src/gnu/trove/impl/HashFunctions.java rename to src/main/java/gnu/trove/impl/HashFunctions.java diff --git a/src/gnu/trove/impl/PrimeFinder.java b/src/main/java/gnu/trove/impl/PrimeFinder.java similarity index 100% rename from src/gnu/trove/impl/PrimeFinder.java rename to src/main/java/gnu/trove/impl/PrimeFinder.java diff --git a/src/gnu/trove/impl/hash/TByteByteHash.java b/src/main/java/gnu/trove/impl/hash/TByteByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteByteHash.java rename to src/main/java/gnu/trove/impl/hash/TByteByteHash.java diff --git a/src/gnu/trove/impl/hash/TByteCharHash.java b/src/main/java/gnu/trove/impl/hash/TByteCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteCharHash.java rename to src/main/java/gnu/trove/impl/hash/TByteCharHash.java diff --git a/src/gnu/trove/impl/hash/TByteDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TByteDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TByteDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TByteFloatHash.java b/src/main/java/gnu/trove/impl/hash/TByteFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TByteFloatHash.java diff --git a/src/gnu/trove/impl/hash/TByteHash.java b/src/main/java/gnu/trove/impl/hash/TByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteHash.java rename to src/main/java/gnu/trove/impl/hash/TByteHash.java diff --git a/src/gnu/trove/impl/hash/TByteIntHash.java b/src/main/java/gnu/trove/impl/hash/TByteIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteIntHash.java rename to src/main/java/gnu/trove/impl/hash/TByteIntHash.java diff --git a/src/gnu/trove/impl/hash/TByteLongHash.java b/src/main/java/gnu/trove/impl/hash/TByteLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteLongHash.java rename to src/main/java/gnu/trove/impl/hash/TByteLongHash.java diff --git a/src/gnu/trove/impl/hash/TByteShortHash.java b/src/main/java/gnu/trove/impl/hash/TByteShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TByteShortHash.java rename to src/main/java/gnu/trove/impl/hash/TByteShortHash.java diff --git a/src/gnu/trove/impl/hash/TCharByteHash.java b/src/main/java/gnu/trove/impl/hash/TCharByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharByteHash.java rename to src/main/java/gnu/trove/impl/hash/TCharByteHash.java diff --git a/src/gnu/trove/impl/hash/TCharCharHash.java b/src/main/java/gnu/trove/impl/hash/TCharCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharCharHash.java rename to src/main/java/gnu/trove/impl/hash/TCharCharHash.java diff --git a/src/gnu/trove/impl/hash/TCharDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TCharDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TCharDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TCharFloatHash.java b/src/main/java/gnu/trove/impl/hash/TCharFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TCharFloatHash.java diff --git a/src/gnu/trove/impl/hash/TCharHash.java b/src/main/java/gnu/trove/impl/hash/TCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharHash.java rename to src/main/java/gnu/trove/impl/hash/TCharHash.java diff --git a/src/gnu/trove/impl/hash/TCharIntHash.java b/src/main/java/gnu/trove/impl/hash/TCharIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharIntHash.java rename to src/main/java/gnu/trove/impl/hash/TCharIntHash.java diff --git a/src/gnu/trove/impl/hash/TCharLongHash.java b/src/main/java/gnu/trove/impl/hash/TCharLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharLongHash.java rename to src/main/java/gnu/trove/impl/hash/TCharLongHash.java diff --git a/src/gnu/trove/impl/hash/TCharShortHash.java b/src/main/java/gnu/trove/impl/hash/TCharShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCharShortHash.java rename to src/main/java/gnu/trove/impl/hash/TCharShortHash.java diff --git a/src/gnu/trove/impl/hash/TCustomObjectHash.java b/src/main/java/gnu/trove/impl/hash/TCustomObjectHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TCustomObjectHash.java rename to src/main/java/gnu/trove/impl/hash/TCustomObjectHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleByteHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleByteHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleByteHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleCharHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleCharHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleCharHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleFloatHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleFloatHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleIntHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleIntHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleIntHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleLongHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleLongHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleLongHash.java diff --git a/src/gnu/trove/impl/hash/TDoubleShortHash.java b/src/main/java/gnu/trove/impl/hash/TDoubleShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TDoubleShortHash.java rename to src/main/java/gnu/trove/impl/hash/TDoubleShortHash.java diff --git a/src/gnu/trove/impl/hash/TFloatByteHash.java b/src/main/java/gnu/trove/impl/hash/TFloatByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatByteHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatByteHash.java diff --git a/src/gnu/trove/impl/hash/TFloatCharHash.java b/src/main/java/gnu/trove/impl/hash/TFloatCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatCharHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatCharHash.java diff --git a/src/gnu/trove/impl/hash/TFloatDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TFloatDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TFloatFloatHash.java b/src/main/java/gnu/trove/impl/hash/TFloatFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatFloatHash.java diff --git a/src/gnu/trove/impl/hash/TFloatHash.java b/src/main/java/gnu/trove/impl/hash/TFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatHash.java diff --git a/src/gnu/trove/impl/hash/TFloatIntHash.java b/src/main/java/gnu/trove/impl/hash/TFloatIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatIntHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatIntHash.java diff --git a/src/gnu/trove/impl/hash/TFloatLongHash.java b/src/main/java/gnu/trove/impl/hash/TFloatLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatLongHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatLongHash.java diff --git a/src/gnu/trove/impl/hash/TFloatShortHash.java b/src/main/java/gnu/trove/impl/hash/TFloatShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TFloatShortHash.java rename to src/main/java/gnu/trove/impl/hash/TFloatShortHash.java diff --git a/src/gnu/trove/impl/hash/THash.java b/src/main/java/gnu/trove/impl/hash/THash.java similarity index 100% rename from src/gnu/trove/impl/hash/THash.java rename to src/main/java/gnu/trove/impl/hash/THash.java diff --git a/src/gnu/trove/impl/hash/THashIterator.java b/src/main/java/gnu/trove/impl/hash/THashIterator.java similarity index 100% rename from src/gnu/trove/impl/hash/THashIterator.java rename to src/main/java/gnu/trove/impl/hash/THashIterator.java diff --git a/src/gnu/trove/impl/hash/THashPrimitiveIterator.java b/src/main/java/gnu/trove/impl/hash/THashPrimitiveIterator.java similarity index 100% rename from src/gnu/trove/impl/hash/THashPrimitiveIterator.java rename to src/main/java/gnu/trove/impl/hash/THashPrimitiveIterator.java diff --git a/src/gnu/trove/impl/hash/TIntByteHash.java b/src/main/java/gnu/trove/impl/hash/TIntByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntByteHash.java rename to src/main/java/gnu/trove/impl/hash/TIntByteHash.java diff --git a/src/gnu/trove/impl/hash/TIntCharHash.java b/src/main/java/gnu/trove/impl/hash/TIntCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntCharHash.java rename to src/main/java/gnu/trove/impl/hash/TIntCharHash.java diff --git a/src/gnu/trove/impl/hash/TIntDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TIntDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TIntDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TIntFloatHash.java b/src/main/java/gnu/trove/impl/hash/TIntFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TIntFloatHash.java diff --git a/src/gnu/trove/impl/hash/TIntHash.java b/src/main/java/gnu/trove/impl/hash/TIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntHash.java rename to src/main/java/gnu/trove/impl/hash/TIntHash.java diff --git a/src/gnu/trove/impl/hash/TIntIntHash.java b/src/main/java/gnu/trove/impl/hash/TIntIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntIntHash.java rename to src/main/java/gnu/trove/impl/hash/TIntIntHash.java diff --git a/src/gnu/trove/impl/hash/TIntLongHash.java b/src/main/java/gnu/trove/impl/hash/TIntLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntLongHash.java rename to src/main/java/gnu/trove/impl/hash/TIntLongHash.java diff --git a/src/gnu/trove/impl/hash/TIntShortHash.java b/src/main/java/gnu/trove/impl/hash/TIntShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TIntShortHash.java rename to src/main/java/gnu/trove/impl/hash/TIntShortHash.java diff --git a/src/gnu/trove/impl/hash/TLongByteHash.java b/src/main/java/gnu/trove/impl/hash/TLongByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongByteHash.java rename to src/main/java/gnu/trove/impl/hash/TLongByteHash.java diff --git a/src/gnu/trove/impl/hash/TLongCharHash.java b/src/main/java/gnu/trove/impl/hash/TLongCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongCharHash.java rename to src/main/java/gnu/trove/impl/hash/TLongCharHash.java diff --git a/src/gnu/trove/impl/hash/TLongDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TLongDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TLongDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TLongFloatHash.java b/src/main/java/gnu/trove/impl/hash/TLongFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TLongFloatHash.java diff --git a/src/gnu/trove/impl/hash/TLongHash.java b/src/main/java/gnu/trove/impl/hash/TLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongHash.java rename to src/main/java/gnu/trove/impl/hash/TLongHash.java diff --git a/src/gnu/trove/impl/hash/TLongIntHash.java b/src/main/java/gnu/trove/impl/hash/TLongIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongIntHash.java rename to src/main/java/gnu/trove/impl/hash/TLongIntHash.java diff --git a/src/gnu/trove/impl/hash/TLongLongHash.java b/src/main/java/gnu/trove/impl/hash/TLongLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongLongHash.java rename to src/main/java/gnu/trove/impl/hash/TLongLongHash.java diff --git a/src/gnu/trove/impl/hash/TLongShortHash.java b/src/main/java/gnu/trove/impl/hash/TLongShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TLongShortHash.java rename to src/main/java/gnu/trove/impl/hash/TLongShortHash.java diff --git a/src/gnu/trove/impl/hash/TObjectHash.java b/src/main/java/gnu/trove/impl/hash/TObjectHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TObjectHash.java rename to src/main/java/gnu/trove/impl/hash/TObjectHash.java diff --git a/src/gnu/trove/impl/hash/TPrimitiveHash.java b/src/main/java/gnu/trove/impl/hash/TPrimitiveHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TPrimitiveHash.java rename to src/main/java/gnu/trove/impl/hash/TPrimitiveHash.java diff --git a/src/gnu/trove/impl/hash/TShortByteHash.java b/src/main/java/gnu/trove/impl/hash/TShortByteHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortByteHash.java rename to src/main/java/gnu/trove/impl/hash/TShortByteHash.java diff --git a/src/gnu/trove/impl/hash/TShortCharHash.java b/src/main/java/gnu/trove/impl/hash/TShortCharHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortCharHash.java rename to src/main/java/gnu/trove/impl/hash/TShortCharHash.java diff --git a/src/gnu/trove/impl/hash/TShortDoubleHash.java b/src/main/java/gnu/trove/impl/hash/TShortDoubleHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortDoubleHash.java rename to src/main/java/gnu/trove/impl/hash/TShortDoubleHash.java diff --git a/src/gnu/trove/impl/hash/TShortFloatHash.java b/src/main/java/gnu/trove/impl/hash/TShortFloatHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortFloatHash.java rename to src/main/java/gnu/trove/impl/hash/TShortFloatHash.java diff --git a/src/gnu/trove/impl/hash/TShortHash.java b/src/main/java/gnu/trove/impl/hash/TShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortHash.java rename to src/main/java/gnu/trove/impl/hash/TShortHash.java diff --git a/src/gnu/trove/impl/hash/TShortIntHash.java b/src/main/java/gnu/trove/impl/hash/TShortIntHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortIntHash.java rename to src/main/java/gnu/trove/impl/hash/TShortIntHash.java diff --git a/src/gnu/trove/impl/hash/TShortLongHash.java b/src/main/java/gnu/trove/impl/hash/TShortLongHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortLongHash.java rename to src/main/java/gnu/trove/impl/hash/TShortLongHash.java diff --git a/src/gnu/trove/impl/hash/TShortShortHash.java b/src/main/java/gnu/trove/impl/hash/TShortShortHash.java similarity index 100% rename from src/gnu/trove/impl/hash/TShortShortHash.java rename to src/main/java/gnu/trove/impl/hash/TShortShortHash.java diff --git a/src/gnu/trove/impl/package.html b/src/main/java/gnu/trove/impl/package.html similarity index 100% rename from src/gnu/trove/impl/package.html rename to src/main/java/gnu/trove/impl/package.html diff --git a/src/gnu/trove/impl/sync/SynchronizedCollection.java b/src/main/java/gnu/trove/impl/sync/SynchronizedCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/SynchronizedCollection.java rename to src/main/java/gnu/trove/impl/sync/SynchronizedCollection.java diff --git a/src/gnu/trove/impl/sync/SynchronizedSet.java b/src/main/java/gnu/trove/impl/sync/SynchronizedSet.java similarity index 100% rename from src/gnu/trove/impl/sync/SynchronizedSet.java rename to src/main/java/gnu/trove/impl/sync/SynchronizedSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedByteShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedByteShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedByteShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedByteShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedCharShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedCharShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedCharShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedCharShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedDoubleShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedDoubleShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedDoubleShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedFloatShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedFloatShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedFloatShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedFloatShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedIntShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedIntShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedIntShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedIntShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedLongShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedLongShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedLongShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedLongShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedObjectShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedObjectShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedObjectShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedObjectShortMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessByteList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessByteList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessByteList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessByteList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessCharList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessCharList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessCharList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessCharList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessDoubleList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessDoubleList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessDoubleList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessDoubleList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessFloatList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessFloatList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessFloatList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessFloatList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessIntList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessIntList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessIntList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessIntList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessLongList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessLongList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessLongList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessLongList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedRandomAccessShortList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessShortList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedRandomAccessShortList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedRandomAccessShortList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortByteMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortByteMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortByteMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortByteMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortCharMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortCharMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortCharMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortCharMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortCollection.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortCollection.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortCollection.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortCollection.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortDoubleMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortDoubleMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortDoubleMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortFloatMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortFloatMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortFloatMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortFloatMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortIntMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortIntMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortIntMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortIntMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortList.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortList.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortList.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortList.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortLongMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortLongMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortLongMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortLongMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortObjectMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortObjectMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortObjectMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortObjectMap.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortSet.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortSet.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortSet.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortSet.java diff --git a/src/gnu/trove/impl/sync/TSynchronizedShortShortMap.java b/src/main/java/gnu/trove/impl/sync/TSynchronizedShortShortMap.java similarity index 100% rename from src/gnu/trove/impl/sync/TSynchronizedShortShortMap.java rename to src/main/java/gnu/trove/impl/sync/TSynchronizedShortShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableByteShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableByteShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableByteShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableCharShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableCharShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableCharShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableDoubleShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableFloatShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableFloatShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableIntShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableIntShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableIntShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableLongShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableLongShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableLongShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableObjectShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableObjectShortMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessByteList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessByteList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessByteList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessByteList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessCharList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessCharList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessCharList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessCharList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessDoubleList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessDoubleList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessDoubleList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessDoubleList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessFloatList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessFloatList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessFloatList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessFloatList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessIntList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessIntList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessIntList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessIntList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessLongList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessLongList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessLongList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessLongList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessShortList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessShortList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessShortList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableRandomAccessShortList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortByteMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortByteMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortByteMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortByteMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortCharMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortCharMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortCharMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortCharMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortCollection.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortCollection.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortCollection.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortCollection.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortDoubleMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortDoubleMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortDoubleMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortDoubleMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortFloatMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortFloatMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortFloatMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortFloatMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortIntMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortIntMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortIntMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortIntMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortList.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortList.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortList.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortList.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortLongMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortLongMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortLongMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortLongMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortObjectMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortObjectMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortObjectMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortObjectMap.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortSet.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortSet.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortSet.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortSet.java diff --git a/src/gnu/trove/impl/unmodifiable/TUnmodifiableShortShortMap.java b/src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortShortMap.java similarity index 100% rename from src/gnu/trove/impl/unmodifiable/TUnmodifiableShortShortMap.java rename to src/main/java/gnu/trove/impl/unmodifiable/TUnmodifiableShortShortMap.java diff --git a/src/gnu/trove/iterator/TAdvancingIterator.java b/src/main/java/gnu/trove/iterator/TAdvancingIterator.java similarity index 100% rename from src/gnu/trove/iterator/TAdvancingIterator.java rename to src/main/java/gnu/trove/iterator/TAdvancingIterator.java diff --git a/src/gnu/trove/iterator/TByteByteIterator.java b/src/main/java/gnu/trove/iterator/TByteByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteByteIterator.java rename to src/main/java/gnu/trove/iterator/TByteByteIterator.java diff --git a/src/gnu/trove/iterator/TByteCharIterator.java b/src/main/java/gnu/trove/iterator/TByteCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteCharIterator.java rename to src/main/java/gnu/trove/iterator/TByteCharIterator.java diff --git a/src/gnu/trove/iterator/TByteDoubleIterator.java b/src/main/java/gnu/trove/iterator/TByteDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TByteDoubleIterator.java diff --git a/src/gnu/trove/iterator/TByteFloatIterator.java b/src/main/java/gnu/trove/iterator/TByteFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteFloatIterator.java rename to src/main/java/gnu/trove/iterator/TByteFloatIterator.java diff --git a/src/gnu/trove/iterator/TByteIntIterator.java b/src/main/java/gnu/trove/iterator/TByteIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteIntIterator.java rename to src/main/java/gnu/trove/iterator/TByteIntIterator.java diff --git a/src/gnu/trove/iterator/TByteIterator.java b/src/main/java/gnu/trove/iterator/TByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteIterator.java rename to src/main/java/gnu/trove/iterator/TByteIterator.java diff --git a/src/gnu/trove/iterator/TByteLongIterator.java b/src/main/java/gnu/trove/iterator/TByteLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteLongIterator.java rename to src/main/java/gnu/trove/iterator/TByteLongIterator.java diff --git a/src/gnu/trove/iterator/TByteObjectIterator.java b/src/main/java/gnu/trove/iterator/TByteObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteObjectIterator.java rename to src/main/java/gnu/trove/iterator/TByteObjectIterator.java diff --git a/src/gnu/trove/iterator/TByteShortIterator.java b/src/main/java/gnu/trove/iterator/TByteShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TByteShortIterator.java rename to src/main/java/gnu/trove/iterator/TByteShortIterator.java diff --git a/src/gnu/trove/iterator/TCharByteIterator.java b/src/main/java/gnu/trove/iterator/TCharByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharByteIterator.java rename to src/main/java/gnu/trove/iterator/TCharByteIterator.java diff --git a/src/gnu/trove/iterator/TCharCharIterator.java b/src/main/java/gnu/trove/iterator/TCharCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharCharIterator.java rename to src/main/java/gnu/trove/iterator/TCharCharIterator.java diff --git a/src/gnu/trove/iterator/TCharDoubleIterator.java b/src/main/java/gnu/trove/iterator/TCharDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TCharDoubleIterator.java diff --git a/src/gnu/trove/iterator/TCharFloatIterator.java b/src/main/java/gnu/trove/iterator/TCharFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharFloatIterator.java rename to src/main/java/gnu/trove/iterator/TCharFloatIterator.java diff --git a/src/gnu/trove/iterator/TCharIntIterator.java b/src/main/java/gnu/trove/iterator/TCharIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharIntIterator.java rename to src/main/java/gnu/trove/iterator/TCharIntIterator.java diff --git a/src/gnu/trove/iterator/TCharIterator.java b/src/main/java/gnu/trove/iterator/TCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharIterator.java rename to src/main/java/gnu/trove/iterator/TCharIterator.java diff --git a/src/gnu/trove/iterator/TCharLongIterator.java b/src/main/java/gnu/trove/iterator/TCharLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharLongIterator.java rename to src/main/java/gnu/trove/iterator/TCharLongIterator.java diff --git a/src/gnu/trove/iterator/TCharObjectIterator.java b/src/main/java/gnu/trove/iterator/TCharObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharObjectIterator.java rename to src/main/java/gnu/trove/iterator/TCharObjectIterator.java diff --git a/src/gnu/trove/iterator/TCharShortIterator.java b/src/main/java/gnu/trove/iterator/TCharShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TCharShortIterator.java rename to src/main/java/gnu/trove/iterator/TCharShortIterator.java diff --git a/src/gnu/trove/iterator/TDoubleByteIterator.java b/src/main/java/gnu/trove/iterator/TDoubleByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleByteIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleByteIterator.java diff --git a/src/gnu/trove/iterator/TDoubleCharIterator.java b/src/main/java/gnu/trove/iterator/TDoubleCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleCharIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleCharIterator.java diff --git a/src/gnu/trove/iterator/TDoubleDoubleIterator.java b/src/main/java/gnu/trove/iterator/TDoubleDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleDoubleIterator.java diff --git a/src/gnu/trove/iterator/TDoubleFloatIterator.java b/src/main/java/gnu/trove/iterator/TDoubleFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleFloatIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleFloatIterator.java diff --git a/src/gnu/trove/iterator/TDoubleIntIterator.java b/src/main/java/gnu/trove/iterator/TDoubleIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleIntIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleIntIterator.java diff --git a/src/gnu/trove/iterator/TDoubleIterator.java b/src/main/java/gnu/trove/iterator/TDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleIterator.java diff --git a/src/gnu/trove/iterator/TDoubleLongIterator.java b/src/main/java/gnu/trove/iterator/TDoubleLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleLongIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleLongIterator.java diff --git a/src/gnu/trove/iterator/TDoubleObjectIterator.java b/src/main/java/gnu/trove/iterator/TDoubleObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleObjectIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleObjectIterator.java diff --git a/src/gnu/trove/iterator/TDoubleShortIterator.java b/src/main/java/gnu/trove/iterator/TDoubleShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TDoubleShortIterator.java rename to src/main/java/gnu/trove/iterator/TDoubleShortIterator.java diff --git a/src/gnu/trove/iterator/TFloatByteIterator.java b/src/main/java/gnu/trove/iterator/TFloatByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatByteIterator.java rename to src/main/java/gnu/trove/iterator/TFloatByteIterator.java diff --git a/src/gnu/trove/iterator/TFloatCharIterator.java b/src/main/java/gnu/trove/iterator/TFloatCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatCharIterator.java rename to src/main/java/gnu/trove/iterator/TFloatCharIterator.java diff --git a/src/gnu/trove/iterator/TFloatDoubleIterator.java b/src/main/java/gnu/trove/iterator/TFloatDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TFloatDoubleIterator.java diff --git a/src/gnu/trove/iterator/TFloatFloatIterator.java b/src/main/java/gnu/trove/iterator/TFloatFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatFloatIterator.java rename to src/main/java/gnu/trove/iterator/TFloatFloatIterator.java diff --git a/src/gnu/trove/iterator/TFloatIntIterator.java b/src/main/java/gnu/trove/iterator/TFloatIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatIntIterator.java rename to src/main/java/gnu/trove/iterator/TFloatIntIterator.java diff --git a/src/gnu/trove/iterator/TFloatIterator.java b/src/main/java/gnu/trove/iterator/TFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatIterator.java rename to src/main/java/gnu/trove/iterator/TFloatIterator.java diff --git a/src/gnu/trove/iterator/TFloatLongIterator.java b/src/main/java/gnu/trove/iterator/TFloatLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatLongIterator.java rename to src/main/java/gnu/trove/iterator/TFloatLongIterator.java diff --git a/src/gnu/trove/iterator/TFloatObjectIterator.java b/src/main/java/gnu/trove/iterator/TFloatObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatObjectIterator.java rename to src/main/java/gnu/trove/iterator/TFloatObjectIterator.java diff --git a/src/gnu/trove/iterator/TFloatShortIterator.java b/src/main/java/gnu/trove/iterator/TFloatShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TFloatShortIterator.java rename to src/main/java/gnu/trove/iterator/TFloatShortIterator.java diff --git a/src/gnu/trove/iterator/TIntByteIterator.java b/src/main/java/gnu/trove/iterator/TIntByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntByteIterator.java rename to src/main/java/gnu/trove/iterator/TIntByteIterator.java diff --git a/src/gnu/trove/iterator/TIntCharIterator.java b/src/main/java/gnu/trove/iterator/TIntCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntCharIterator.java rename to src/main/java/gnu/trove/iterator/TIntCharIterator.java diff --git a/src/gnu/trove/iterator/TIntDoubleIterator.java b/src/main/java/gnu/trove/iterator/TIntDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TIntDoubleIterator.java diff --git a/src/gnu/trove/iterator/TIntFloatIterator.java b/src/main/java/gnu/trove/iterator/TIntFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntFloatIterator.java rename to src/main/java/gnu/trove/iterator/TIntFloatIterator.java diff --git a/src/gnu/trove/iterator/TIntIntIterator.java b/src/main/java/gnu/trove/iterator/TIntIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntIntIterator.java rename to src/main/java/gnu/trove/iterator/TIntIntIterator.java diff --git a/src/gnu/trove/iterator/TIntIterator.java b/src/main/java/gnu/trove/iterator/TIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntIterator.java rename to src/main/java/gnu/trove/iterator/TIntIterator.java diff --git a/src/gnu/trove/iterator/TIntLongIterator.java b/src/main/java/gnu/trove/iterator/TIntLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntLongIterator.java rename to src/main/java/gnu/trove/iterator/TIntLongIterator.java diff --git a/src/gnu/trove/iterator/TIntObjectIterator.java b/src/main/java/gnu/trove/iterator/TIntObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntObjectIterator.java rename to src/main/java/gnu/trove/iterator/TIntObjectIterator.java diff --git a/src/gnu/trove/iterator/TIntShortIterator.java b/src/main/java/gnu/trove/iterator/TIntShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIntShortIterator.java rename to src/main/java/gnu/trove/iterator/TIntShortIterator.java diff --git a/src/gnu/trove/iterator/TIterator.java b/src/main/java/gnu/trove/iterator/TIterator.java similarity index 100% rename from src/gnu/trove/iterator/TIterator.java rename to src/main/java/gnu/trove/iterator/TIterator.java diff --git a/src/gnu/trove/iterator/TLongByteIterator.java b/src/main/java/gnu/trove/iterator/TLongByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongByteIterator.java rename to src/main/java/gnu/trove/iterator/TLongByteIterator.java diff --git a/src/gnu/trove/iterator/TLongCharIterator.java b/src/main/java/gnu/trove/iterator/TLongCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongCharIterator.java rename to src/main/java/gnu/trove/iterator/TLongCharIterator.java diff --git a/src/gnu/trove/iterator/TLongDoubleIterator.java b/src/main/java/gnu/trove/iterator/TLongDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TLongDoubleIterator.java diff --git a/src/gnu/trove/iterator/TLongFloatIterator.java b/src/main/java/gnu/trove/iterator/TLongFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongFloatIterator.java rename to src/main/java/gnu/trove/iterator/TLongFloatIterator.java diff --git a/src/gnu/trove/iterator/TLongIntIterator.java b/src/main/java/gnu/trove/iterator/TLongIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongIntIterator.java rename to src/main/java/gnu/trove/iterator/TLongIntIterator.java diff --git a/src/gnu/trove/iterator/TLongIterator.java b/src/main/java/gnu/trove/iterator/TLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongIterator.java rename to src/main/java/gnu/trove/iterator/TLongIterator.java diff --git a/src/gnu/trove/iterator/TLongLongIterator.java b/src/main/java/gnu/trove/iterator/TLongLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongLongIterator.java rename to src/main/java/gnu/trove/iterator/TLongLongIterator.java diff --git a/src/gnu/trove/iterator/TLongObjectIterator.java b/src/main/java/gnu/trove/iterator/TLongObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongObjectIterator.java rename to src/main/java/gnu/trove/iterator/TLongObjectIterator.java diff --git a/src/gnu/trove/iterator/TLongShortIterator.java b/src/main/java/gnu/trove/iterator/TLongShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TLongShortIterator.java rename to src/main/java/gnu/trove/iterator/TLongShortIterator.java diff --git a/src/gnu/trove/iterator/TObjectByteIterator.java b/src/main/java/gnu/trove/iterator/TObjectByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectByteIterator.java rename to src/main/java/gnu/trove/iterator/TObjectByteIterator.java diff --git a/src/gnu/trove/iterator/TObjectCharIterator.java b/src/main/java/gnu/trove/iterator/TObjectCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectCharIterator.java rename to src/main/java/gnu/trove/iterator/TObjectCharIterator.java diff --git a/src/gnu/trove/iterator/TObjectDoubleIterator.java b/src/main/java/gnu/trove/iterator/TObjectDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TObjectDoubleIterator.java diff --git a/src/gnu/trove/iterator/TObjectFloatIterator.java b/src/main/java/gnu/trove/iterator/TObjectFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectFloatIterator.java rename to src/main/java/gnu/trove/iterator/TObjectFloatIterator.java diff --git a/src/gnu/trove/iterator/TObjectIntIterator.java b/src/main/java/gnu/trove/iterator/TObjectIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectIntIterator.java rename to src/main/java/gnu/trove/iterator/TObjectIntIterator.java diff --git a/src/gnu/trove/iterator/TObjectLongIterator.java b/src/main/java/gnu/trove/iterator/TObjectLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectLongIterator.java rename to src/main/java/gnu/trove/iterator/TObjectLongIterator.java diff --git a/src/gnu/trove/iterator/TObjectShortIterator.java b/src/main/java/gnu/trove/iterator/TObjectShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TObjectShortIterator.java rename to src/main/java/gnu/trove/iterator/TObjectShortIterator.java diff --git a/src/gnu/trove/iterator/TPrimitiveIterator.java b/src/main/java/gnu/trove/iterator/TPrimitiveIterator.java similarity index 100% rename from src/gnu/trove/iterator/TPrimitiveIterator.java rename to src/main/java/gnu/trove/iterator/TPrimitiveIterator.java diff --git a/src/gnu/trove/iterator/TShortByteIterator.java b/src/main/java/gnu/trove/iterator/TShortByteIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortByteIterator.java rename to src/main/java/gnu/trove/iterator/TShortByteIterator.java diff --git a/src/gnu/trove/iterator/TShortCharIterator.java b/src/main/java/gnu/trove/iterator/TShortCharIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortCharIterator.java rename to src/main/java/gnu/trove/iterator/TShortCharIterator.java diff --git a/src/gnu/trove/iterator/TShortDoubleIterator.java b/src/main/java/gnu/trove/iterator/TShortDoubleIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortDoubleIterator.java rename to src/main/java/gnu/trove/iterator/TShortDoubleIterator.java diff --git a/src/gnu/trove/iterator/TShortFloatIterator.java b/src/main/java/gnu/trove/iterator/TShortFloatIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortFloatIterator.java rename to src/main/java/gnu/trove/iterator/TShortFloatIterator.java diff --git a/src/gnu/trove/iterator/TShortIntIterator.java b/src/main/java/gnu/trove/iterator/TShortIntIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortIntIterator.java rename to src/main/java/gnu/trove/iterator/TShortIntIterator.java diff --git a/src/gnu/trove/iterator/TShortIterator.java b/src/main/java/gnu/trove/iterator/TShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortIterator.java rename to src/main/java/gnu/trove/iterator/TShortIterator.java diff --git a/src/gnu/trove/iterator/TShortLongIterator.java b/src/main/java/gnu/trove/iterator/TShortLongIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortLongIterator.java rename to src/main/java/gnu/trove/iterator/TShortLongIterator.java diff --git a/src/gnu/trove/iterator/TShortObjectIterator.java b/src/main/java/gnu/trove/iterator/TShortObjectIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortObjectIterator.java rename to src/main/java/gnu/trove/iterator/TShortObjectIterator.java diff --git a/src/gnu/trove/iterator/TShortShortIterator.java b/src/main/java/gnu/trove/iterator/TShortShortIterator.java similarity index 100% rename from src/gnu/trove/iterator/TShortShortIterator.java rename to src/main/java/gnu/trove/iterator/TShortShortIterator.java diff --git a/src/gnu/trove/iterator/hash/TObjectHashIterator.java b/src/main/java/gnu/trove/iterator/hash/TObjectHashIterator.java similarity index 100% rename from src/gnu/trove/iterator/hash/TObjectHashIterator.java rename to src/main/java/gnu/trove/iterator/hash/TObjectHashIterator.java diff --git a/src/gnu/trove/list/TByteList.java b/src/main/java/gnu/trove/list/TByteList.java similarity index 100% rename from src/gnu/trove/list/TByteList.java rename to src/main/java/gnu/trove/list/TByteList.java diff --git a/src/gnu/trove/list/TCharList.java b/src/main/java/gnu/trove/list/TCharList.java similarity index 100% rename from src/gnu/trove/list/TCharList.java rename to src/main/java/gnu/trove/list/TCharList.java diff --git a/src/gnu/trove/list/TDoubleList.java b/src/main/java/gnu/trove/list/TDoubleList.java similarity index 100% rename from src/gnu/trove/list/TDoubleList.java rename to src/main/java/gnu/trove/list/TDoubleList.java diff --git a/src/gnu/trove/list/TFloatList.java b/src/main/java/gnu/trove/list/TFloatList.java similarity index 100% rename from src/gnu/trove/list/TFloatList.java rename to src/main/java/gnu/trove/list/TFloatList.java diff --git a/src/gnu/trove/list/TIntList.java b/src/main/java/gnu/trove/list/TIntList.java similarity index 100% rename from src/gnu/trove/list/TIntList.java rename to src/main/java/gnu/trove/list/TIntList.java diff --git a/src/gnu/trove/list/TLinkable.java b/src/main/java/gnu/trove/list/TLinkable.java similarity index 100% rename from src/gnu/trove/list/TLinkable.java rename to src/main/java/gnu/trove/list/TLinkable.java diff --git a/src/gnu/trove/list/TLinkableAdapter.java b/src/main/java/gnu/trove/list/TLinkableAdapter.java similarity index 100% rename from src/gnu/trove/list/TLinkableAdapter.java rename to src/main/java/gnu/trove/list/TLinkableAdapter.java diff --git a/src/gnu/trove/list/TLongList.java b/src/main/java/gnu/trove/list/TLongList.java similarity index 100% rename from src/gnu/trove/list/TLongList.java rename to src/main/java/gnu/trove/list/TLongList.java diff --git a/src/gnu/trove/list/TShortList.java b/src/main/java/gnu/trove/list/TShortList.java similarity index 100% rename from src/gnu/trove/list/TShortList.java rename to src/main/java/gnu/trove/list/TShortList.java diff --git a/src/gnu/trove/list/array/TByteArrayList.java b/src/main/java/gnu/trove/list/array/TByteArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TByteArrayList.java rename to src/main/java/gnu/trove/list/array/TByteArrayList.java diff --git a/src/gnu/trove/list/array/TCharArrayList.java b/src/main/java/gnu/trove/list/array/TCharArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TCharArrayList.java rename to src/main/java/gnu/trove/list/array/TCharArrayList.java diff --git a/src/gnu/trove/list/array/TDoubleArrayList.java b/src/main/java/gnu/trove/list/array/TDoubleArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TDoubleArrayList.java rename to src/main/java/gnu/trove/list/array/TDoubleArrayList.java diff --git a/src/gnu/trove/list/array/TFloatArrayList.java b/src/main/java/gnu/trove/list/array/TFloatArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TFloatArrayList.java rename to src/main/java/gnu/trove/list/array/TFloatArrayList.java diff --git a/src/gnu/trove/list/array/TIntArrayList.java b/src/main/java/gnu/trove/list/array/TIntArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TIntArrayList.java rename to src/main/java/gnu/trove/list/array/TIntArrayList.java diff --git a/src/gnu/trove/list/array/TLongArrayList.java b/src/main/java/gnu/trove/list/array/TLongArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TLongArrayList.java rename to src/main/java/gnu/trove/list/array/TLongArrayList.java diff --git a/src/gnu/trove/list/array/TShortArrayList.java b/src/main/java/gnu/trove/list/array/TShortArrayList.java similarity index 100% rename from src/gnu/trove/list/array/TShortArrayList.java rename to src/main/java/gnu/trove/list/array/TShortArrayList.java diff --git a/src/gnu/trove/list/linked/TByteLinkedList.java b/src/main/java/gnu/trove/list/linked/TByteLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TByteLinkedList.java rename to src/main/java/gnu/trove/list/linked/TByteLinkedList.java diff --git a/src/gnu/trove/list/linked/TCharLinkedList.java b/src/main/java/gnu/trove/list/linked/TCharLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TCharLinkedList.java rename to src/main/java/gnu/trove/list/linked/TCharLinkedList.java diff --git a/src/gnu/trove/list/linked/TDoubleLinkedList.java b/src/main/java/gnu/trove/list/linked/TDoubleLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TDoubleLinkedList.java rename to src/main/java/gnu/trove/list/linked/TDoubleLinkedList.java diff --git a/src/gnu/trove/list/linked/TFloatLinkedList.java b/src/main/java/gnu/trove/list/linked/TFloatLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TFloatLinkedList.java rename to src/main/java/gnu/trove/list/linked/TFloatLinkedList.java diff --git a/src/gnu/trove/list/linked/TIntLinkedList.java b/src/main/java/gnu/trove/list/linked/TIntLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TIntLinkedList.java rename to src/main/java/gnu/trove/list/linked/TIntLinkedList.java diff --git a/src/gnu/trove/list/linked/TLinkedList.java b/src/main/java/gnu/trove/list/linked/TLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TLinkedList.java rename to src/main/java/gnu/trove/list/linked/TLinkedList.java diff --git a/src/gnu/trove/list/linked/TLongLinkedList.java b/src/main/java/gnu/trove/list/linked/TLongLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TLongLinkedList.java rename to src/main/java/gnu/trove/list/linked/TLongLinkedList.java diff --git a/src/gnu/trove/list/linked/TShortLinkedList.java b/src/main/java/gnu/trove/list/linked/TShortLinkedList.java similarity index 100% rename from src/gnu/trove/list/linked/TShortLinkedList.java rename to src/main/java/gnu/trove/list/linked/TShortLinkedList.java diff --git a/src/gnu/trove/map/TByteByteMap.java b/src/main/java/gnu/trove/map/TByteByteMap.java similarity index 100% rename from src/gnu/trove/map/TByteByteMap.java rename to src/main/java/gnu/trove/map/TByteByteMap.java diff --git a/src/gnu/trove/map/TByteCharMap.java b/src/main/java/gnu/trove/map/TByteCharMap.java similarity index 100% rename from src/gnu/trove/map/TByteCharMap.java rename to src/main/java/gnu/trove/map/TByteCharMap.java diff --git a/src/gnu/trove/map/TByteDoubleMap.java b/src/main/java/gnu/trove/map/TByteDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TByteDoubleMap.java rename to src/main/java/gnu/trove/map/TByteDoubleMap.java diff --git a/src/gnu/trove/map/TByteFloatMap.java b/src/main/java/gnu/trove/map/TByteFloatMap.java similarity index 100% rename from src/gnu/trove/map/TByteFloatMap.java rename to src/main/java/gnu/trove/map/TByteFloatMap.java diff --git a/src/gnu/trove/map/TByteIntMap.java b/src/main/java/gnu/trove/map/TByteIntMap.java similarity index 100% rename from src/gnu/trove/map/TByteIntMap.java rename to src/main/java/gnu/trove/map/TByteIntMap.java diff --git a/src/gnu/trove/map/TByteLongMap.java b/src/main/java/gnu/trove/map/TByteLongMap.java similarity index 100% rename from src/gnu/trove/map/TByteLongMap.java rename to src/main/java/gnu/trove/map/TByteLongMap.java diff --git a/src/gnu/trove/map/TByteObjectMap.java b/src/main/java/gnu/trove/map/TByteObjectMap.java similarity index 100% rename from src/gnu/trove/map/TByteObjectMap.java rename to src/main/java/gnu/trove/map/TByteObjectMap.java diff --git a/src/gnu/trove/map/TByteShortMap.java b/src/main/java/gnu/trove/map/TByteShortMap.java similarity index 100% rename from src/gnu/trove/map/TByteShortMap.java rename to src/main/java/gnu/trove/map/TByteShortMap.java diff --git a/src/gnu/trove/map/TCharByteMap.java b/src/main/java/gnu/trove/map/TCharByteMap.java similarity index 100% rename from src/gnu/trove/map/TCharByteMap.java rename to src/main/java/gnu/trove/map/TCharByteMap.java diff --git a/src/gnu/trove/map/TCharCharMap.java b/src/main/java/gnu/trove/map/TCharCharMap.java similarity index 100% rename from src/gnu/trove/map/TCharCharMap.java rename to src/main/java/gnu/trove/map/TCharCharMap.java diff --git a/src/gnu/trove/map/TCharDoubleMap.java b/src/main/java/gnu/trove/map/TCharDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TCharDoubleMap.java rename to src/main/java/gnu/trove/map/TCharDoubleMap.java diff --git a/src/gnu/trove/map/TCharFloatMap.java b/src/main/java/gnu/trove/map/TCharFloatMap.java similarity index 100% rename from src/gnu/trove/map/TCharFloatMap.java rename to src/main/java/gnu/trove/map/TCharFloatMap.java diff --git a/src/gnu/trove/map/TCharIntMap.java b/src/main/java/gnu/trove/map/TCharIntMap.java similarity index 100% rename from src/gnu/trove/map/TCharIntMap.java rename to src/main/java/gnu/trove/map/TCharIntMap.java diff --git a/src/gnu/trove/map/TCharLongMap.java b/src/main/java/gnu/trove/map/TCharLongMap.java similarity index 100% rename from src/gnu/trove/map/TCharLongMap.java rename to src/main/java/gnu/trove/map/TCharLongMap.java diff --git a/src/gnu/trove/map/TCharObjectMap.java b/src/main/java/gnu/trove/map/TCharObjectMap.java similarity index 100% rename from src/gnu/trove/map/TCharObjectMap.java rename to src/main/java/gnu/trove/map/TCharObjectMap.java diff --git a/src/gnu/trove/map/TCharShortMap.java b/src/main/java/gnu/trove/map/TCharShortMap.java similarity index 100% rename from src/gnu/trove/map/TCharShortMap.java rename to src/main/java/gnu/trove/map/TCharShortMap.java diff --git a/src/gnu/trove/map/TDoubleByteMap.java b/src/main/java/gnu/trove/map/TDoubleByteMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleByteMap.java rename to src/main/java/gnu/trove/map/TDoubleByteMap.java diff --git a/src/gnu/trove/map/TDoubleCharMap.java b/src/main/java/gnu/trove/map/TDoubleCharMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleCharMap.java rename to src/main/java/gnu/trove/map/TDoubleCharMap.java diff --git a/src/gnu/trove/map/TDoubleDoubleMap.java b/src/main/java/gnu/trove/map/TDoubleDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleDoubleMap.java rename to src/main/java/gnu/trove/map/TDoubleDoubleMap.java diff --git a/src/gnu/trove/map/TDoubleFloatMap.java b/src/main/java/gnu/trove/map/TDoubleFloatMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleFloatMap.java rename to src/main/java/gnu/trove/map/TDoubleFloatMap.java diff --git a/src/gnu/trove/map/TDoubleIntMap.java b/src/main/java/gnu/trove/map/TDoubleIntMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleIntMap.java rename to src/main/java/gnu/trove/map/TDoubleIntMap.java diff --git a/src/gnu/trove/map/TDoubleLongMap.java b/src/main/java/gnu/trove/map/TDoubleLongMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleLongMap.java rename to src/main/java/gnu/trove/map/TDoubleLongMap.java diff --git a/src/gnu/trove/map/TDoubleObjectMap.java b/src/main/java/gnu/trove/map/TDoubleObjectMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleObjectMap.java rename to src/main/java/gnu/trove/map/TDoubleObjectMap.java diff --git a/src/gnu/trove/map/TDoubleShortMap.java b/src/main/java/gnu/trove/map/TDoubleShortMap.java similarity index 100% rename from src/gnu/trove/map/TDoubleShortMap.java rename to src/main/java/gnu/trove/map/TDoubleShortMap.java diff --git a/src/gnu/trove/map/TFloatByteMap.java b/src/main/java/gnu/trove/map/TFloatByteMap.java similarity index 100% rename from src/gnu/trove/map/TFloatByteMap.java rename to src/main/java/gnu/trove/map/TFloatByteMap.java diff --git a/src/gnu/trove/map/TFloatCharMap.java b/src/main/java/gnu/trove/map/TFloatCharMap.java similarity index 100% rename from src/gnu/trove/map/TFloatCharMap.java rename to src/main/java/gnu/trove/map/TFloatCharMap.java diff --git a/src/gnu/trove/map/TFloatDoubleMap.java b/src/main/java/gnu/trove/map/TFloatDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TFloatDoubleMap.java rename to src/main/java/gnu/trove/map/TFloatDoubleMap.java diff --git a/src/gnu/trove/map/TFloatFloatMap.java b/src/main/java/gnu/trove/map/TFloatFloatMap.java similarity index 100% rename from src/gnu/trove/map/TFloatFloatMap.java rename to src/main/java/gnu/trove/map/TFloatFloatMap.java diff --git a/src/gnu/trove/map/TFloatIntMap.java b/src/main/java/gnu/trove/map/TFloatIntMap.java similarity index 100% rename from src/gnu/trove/map/TFloatIntMap.java rename to src/main/java/gnu/trove/map/TFloatIntMap.java diff --git a/src/gnu/trove/map/TFloatLongMap.java b/src/main/java/gnu/trove/map/TFloatLongMap.java similarity index 100% rename from src/gnu/trove/map/TFloatLongMap.java rename to src/main/java/gnu/trove/map/TFloatLongMap.java diff --git a/src/gnu/trove/map/TFloatObjectMap.java b/src/main/java/gnu/trove/map/TFloatObjectMap.java similarity index 100% rename from src/gnu/trove/map/TFloatObjectMap.java rename to src/main/java/gnu/trove/map/TFloatObjectMap.java diff --git a/src/gnu/trove/map/TFloatShortMap.java b/src/main/java/gnu/trove/map/TFloatShortMap.java similarity index 100% rename from src/gnu/trove/map/TFloatShortMap.java rename to src/main/java/gnu/trove/map/TFloatShortMap.java diff --git a/src/gnu/trove/map/TIntByteMap.java b/src/main/java/gnu/trove/map/TIntByteMap.java similarity index 100% rename from src/gnu/trove/map/TIntByteMap.java rename to src/main/java/gnu/trove/map/TIntByteMap.java diff --git a/src/gnu/trove/map/TIntCharMap.java b/src/main/java/gnu/trove/map/TIntCharMap.java similarity index 100% rename from src/gnu/trove/map/TIntCharMap.java rename to src/main/java/gnu/trove/map/TIntCharMap.java diff --git a/src/gnu/trove/map/TIntDoubleMap.java b/src/main/java/gnu/trove/map/TIntDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TIntDoubleMap.java rename to src/main/java/gnu/trove/map/TIntDoubleMap.java diff --git a/src/gnu/trove/map/TIntFloatMap.java b/src/main/java/gnu/trove/map/TIntFloatMap.java similarity index 100% rename from src/gnu/trove/map/TIntFloatMap.java rename to src/main/java/gnu/trove/map/TIntFloatMap.java diff --git a/src/gnu/trove/map/TIntIntMap.java b/src/main/java/gnu/trove/map/TIntIntMap.java similarity index 100% rename from src/gnu/trove/map/TIntIntMap.java rename to src/main/java/gnu/trove/map/TIntIntMap.java diff --git a/src/gnu/trove/map/TIntLongMap.java b/src/main/java/gnu/trove/map/TIntLongMap.java similarity index 100% rename from src/gnu/trove/map/TIntLongMap.java rename to src/main/java/gnu/trove/map/TIntLongMap.java diff --git a/src/gnu/trove/map/TIntObjectMap.java b/src/main/java/gnu/trove/map/TIntObjectMap.java similarity index 100% rename from src/gnu/trove/map/TIntObjectMap.java rename to src/main/java/gnu/trove/map/TIntObjectMap.java diff --git a/src/gnu/trove/map/TIntShortMap.java b/src/main/java/gnu/trove/map/TIntShortMap.java similarity index 100% rename from src/gnu/trove/map/TIntShortMap.java rename to src/main/java/gnu/trove/map/TIntShortMap.java diff --git a/src/gnu/trove/map/TLongByteMap.java b/src/main/java/gnu/trove/map/TLongByteMap.java similarity index 100% rename from src/gnu/trove/map/TLongByteMap.java rename to src/main/java/gnu/trove/map/TLongByteMap.java diff --git a/src/gnu/trove/map/TLongCharMap.java b/src/main/java/gnu/trove/map/TLongCharMap.java similarity index 100% rename from src/gnu/trove/map/TLongCharMap.java rename to src/main/java/gnu/trove/map/TLongCharMap.java diff --git a/src/gnu/trove/map/TLongDoubleMap.java b/src/main/java/gnu/trove/map/TLongDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TLongDoubleMap.java rename to src/main/java/gnu/trove/map/TLongDoubleMap.java diff --git a/src/gnu/trove/map/TLongFloatMap.java b/src/main/java/gnu/trove/map/TLongFloatMap.java similarity index 100% rename from src/gnu/trove/map/TLongFloatMap.java rename to src/main/java/gnu/trove/map/TLongFloatMap.java diff --git a/src/gnu/trove/map/TLongIntMap.java b/src/main/java/gnu/trove/map/TLongIntMap.java similarity index 100% rename from src/gnu/trove/map/TLongIntMap.java rename to src/main/java/gnu/trove/map/TLongIntMap.java diff --git a/src/gnu/trove/map/TLongLongMap.java b/src/main/java/gnu/trove/map/TLongLongMap.java similarity index 100% rename from src/gnu/trove/map/TLongLongMap.java rename to src/main/java/gnu/trove/map/TLongLongMap.java diff --git a/src/gnu/trove/map/TLongObjectMap.java b/src/main/java/gnu/trove/map/TLongObjectMap.java similarity index 100% rename from src/gnu/trove/map/TLongObjectMap.java rename to src/main/java/gnu/trove/map/TLongObjectMap.java diff --git a/src/gnu/trove/map/TLongShortMap.java b/src/main/java/gnu/trove/map/TLongShortMap.java similarity index 100% rename from src/gnu/trove/map/TLongShortMap.java rename to src/main/java/gnu/trove/map/TLongShortMap.java diff --git a/src/gnu/trove/map/TMap.java b/src/main/java/gnu/trove/map/TMap.java similarity index 100% rename from src/gnu/trove/map/TMap.java rename to src/main/java/gnu/trove/map/TMap.java diff --git a/src/gnu/trove/map/TObjectByteMap.java b/src/main/java/gnu/trove/map/TObjectByteMap.java similarity index 100% rename from src/gnu/trove/map/TObjectByteMap.java rename to src/main/java/gnu/trove/map/TObjectByteMap.java diff --git a/src/gnu/trove/map/TObjectCharMap.java b/src/main/java/gnu/trove/map/TObjectCharMap.java similarity index 100% rename from src/gnu/trove/map/TObjectCharMap.java rename to src/main/java/gnu/trove/map/TObjectCharMap.java diff --git a/src/gnu/trove/map/TObjectDoubleMap.java b/src/main/java/gnu/trove/map/TObjectDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TObjectDoubleMap.java rename to src/main/java/gnu/trove/map/TObjectDoubleMap.java diff --git a/src/gnu/trove/map/TObjectFloatMap.java b/src/main/java/gnu/trove/map/TObjectFloatMap.java similarity index 100% rename from src/gnu/trove/map/TObjectFloatMap.java rename to src/main/java/gnu/trove/map/TObjectFloatMap.java diff --git a/src/gnu/trove/map/TObjectIntMap.java b/src/main/java/gnu/trove/map/TObjectIntMap.java similarity index 100% rename from src/gnu/trove/map/TObjectIntMap.java rename to src/main/java/gnu/trove/map/TObjectIntMap.java diff --git a/src/gnu/trove/map/TObjectLongMap.java b/src/main/java/gnu/trove/map/TObjectLongMap.java similarity index 100% rename from src/gnu/trove/map/TObjectLongMap.java rename to src/main/java/gnu/trove/map/TObjectLongMap.java diff --git a/src/gnu/trove/map/TObjectShortMap.java b/src/main/java/gnu/trove/map/TObjectShortMap.java similarity index 100% rename from src/gnu/trove/map/TObjectShortMap.java rename to src/main/java/gnu/trove/map/TObjectShortMap.java diff --git a/src/gnu/trove/map/TShortByteMap.java b/src/main/java/gnu/trove/map/TShortByteMap.java similarity index 100% rename from src/gnu/trove/map/TShortByteMap.java rename to src/main/java/gnu/trove/map/TShortByteMap.java diff --git a/src/gnu/trove/map/TShortCharMap.java b/src/main/java/gnu/trove/map/TShortCharMap.java similarity index 100% rename from src/gnu/trove/map/TShortCharMap.java rename to src/main/java/gnu/trove/map/TShortCharMap.java diff --git a/src/gnu/trove/map/TShortDoubleMap.java b/src/main/java/gnu/trove/map/TShortDoubleMap.java similarity index 100% rename from src/gnu/trove/map/TShortDoubleMap.java rename to src/main/java/gnu/trove/map/TShortDoubleMap.java diff --git a/src/gnu/trove/map/TShortFloatMap.java b/src/main/java/gnu/trove/map/TShortFloatMap.java similarity index 100% rename from src/gnu/trove/map/TShortFloatMap.java rename to src/main/java/gnu/trove/map/TShortFloatMap.java diff --git a/src/gnu/trove/map/TShortIntMap.java b/src/main/java/gnu/trove/map/TShortIntMap.java similarity index 100% rename from src/gnu/trove/map/TShortIntMap.java rename to src/main/java/gnu/trove/map/TShortIntMap.java diff --git a/src/gnu/trove/map/TShortLongMap.java b/src/main/java/gnu/trove/map/TShortLongMap.java similarity index 100% rename from src/gnu/trove/map/TShortLongMap.java rename to src/main/java/gnu/trove/map/TShortLongMap.java diff --git a/src/gnu/trove/map/TShortObjectMap.java b/src/main/java/gnu/trove/map/TShortObjectMap.java similarity index 100% rename from src/gnu/trove/map/TShortObjectMap.java rename to src/main/java/gnu/trove/map/TShortObjectMap.java diff --git a/src/gnu/trove/map/TShortShortMap.java b/src/main/java/gnu/trove/map/TShortShortMap.java similarity index 100% rename from src/gnu/trove/map/TShortShortMap.java rename to src/main/java/gnu/trove/map/TShortShortMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectByteCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectByteCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectByteCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectByteCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectCharCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectCharCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectCharCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectCharCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectDoubleCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectDoubleCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectDoubleCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectDoubleCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectFloatCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectFloatCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectFloatCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectFloatCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectIntCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectIntCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectIntCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectIntCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectLongCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectLongCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectLongCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectLongCustomHashMap.java diff --git a/src/gnu/trove/map/custom_hash/TObjectShortCustomHashMap.java b/src/main/java/gnu/trove/map/custom_hash/TObjectShortCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/custom_hash/TObjectShortCustomHashMap.java rename to src/main/java/gnu/trove/map/custom_hash/TObjectShortCustomHashMap.java diff --git a/src/gnu/trove/map/hash/TByteByteHashMap.java b/src/main/java/gnu/trove/map/hash/TByteByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteByteHashMap.java diff --git a/src/gnu/trove/map/hash/TByteCharHashMap.java b/src/main/java/gnu/trove/map/hash/TByteCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteCharHashMap.java diff --git a/src/gnu/trove/map/hash/TByteDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TByteDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TByteFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TByteFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TByteIntHashMap.java b/src/main/java/gnu/trove/map/hash/TByteIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteIntHashMap.java diff --git a/src/gnu/trove/map/hash/TByteLongHashMap.java b/src/main/java/gnu/trove/map/hash/TByteLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteLongHashMap.java diff --git a/src/gnu/trove/map/hash/TByteObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TByteObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TByteShortHashMap.java b/src/main/java/gnu/trove/map/hash/TByteShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TByteShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TByteShortHashMap.java diff --git a/src/gnu/trove/map/hash/TCharByteHashMap.java b/src/main/java/gnu/trove/map/hash/TCharByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharByteHashMap.java diff --git a/src/gnu/trove/map/hash/TCharCharHashMap.java b/src/main/java/gnu/trove/map/hash/TCharCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharCharHashMap.java diff --git a/src/gnu/trove/map/hash/TCharDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TCharDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TCharFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TCharFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TCharIntHashMap.java b/src/main/java/gnu/trove/map/hash/TCharIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharIntHashMap.java diff --git a/src/gnu/trove/map/hash/TCharLongHashMap.java b/src/main/java/gnu/trove/map/hash/TCharLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharLongHashMap.java diff --git a/src/gnu/trove/map/hash/TCharObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TCharObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TCharShortHashMap.java b/src/main/java/gnu/trove/map/hash/TCharShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCharShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TCharShortHashMap.java diff --git a/src/gnu/trove/map/hash/TCustomHashMap.java b/src/main/java/gnu/trove/map/hash/TCustomHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TCustomHashMap.java rename to src/main/java/gnu/trove/map/hash/TCustomHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleByteHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleByteHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleCharHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleCharHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleIntHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleIntHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleLongHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleLongHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TDoubleShortHashMap.java b/src/main/java/gnu/trove/map/hash/TDoubleShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TDoubleShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TDoubleShortHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatByteHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatByteHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatCharHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatCharHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatIntHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatIntHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatLongHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatLongHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TFloatShortHashMap.java b/src/main/java/gnu/trove/map/hash/TFloatShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TFloatShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TFloatShortHashMap.java diff --git a/src/gnu/trove/map/hash/THashMap.java b/src/main/java/gnu/trove/map/hash/THashMap.java similarity index 100% rename from src/gnu/trove/map/hash/THashMap.java rename to src/main/java/gnu/trove/map/hash/THashMap.java diff --git a/src/gnu/trove/map/hash/TIntByteHashMap.java b/src/main/java/gnu/trove/map/hash/TIntByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntByteHashMap.java diff --git a/src/gnu/trove/map/hash/TIntCharHashMap.java b/src/main/java/gnu/trove/map/hash/TIntCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntCharHashMap.java diff --git a/src/gnu/trove/map/hash/TIntDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TIntDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TIntFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TIntFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TIntIntHashMap.java b/src/main/java/gnu/trove/map/hash/TIntIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntIntHashMap.java diff --git a/src/gnu/trove/map/hash/TIntLongHashMap.java b/src/main/java/gnu/trove/map/hash/TIntLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntLongHashMap.java diff --git a/src/gnu/trove/map/hash/TIntObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TIntObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TIntShortHashMap.java b/src/main/java/gnu/trove/map/hash/TIntShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TIntShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TIntShortHashMap.java diff --git a/src/gnu/trove/map/hash/TLongByteHashMap.java b/src/main/java/gnu/trove/map/hash/TLongByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongByteHashMap.java diff --git a/src/gnu/trove/map/hash/TLongCharHashMap.java b/src/main/java/gnu/trove/map/hash/TLongCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongCharHashMap.java diff --git a/src/gnu/trove/map/hash/TLongDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TLongDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TLongFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TLongFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TLongIntHashMap.java b/src/main/java/gnu/trove/map/hash/TLongIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongIntHashMap.java diff --git a/src/gnu/trove/map/hash/TLongLongHashMap.java b/src/main/java/gnu/trove/map/hash/TLongLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongLongHashMap.java diff --git a/src/gnu/trove/map/hash/TLongObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TLongObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TLongShortHashMap.java b/src/main/java/gnu/trove/map/hash/TLongShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TLongShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TLongShortHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectByteHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectByteHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectCharHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectCharHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectIntHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectIntHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectLongHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectLongHashMap.java diff --git a/src/gnu/trove/map/hash/TObjectShortHashMap.java b/src/main/java/gnu/trove/map/hash/TObjectShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TObjectShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TObjectShortHashMap.java diff --git a/src/gnu/trove/map/hash/TShortByteHashMap.java b/src/main/java/gnu/trove/map/hash/TShortByteHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortByteHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortByteHashMap.java diff --git a/src/gnu/trove/map/hash/TShortCharHashMap.java b/src/main/java/gnu/trove/map/hash/TShortCharHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortCharHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortCharHashMap.java diff --git a/src/gnu/trove/map/hash/TShortDoubleHashMap.java b/src/main/java/gnu/trove/map/hash/TShortDoubleHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortDoubleHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortDoubleHashMap.java diff --git a/src/gnu/trove/map/hash/TShortFloatHashMap.java b/src/main/java/gnu/trove/map/hash/TShortFloatHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortFloatHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortFloatHashMap.java diff --git a/src/gnu/trove/map/hash/TShortIntHashMap.java b/src/main/java/gnu/trove/map/hash/TShortIntHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortIntHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortIntHashMap.java diff --git a/src/gnu/trove/map/hash/TShortLongHashMap.java b/src/main/java/gnu/trove/map/hash/TShortLongHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortLongHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortLongHashMap.java diff --git a/src/gnu/trove/map/hash/TShortObjectHashMap.java b/src/main/java/gnu/trove/map/hash/TShortObjectHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortObjectHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortObjectHashMap.java diff --git a/src/gnu/trove/map/hash/TShortShortHashMap.java b/src/main/java/gnu/trove/map/hash/TShortShortHashMap.java similarity index 100% rename from src/gnu/trove/map/hash/TShortShortHashMap.java rename to src/main/java/gnu/trove/map/hash/TShortShortHashMap.java diff --git a/src/gnu/trove/procedure/TByteByteProcedure.java b/src/main/java/gnu/trove/procedure/TByteByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteByteProcedure.java rename to src/main/java/gnu/trove/procedure/TByteByteProcedure.java diff --git a/src/gnu/trove/procedure/TByteCharProcedure.java b/src/main/java/gnu/trove/procedure/TByteCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteCharProcedure.java rename to src/main/java/gnu/trove/procedure/TByteCharProcedure.java diff --git a/src/gnu/trove/procedure/TByteDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TByteDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TByteDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TByteFloatProcedure.java b/src/main/java/gnu/trove/procedure/TByteFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TByteFloatProcedure.java diff --git a/src/gnu/trove/procedure/TByteIntProcedure.java b/src/main/java/gnu/trove/procedure/TByteIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteIntProcedure.java rename to src/main/java/gnu/trove/procedure/TByteIntProcedure.java diff --git a/src/gnu/trove/procedure/TByteLongProcedure.java b/src/main/java/gnu/trove/procedure/TByteLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteLongProcedure.java rename to src/main/java/gnu/trove/procedure/TByteLongProcedure.java diff --git a/src/gnu/trove/procedure/TByteObjectProcedure.java b/src/main/java/gnu/trove/procedure/TByteObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TByteObjectProcedure.java diff --git a/src/gnu/trove/procedure/TByteProcedure.java b/src/main/java/gnu/trove/procedure/TByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteProcedure.java rename to src/main/java/gnu/trove/procedure/TByteProcedure.java diff --git a/src/gnu/trove/procedure/TByteShortProcedure.java b/src/main/java/gnu/trove/procedure/TByteShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TByteShortProcedure.java rename to src/main/java/gnu/trove/procedure/TByteShortProcedure.java diff --git a/src/gnu/trove/procedure/TCharByteProcedure.java b/src/main/java/gnu/trove/procedure/TCharByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharByteProcedure.java rename to src/main/java/gnu/trove/procedure/TCharByteProcedure.java diff --git a/src/gnu/trove/procedure/TCharCharProcedure.java b/src/main/java/gnu/trove/procedure/TCharCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharCharProcedure.java rename to src/main/java/gnu/trove/procedure/TCharCharProcedure.java diff --git a/src/gnu/trove/procedure/TCharDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TCharDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TCharDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TCharFloatProcedure.java b/src/main/java/gnu/trove/procedure/TCharFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TCharFloatProcedure.java diff --git a/src/gnu/trove/procedure/TCharIntProcedure.java b/src/main/java/gnu/trove/procedure/TCharIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharIntProcedure.java rename to src/main/java/gnu/trove/procedure/TCharIntProcedure.java diff --git a/src/gnu/trove/procedure/TCharLongProcedure.java b/src/main/java/gnu/trove/procedure/TCharLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharLongProcedure.java rename to src/main/java/gnu/trove/procedure/TCharLongProcedure.java diff --git a/src/gnu/trove/procedure/TCharObjectProcedure.java b/src/main/java/gnu/trove/procedure/TCharObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TCharObjectProcedure.java diff --git a/src/gnu/trove/procedure/TCharProcedure.java b/src/main/java/gnu/trove/procedure/TCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharProcedure.java rename to src/main/java/gnu/trove/procedure/TCharProcedure.java diff --git a/src/gnu/trove/procedure/TCharShortProcedure.java b/src/main/java/gnu/trove/procedure/TCharShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TCharShortProcedure.java rename to src/main/java/gnu/trove/procedure/TCharShortProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleByteProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleByteProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleByteProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleCharProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleCharProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleCharProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleFloatProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleFloatProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleIntProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleIntProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleIntProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleLongProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleLongProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleLongProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleObjectProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleObjectProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TDoubleShortProcedure.java b/src/main/java/gnu/trove/procedure/TDoubleShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TDoubleShortProcedure.java rename to src/main/java/gnu/trove/procedure/TDoubleShortProcedure.java diff --git a/src/gnu/trove/procedure/TFloatByteProcedure.java b/src/main/java/gnu/trove/procedure/TFloatByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatByteProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatByteProcedure.java diff --git a/src/gnu/trove/procedure/TFloatCharProcedure.java b/src/main/java/gnu/trove/procedure/TFloatCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatCharProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatCharProcedure.java diff --git a/src/gnu/trove/procedure/TFloatDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TFloatDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TFloatFloatProcedure.java b/src/main/java/gnu/trove/procedure/TFloatFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatFloatProcedure.java diff --git a/src/gnu/trove/procedure/TFloatIntProcedure.java b/src/main/java/gnu/trove/procedure/TFloatIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatIntProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatIntProcedure.java diff --git a/src/gnu/trove/procedure/TFloatLongProcedure.java b/src/main/java/gnu/trove/procedure/TFloatLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatLongProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatLongProcedure.java diff --git a/src/gnu/trove/procedure/TFloatObjectProcedure.java b/src/main/java/gnu/trove/procedure/TFloatObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatObjectProcedure.java diff --git a/src/gnu/trove/procedure/TFloatProcedure.java b/src/main/java/gnu/trove/procedure/TFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatProcedure.java diff --git a/src/gnu/trove/procedure/TFloatShortProcedure.java b/src/main/java/gnu/trove/procedure/TFloatShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TFloatShortProcedure.java rename to src/main/java/gnu/trove/procedure/TFloatShortProcedure.java diff --git a/src/gnu/trove/procedure/TIntByteProcedure.java b/src/main/java/gnu/trove/procedure/TIntByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntByteProcedure.java rename to src/main/java/gnu/trove/procedure/TIntByteProcedure.java diff --git a/src/gnu/trove/procedure/TIntCharProcedure.java b/src/main/java/gnu/trove/procedure/TIntCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntCharProcedure.java rename to src/main/java/gnu/trove/procedure/TIntCharProcedure.java diff --git a/src/gnu/trove/procedure/TIntDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TIntDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TIntDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TIntFloatProcedure.java b/src/main/java/gnu/trove/procedure/TIntFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TIntFloatProcedure.java diff --git a/src/gnu/trove/procedure/TIntIntProcedure.java b/src/main/java/gnu/trove/procedure/TIntIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntIntProcedure.java rename to src/main/java/gnu/trove/procedure/TIntIntProcedure.java diff --git a/src/gnu/trove/procedure/TIntLongProcedure.java b/src/main/java/gnu/trove/procedure/TIntLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntLongProcedure.java rename to src/main/java/gnu/trove/procedure/TIntLongProcedure.java diff --git a/src/gnu/trove/procedure/TIntObjectProcedure.java b/src/main/java/gnu/trove/procedure/TIntObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TIntObjectProcedure.java diff --git a/src/gnu/trove/procedure/TIntProcedure.java b/src/main/java/gnu/trove/procedure/TIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntProcedure.java rename to src/main/java/gnu/trove/procedure/TIntProcedure.java diff --git a/src/gnu/trove/procedure/TIntShortProcedure.java b/src/main/java/gnu/trove/procedure/TIntShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TIntShortProcedure.java rename to src/main/java/gnu/trove/procedure/TIntShortProcedure.java diff --git a/src/gnu/trove/procedure/TLongByteProcedure.java b/src/main/java/gnu/trove/procedure/TLongByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongByteProcedure.java rename to src/main/java/gnu/trove/procedure/TLongByteProcedure.java diff --git a/src/gnu/trove/procedure/TLongCharProcedure.java b/src/main/java/gnu/trove/procedure/TLongCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongCharProcedure.java rename to src/main/java/gnu/trove/procedure/TLongCharProcedure.java diff --git a/src/gnu/trove/procedure/TLongDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TLongDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TLongDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TLongFloatProcedure.java b/src/main/java/gnu/trove/procedure/TLongFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TLongFloatProcedure.java diff --git a/src/gnu/trove/procedure/TLongIntProcedure.java b/src/main/java/gnu/trove/procedure/TLongIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongIntProcedure.java rename to src/main/java/gnu/trove/procedure/TLongIntProcedure.java diff --git a/src/gnu/trove/procedure/TLongLongProcedure.java b/src/main/java/gnu/trove/procedure/TLongLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongLongProcedure.java rename to src/main/java/gnu/trove/procedure/TLongLongProcedure.java diff --git a/src/gnu/trove/procedure/TLongObjectProcedure.java b/src/main/java/gnu/trove/procedure/TLongObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TLongObjectProcedure.java diff --git a/src/gnu/trove/procedure/TLongProcedure.java b/src/main/java/gnu/trove/procedure/TLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongProcedure.java rename to src/main/java/gnu/trove/procedure/TLongProcedure.java diff --git a/src/gnu/trove/procedure/TLongShortProcedure.java b/src/main/java/gnu/trove/procedure/TLongShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TLongShortProcedure.java rename to src/main/java/gnu/trove/procedure/TLongShortProcedure.java diff --git a/src/gnu/trove/procedure/TObjectByteProcedure.java b/src/main/java/gnu/trove/procedure/TObjectByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectByteProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectByteProcedure.java diff --git a/src/gnu/trove/procedure/TObjectCharProcedure.java b/src/main/java/gnu/trove/procedure/TObjectCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectCharProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectCharProcedure.java diff --git a/src/gnu/trove/procedure/TObjectDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TObjectDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TObjectFloatProcedure.java b/src/main/java/gnu/trove/procedure/TObjectFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectFloatProcedure.java diff --git a/src/gnu/trove/procedure/TObjectIntProcedure.java b/src/main/java/gnu/trove/procedure/TObjectIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectIntProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectIntProcedure.java diff --git a/src/gnu/trove/procedure/TObjectLongProcedure.java b/src/main/java/gnu/trove/procedure/TObjectLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectLongProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectLongProcedure.java diff --git a/src/gnu/trove/procedure/TObjectObjectProcedure.java b/src/main/java/gnu/trove/procedure/TObjectObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectObjectProcedure.java diff --git a/src/gnu/trove/procedure/TObjectProcedure.java b/src/main/java/gnu/trove/procedure/TObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectProcedure.java diff --git a/src/gnu/trove/procedure/TObjectShortProcedure.java b/src/main/java/gnu/trove/procedure/TObjectShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TObjectShortProcedure.java rename to src/main/java/gnu/trove/procedure/TObjectShortProcedure.java diff --git a/src/gnu/trove/procedure/TShortByteProcedure.java b/src/main/java/gnu/trove/procedure/TShortByteProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortByteProcedure.java rename to src/main/java/gnu/trove/procedure/TShortByteProcedure.java diff --git a/src/gnu/trove/procedure/TShortCharProcedure.java b/src/main/java/gnu/trove/procedure/TShortCharProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortCharProcedure.java rename to src/main/java/gnu/trove/procedure/TShortCharProcedure.java diff --git a/src/gnu/trove/procedure/TShortDoubleProcedure.java b/src/main/java/gnu/trove/procedure/TShortDoubleProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortDoubleProcedure.java rename to src/main/java/gnu/trove/procedure/TShortDoubleProcedure.java diff --git a/src/gnu/trove/procedure/TShortFloatProcedure.java b/src/main/java/gnu/trove/procedure/TShortFloatProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortFloatProcedure.java rename to src/main/java/gnu/trove/procedure/TShortFloatProcedure.java diff --git a/src/gnu/trove/procedure/TShortIntProcedure.java b/src/main/java/gnu/trove/procedure/TShortIntProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortIntProcedure.java rename to src/main/java/gnu/trove/procedure/TShortIntProcedure.java diff --git a/src/gnu/trove/procedure/TShortLongProcedure.java b/src/main/java/gnu/trove/procedure/TShortLongProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortLongProcedure.java rename to src/main/java/gnu/trove/procedure/TShortLongProcedure.java diff --git a/src/gnu/trove/procedure/TShortObjectProcedure.java b/src/main/java/gnu/trove/procedure/TShortObjectProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortObjectProcedure.java rename to src/main/java/gnu/trove/procedure/TShortObjectProcedure.java diff --git a/src/gnu/trove/procedure/TShortProcedure.java b/src/main/java/gnu/trove/procedure/TShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortProcedure.java rename to src/main/java/gnu/trove/procedure/TShortProcedure.java diff --git a/src/gnu/trove/procedure/TShortShortProcedure.java b/src/main/java/gnu/trove/procedure/TShortShortProcedure.java similarity index 100% rename from src/gnu/trove/procedure/TShortShortProcedure.java rename to src/main/java/gnu/trove/procedure/TShortShortProcedure.java diff --git a/src/gnu/trove/procedure/array/ToObjectArrayProceedure.java b/src/main/java/gnu/trove/procedure/array/ToObjectArrayProceedure.java similarity index 100% rename from src/gnu/trove/procedure/array/ToObjectArrayProceedure.java rename to src/main/java/gnu/trove/procedure/array/ToObjectArrayProceedure.java diff --git a/src/gnu/trove/queue/TByteQueue.java b/src/main/java/gnu/trove/queue/TByteQueue.java similarity index 100% rename from src/gnu/trove/queue/TByteQueue.java rename to src/main/java/gnu/trove/queue/TByteQueue.java diff --git a/src/gnu/trove/queue/TCharQueue.java b/src/main/java/gnu/trove/queue/TCharQueue.java similarity index 100% rename from src/gnu/trove/queue/TCharQueue.java rename to src/main/java/gnu/trove/queue/TCharQueue.java diff --git a/src/gnu/trove/queue/TDoubleQueue.java b/src/main/java/gnu/trove/queue/TDoubleQueue.java similarity index 100% rename from src/gnu/trove/queue/TDoubleQueue.java rename to src/main/java/gnu/trove/queue/TDoubleQueue.java diff --git a/src/gnu/trove/queue/TFloatQueue.java b/src/main/java/gnu/trove/queue/TFloatQueue.java similarity index 100% rename from src/gnu/trove/queue/TFloatQueue.java rename to src/main/java/gnu/trove/queue/TFloatQueue.java diff --git a/src/gnu/trove/queue/TIntQueue.java b/src/main/java/gnu/trove/queue/TIntQueue.java similarity index 100% rename from src/gnu/trove/queue/TIntQueue.java rename to src/main/java/gnu/trove/queue/TIntQueue.java diff --git a/src/gnu/trove/queue/TLongQueue.java b/src/main/java/gnu/trove/queue/TLongQueue.java similarity index 100% rename from src/gnu/trove/queue/TLongQueue.java rename to src/main/java/gnu/trove/queue/TLongQueue.java diff --git a/src/gnu/trove/queue/TShortQueue.java b/src/main/java/gnu/trove/queue/TShortQueue.java similarity index 100% rename from src/gnu/trove/queue/TShortQueue.java rename to src/main/java/gnu/trove/queue/TShortQueue.java diff --git a/src/gnu/trove/set/TByteSet.java b/src/main/java/gnu/trove/set/TByteSet.java similarity index 100% rename from src/gnu/trove/set/TByteSet.java rename to src/main/java/gnu/trove/set/TByteSet.java diff --git a/src/gnu/trove/set/TCharSet.java b/src/main/java/gnu/trove/set/TCharSet.java similarity index 100% rename from src/gnu/trove/set/TCharSet.java rename to src/main/java/gnu/trove/set/TCharSet.java diff --git a/src/gnu/trove/set/TDoubleSet.java b/src/main/java/gnu/trove/set/TDoubleSet.java similarity index 100% rename from src/gnu/trove/set/TDoubleSet.java rename to src/main/java/gnu/trove/set/TDoubleSet.java diff --git a/src/gnu/trove/set/TFloatSet.java b/src/main/java/gnu/trove/set/TFloatSet.java similarity index 100% rename from src/gnu/trove/set/TFloatSet.java rename to src/main/java/gnu/trove/set/TFloatSet.java diff --git a/src/gnu/trove/set/TIntSet.java b/src/main/java/gnu/trove/set/TIntSet.java similarity index 100% rename from src/gnu/trove/set/TIntSet.java rename to src/main/java/gnu/trove/set/TIntSet.java diff --git a/src/gnu/trove/set/TLongSet.java b/src/main/java/gnu/trove/set/TLongSet.java similarity index 100% rename from src/gnu/trove/set/TLongSet.java rename to src/main/java/gnu/trove/set/TLongSet.java diff --git a/src/gnu/trove/set/TShortSet.java b/src/main/java/gnu/trove/set/TShortSet.java similarity index 100% rename from src/gnu/trove/set/TShortSet.java rename to src/main/java/gnu/trove/set/TShortSet.java diff --git a/src/gnu/trove/set/hash/TByteHashSet.java b/src/main/java/gnu/trove/set/hash/TByteHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TByteHashSet.java rename to src/main/java/gnu/trove/set/hash/TByteHashSet.java diff --git a/src/gnu/trove/set/hash/TCharHashSet.java b/src/main/java/gnu/trove/set/hash/TCharHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TCharHashSet.java rename to src/main/java/gnu/trove/set/hash/TCharHashSet.java diff --git a/src/gnu/trove/set/hash/TCustomHashSet.java b/src/main/java/gnu/trove/set/hash/TCustomHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TCustomHashSet.java rename to src/main/java/gnu/trove/set/hash/TCustomHashSet.java diff --git a/src/gnu/trove/set/hash/TDoubleHashSet.java b/src/main/java/gnu/trove/set/hash/TDoubleHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TDoubleHashSet.java rename to src/main/java/gnu/trove/set/hash/TDoubleHashSet.java diff --git a/src/gnu/trove/set/hash/TFloatHashSet.java b/src/main/java/gnu/trove/set/hash/TFloatHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TFloatHashSet.java rename to src/main/java/gnu/trove/set/hash/TFloatHashSet.java diff --git a/src/gnu/trove/set/hash/THashSet.java b/src/main/java/gnu/trove/set/hash/THashSet.java similarity index 100% rename from src/gnu/trove/set/hash/THashSet.java rename to src/main/java/gnu/trove/set/hash/THashSet.java diff --git a/src/gnu/trove/set/hash/TIntHashSet.java b/src/main/java/gnu/trove/set/hash/TIntHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TIntHashSet.java rename to src/main/java/gnu/trove/set/hash/TIntHashSet.java diff --git a/src/gnu/trove/set/hash/TLinkedHashSet.java b/src/main/java/gnu/trove/set/hash/TLinkedHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TLinkedHashSet.java rename to src/main/java/gnu/trove/set/hash/TLinkedHashSet.java diff --git a/src/gnu/trove/set/hash/TLongHashSet.java b/src/main/java/gnu/trove/set/hash/TLongHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TLongHashSet.java rename to src/main/java/gnu/trove/set/hash/TLongHashSet.java diff --git a/src/gnu/trove/set/hash/TShortHashSet.java b/src/main/java/gnu/trove/set/hash/TShortHashSet.java similarity index 100% rename from src/gnu/trove/set/hash/TShortHashSet.java rename to src/main/java/gnu/trove/set/hash/TShortHashSet.java diff --git a/src/gnu/trove/stack/TByteStack.java b/src/main/java/gnu/trove/stack/TByteStack.java similarity index 100% rename from src/gnu/trove/stack/TByteStack.java rename to src/main/java/gnu/trove/stack/TByteStack.java diff --git a/src/gnu/trove/stack/TCharStack.java b/src/main/java/gnu/trove/stack/TCharStack.java similarity index 100% rename from src/gnu/trove/stack/TCharStack.java rename to src/main/java/gnu/trove/stack/TCharStack.java diff --git a/src/gnu/trove/stack/TDoubleStack.java b/src/main/java/gnu/trove/stack/TDoubleStack.java similarity index 100% rename from src/gnu/trove/stack/TDoubleStack.java rename to src/main/java/gnu/trove/stack/TDoubleStack.java diff --git a/src/gnu/trove/stack/TFloatStack.java b/src/main/java/gnu/trove/stack/TFloatStack.java similarity index 100% rename from src/gnu/trove/stack/TFloatStack.java rename to src/main/java/gnu/trove/stack/TFloatStack.java diff --git a/src/gnu/trove/stack/TIntStack.java b/src/main/java/gnu/trove/stack/TIntStack.java similarity index 100% rename from src/gnu/trove/stack/TIntStack.java rename to src/main/java/gnu/trove/stack/TIntStack.java diff --git a/src/gnu/trove/stack/TLongStack.java b/src/main/java/gnu/trove/stack/TLongStack.java similarity index 100% rename from src/gnu/trove/stack/TLongStack.java rename to src/main/java/gnu/trove/stack/TLongStack.java diff --git a/src/gnu/trove/stack/TShortStack.java b/src/main/java/gnu/trove/stack/TShortStack.java similarity index 100% rename from src/gnu/trove/stack/TShortStack.java rename to src/main/java/gnu/trove/stack/TShortStack.java diff --git a/src/gnu/trove/stack/array/TByteArrayStack.java b/src/main/java/gnu/trove/stack/array/TByteArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TByteArrayStack.java rename to src/main/java/gnu/trove/stack/array/TByteArrayStack.java diff --git a/src/gnu/trove/stack/array/TCharArrayStack.java b/src/main/java/gnu/trove/stack/array/TCharArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TCharArrayStack.java rename to src/main/java/gnu/trove/stack/array/TCharArrayStack.java diff --git a/src/gnu/trove/stack/array/TDoubleArrayStack.java b/src/main/java/gnu/trove/stack/array/TDoubleArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TDoubleArrayStack.java rename to src/main/java/gnu/trove/stack/array/TDoubleArrayStack.java diff --git a/src/gnu/trove/stack/array/TFloatArrayStack.java b/src/main/java/gnu/trove/stack/array/TFloatArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TFloatArrayStack.java rename to src/main/java/gnu/trove/stack/array/TFloatArrayStack.java diff --git a/src/gnu/trove/stack/array/TIntArrayStack.java b/src/main/java/gnu/trove/stack/array/TIntArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TIntArrayStack.java rename to src/main/java/gnu/trove/stack/array/TIntArrayStack.java diff --git a/src/gnu/trove/stack/array/TLongArrayStack.java b/src/main/java/gnu/trove/stack/array/TLongArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TLongArrayStack.java rename to src/main/java/gnu/trove/stack/array/TLongArrayStack.java diff --git a/src/gnu/trove/stack/array/TShortArrayStack.java b/src/main/java/gnu/trove/stack/array/TShortArrayStack.java similarity index 100% rename from src/gnu/trove/stack/array/TShortArrayStack.java rename to src/main/java/gnu/trove/stack/array/TShortArrayStack.java diff --git a/src/gnu/trove/strategy/HashingStrategy.java b/src/main/java/gnu/trove/strategy/HashingStrategy.java similarity index 100% rename from src/gnu/trove/strategy/HashingStrategy.java rename to src/main/java/gnu/trove/strategy/HashingStrategy.java diff --git a/src/gnu/trove/strategy/IdentityHashingStrategy.java b/src/main/java/gnu/trove/strategy/IdentityHashingStrategy.java similarity index 100% rename from src/gnu/trove/strategy/IdentityHashingStrategy.java rename to src/main/java/gnu/trove/strategy/IdentityHashingStrategy.java diff --git a/src/org/apache/commons/collections4/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java similarity index 100% rename from src/org/apache/commons/collections4/ArrayStack.java rename to src/main/java/org/apache/commons/collections4/ArrayStack.java diff --git a/src/org/apache/commons/collections4/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java similarity index 100% rename from src/org/apache/commons/collections4/Bag.java rename to src/main/java/org/apache/commons/collections4/Bag.java diff --git a/src/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java similarity index 100% rename from src/org/apache/commons/collections4/BagUtils.java rename to src/main/java/org/apache/commons/collections4/BagUtils.java diff --git a/src/org/apache/commons/collections4/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/BidiMap.java rename to src/main/java/org/apache/commons/collections4/BidiMap.java diff --git a/src/org/apache/commons/collections4/BoundedCollection.java b/src/main/java/org/apache/commons/collections4/BoundedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/BoundedCollection.java rename to src/main/java/org/apache/commons/collections4/BoundedCollection.java diff --git a/src/org/apache/commons/collections4/BoundedMap.java b/src/main/java/org/apache/commons/collections4/BoundedMap.java similarity index 100% rename from src/org/apache/commons/collections4/BoundedMap.java rename to src/main/java/org/apache/commons/collections4/BoundedMap.java diff --git a/src/org/apache/commons/collections4/Closure.java b/src/main/java/org/apache/commons/collections4/Closure.java similarity index 100% rename from src/org/apache/commons/collections4/Closure.java rename to src/main/java/org/apache/commons/collections4/Closure.java diff --git a/src/org/apache/commons/collections4/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java similarity index 100% rename from src/org/apache/commons/collections4/ClosureUtils.java rename to src/main/java/org/apache/commons/collections4/ClosureUtils.java diff --git a/src/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java similarity index 100% rename from src/org/apache/commons/collections4/CollectionUtils.java rename to src/main/java/org/apache/commons/collections4/CollectionUtils.java diff --git a/src/org/apache/commons/collections4/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java similarity index 100% rename from src/org/apache/commons/collections4/ComparatorUtils.java rename to src/main/java/org/apache/commons/collections4/ComparatorUtils.java diff --git a/src/org/apache/commons/collections4/EnumerationUtils.java b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java similarity index 100% rename from src/org/apache/commons/collections4/EnumerationUtils.java rename to src/main/java/org/apache/commons/collections4/EnumerationUtils.java diff --git a/src/org/apache/commons/collections4/Equator.java b/src/main/java/org/apache/commons/collections4/Equator.java similarity index 100% rename from src/org/apache/commons/collections4/Equator.java rename to src/main/java/org/apache/commons/collections4/Equator.java diff --git a/src/org/apache/commons/collections4/Factory.java b/src/main/java/org/apache/commons/collections4/Factory.java similarity index 100% rename from src/org/apache/commons/collections4/Factory.java rename to src/main/java/org/apache/commons/collections4/Factory.java diff --git a/src/org/apache/commons/collections4/FactoryUtils.java b/src/main/java/org/apache/commons/collections4/FactoryUtils.java similarity index 100% rename from src/org/apache/commons/collections4/FactoryUtils.java rename to src/main/java/org/apache/commons/collections4/FactoryUtils.java diff --git a/src/org/apache/commons/collections4/FluentIterable.java b/src/main/java/org/apache/commons/collections4/FluentIterable.java similarity index 100% rename from src/org/apache/commons/collections4/FluentIterable.java rename to src/main/java/org/apache/commons/collections4/FluentIterable.java diff --git a/src/org/apache/commons/collections4/FunctorException.java b/src/main/java/org/apache/commons/collections4/FunctorException.java similarity index 100% rename from src/org/apache/commons/collections4/FunctorException.java rename to src/main/java/org/apache/commons/collections4/FunctorException.java diff --git a/src/org/apache/commons/collections4/Get.java b/src/main/java/org/apache/commons/collections4/Get.java similarity index 100% rename from src/org/apache/commons/collections4/Get.java rename to src/main/java/org/apache/commons/collections4/Get.java diff --git a/src/org/apache/commons/collections4/IterableGet.java b/src/main/java/org/apache/commons/collections4/IterableGet.java similarity index 100% rename from src/org/apache/commons/collections4/IterableGet.java rename to src/main/java/org/apache/commons/collections4/IterableGet.java diff --git a/src/org/apache/commons/collections4/IterableMap.java b/src/main/java/org/apache/commons/collections4/IterableMap.java similarity index 100% rename from src/org/apache/commons/collections4/IterableMap.java rename to src/main/java/org/apache/commons/collections4/IterableMap.java diff --git a/src/org/apache/commons/collections4/IterableSortedMap.java b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/IterableSortedMap.java rename to src/main/java/org/apache/commons/collections4/IterableSortedMap.java diff --git a/src/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java similarity index 100% rename from src/org/apache/commons/collections4/IterableUtils.java rename to src/main/java/org/apache/commons/collections4/IterableUtils.java diff --git a/src/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java similarity index 100% rename from src/org/apache/commons/collections4/IteratorUtils.java rename to src/main/java/org/apache/commons/collections4/IteratorUtils.java diff --git a/src/org/apache/commons/collections4/KeyValue.java b/src/main/java/org/apache/commons/collections4/KeyValue.java similarity index 100% rename from src/org/apache/commons/collections4/KeyValue.java rename to src/main/java/org/apache/commons/collections4/KeyValue.java diff --git a/src/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java similarity index 100% rename from src/org/apache/commons/collections4/ListUtils.java rename to src/main/java/org/apache/commons/collections4/ListUtils.java diff --git a/src/org/apache/commons/collections4/ListValuedMap.java b/src/main/java/org/apache/commons/collections4/ListValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/ListValuedMap.java rename to src/main/java/org/apache/commons/collections4/ListValuedMap.java diff --git a/src/org/apache/commons/collections4/MapIterator.java b/src/main/java/org/apache/commons/collections4/MapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/MapIterator.java rename to src/main/java/org/apache/commons/collections4/MapIterator.java diff --git a/src/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java similarity index 100% rename from src/org/apache/commons/collections4/MapUtils.java rename to src/main/java/org/apache/commons/collections4/MapUtils.java diff --git a/src/org/apache/commons/collections4/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java similarity index 100% rename from src/org/apache/commons/collections4/MultiMap.java rename to src/main/java/org/apache/commons/collections4/MultiMap.java diff --git a/src/org/apache/commons/collections4/MultiMapUtils.java b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java similarity index 100% rename from src/org/apache/commons/collections4/MultiMapUtils.java rename to src/main/java/org/apache/commons/collections4/MultiMapUtils.java diff --git a/src/org/apache/commons/collections4/MultiSet.java b/src/main/java/org/apache/commons/collections4/MultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/MultiSet.java rename to src/main/java/org/apache/commons/collections4/MultiSet.java diff --git a/src/org/apache/commons/collections4/MultiSetUtils.java b/src/main/java/org/apache/commons/collections4/MultiSetUtils.java similarity index 100% rename from src/org/apache/commons/collections4/MultiSetUtils.java rename to src/main/java/org/apache/commons/collections4/MultiSetUtils.java diff --git a/src/org/apache/commons/collections4/MultiValuedMap.java b/src/main/java/org/apache/commons/collections4/MultiValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/MultiValuedMap.java rename to src/main/java/org/apache/commons/collections4/MultiValuedMap.java diff --git a/src/org/apache/commons/collections4/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/OrderedBidiMap.java rename to src/main/java/org/apache/commons/collections4/OrderedBidiMap.java diff --git a/src/org/apache/commons/collections4/OrderedIterator.java b/src/main/java/org/apache/commons/collections4/OrderedIterator.java similarity index 100% rename from src/org/apache/commons/collections4/OrderedIterator.java rename to src/main/java/org/apache/commons/collections4/OrderedIterator.java diff --git a/src/org/apache/commons/collections4/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java similarity index 100% rename from src/org/apache/commons/collections4/OrderedMap.java rename to src/main/java/org/apache/commons/collections4/OrderedMap.java diff --git a/src/org/apache/commons/collections4/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/OrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/OrderedMapIterator.java diff --git a/src/org/apache/commons/collections4/Predicate.java b/src/main/java/org/apache/commons/collections4/Predicate.java similarity index 100% rename from src/org/apache/commons/collections4/Predicate.java rename to src/main/java/org/apache/commons/collections4/Predicate.java diff --git a/src/org/apache/commons/collections4/PredicateUtils.java b/src/main/java/org/apache/commons/collections4/PredicateUtils.java similarity index 100% rename from src/org/apache/commons/collections4/PredicateUtils.java rename to src/main/java/org/apache/commons/collections4/PredicateUtils.java diff --git a/src/org/apache/commons/collections4/Put.java b/src/main/java/org/apache/commons/collections4/Put.java similarity index 100% rename from src/org/apache/commons/collections4/Put.java rename to src/main/java/org/apache/commons/collections4/Put.java diff --git a/src/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java similarity index 100% rename from src/org/apache/commons/collections4/QueueUtils.java rename to src/main/java/org/apache/commons/collections4/QueueUtils.java diff --git a/src/org/apache/commons/collections4/ResettableIterator.java b/src/main/java/org/apache/commons/collections4/ResettableIterator.java similarity index 100% rename from src/org/apache/commons/collections4/ResettableIterator.java rename to src/main/java/org/apache/commons/collections4/ResettableIterator.java diff --git a/src/org/apache/commons/collections4/ResettableListIterator.java b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/ResettableListIterator.java rename to src/main/java/org/apache/commons/collections4/ResettableListIterator.java diff --git a/src/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java similarity index 100% rename from src/org/apache/commons/collections4/SetUtils.java rename to src/main/java/org/apache/commons/collections4/SetUtils.java diff --git a/src/org/apache/commons/collections4/SetValuedMap.java b/src/main/java/org/apache/commons/collections4/SetValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/SetValuedMap.java rename to src/main/java/org/apache/commons/collections4/SetValuedMap.java diff --git a/src/org/apache/commons/collections4/SortedBag.java b/src/main/java/org/apache/commons/collections4/SortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/SortedBag.java rename to src/main/java/org/apache/commons/collections4/SortedBag.java diff --git a/src/org/apache/commons/collections4/SortedBidiMap.java b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/SortedBidiMap.java rename to src/main/java/org/apache/commons/collections4/SortedBidiMap.java diff --git a/src/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java similarity index 100% rename from src/org/apache/commons/collections4/SplitMapUtils.java rename to src/main/java/org/apache/commons/collections4/SplitMapUtils.java diff --git a/src/org/apache/commons/collections4/Transformer.java b/src/main/java/org/apache/commons/collections4/Transformer.java similarity index 100% rename from src/org/apache/commons/collections4/Transformer.java rename to src/main/java/org/apache/commons/collections4/Transformer.java diff --git a/src/org/apache/commons/collections4/TransformerUtils.java b/src/main/java/org/apache/commons/collections4/TransformerUtils.java similarity index 100% rename from src/org/apache/commons/collections4/TransformerUtils.java rename to src/main/java/org/apache/commons/collections4/TransformerUtils.java diff --git a/src/org/apache/commons/collections4/Trie.java b/src/main/java/org/apache/commons/collections4/Trie.java similarity index 100% rename from src/org/apache/commons/collections4/Trie.java rename to src/main/java/org/apache/commons/collections4/Trie.java diff --git a/src/org/apache/commons/collections4/TrieUtils.java b/src/main/java/org/apache/commons/collections4/TrieUtils.java similarity index 100% rename from src/org/apache/commons/collections4/TrieUtils.java rename to src/main/java/org/apache/commons/collections4/TrieUtils.java diff --git a/src/org/apache/commons/collections4/Unmodifiable.java b/src/main/java/org/apache/commons/collections4/Unmodifiable.java similarity index 100% rename from src/org/apache/commons/collections4/Unmodifiable.java rename to src/main/java/org/apache/commons/collections4/Unmodifiable.java diff --git a/src/org/apache/commons/collections4/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/bag/AbstractBagDecorator.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java diff --git a/src/org/apache/commons/collections4/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/AbstractMapBag.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java diff --git a/src/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java diff --git a/src/org/apache/commons/collections4/bag/CollectionBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/CollectionBag.java rename to src/main/java/org/apache/commons/collections4/bag/CollectionBag.java diff --git a/src/org/apache/commons/collections4/bag/CollectionSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/CollectionSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java diff --git a/src/org/apache/commons/collections4/bag/HashBag.java b/src/main/java/org/apache/commons/collections4/bag/HashBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/HashBag.java rename to src/main/java/org/apache/commons/collections4/bag/HashBag.java diff --git a/src/org/apache/commons/collections4/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/PredicatedBag.java rename to src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java diff --git a/src/org/apache/commons/collections4/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/PredicatedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java diff --git a/src/org/apache/commons/collections4/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/SynchronizedBag.java rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java diff --git a/src/org/apache/commons/collections4/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/SynchronizedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java diff --git a/src/org/apache/commons/collections4/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/TransformedBag.java rename to src/main/java/org/apache/commons/collections4/bag/TransformedBag.java diff --git a/src/org/apache/commons/collections4/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/TransformedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java diff --git a/src/org/apache/commons/collections4/bag/TreeBag.java b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/TreeBag.java rename to src/main/java/org/apache/commons/collections4/bag/TreeBag.java diff --git a/src/org/apache/commons/collections4/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/UnmodifiableBag.java rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java diff --git a/src/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java similarity index 100% rename from src/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java diff --git a/src/org/apache/commons/collections4/bag/package-info.java b/src/main/java/org/apache/commons/collections4/bag/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/bag/package-info.java rename to src/main/java/org/apache/commons/collections4/bag/package-info.java diff --git a/src/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java diff --git a/src/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java diff --git a/src/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java diff --git a/src/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/DualHashBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/TreeBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java diff --git a/src/org/apache/commons/collections4/bidimap/package-info.java b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/bidimap/package-info.java rename to src/main/java/org/apache/commons/collections4/bidimap/package-info.java diff --git a/src/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java rename to src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java diff --git a/src/org/apache/commons/collections4/collection/CompositeCollection.java b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/CompositeCollection.java rename to src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java diff --git a/src/org/apache/commons/collections4/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/IndexedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java diff --git a/src/org/apache/commons/collections4/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/PredicatedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java diff --git a/src/org/apache/commons/collections4/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/SynchronizedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java diff --git a/src/org/apache/commons/collections4/collection/TransformedCollection.java b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/TransformedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java diff --git a/src/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java diff --git a/src/org/apache/commons/collections4/collection/UnmodifiableCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java similarity index 100% rename from src/org/apache/commons/collections4/collection/UnmodifiableCollection.java rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java diff --git a/src/org/apache/commons/collections4/collection/package-info.java b/src/main/java/org/apache/commons/collections4/collection/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/collection/package-info.java rename to src/main/java/org/apache/commons/collections4/collection/package-info.java diff --git a/src/org/apache/commons/collections4/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/BooleanComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java diff --git a/src/org/apache/commons/collections4/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/ComparableComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java diff --git a/src/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/ComparatorChain.java rename to src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java diff --git a/src/org/apache/commons/collections4/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/FixedOrderComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java diff --git a/src/org/apache/commons/collections4/comparators/NullComparator.java b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/NullComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/NullComparator.java diff --git a/src/org/apache/commons/collections4/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/ReverseComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java diff --git a/src/org/apache/commons/collections4/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/TransformingComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java diff --git a/src/org/apache/commons/collections4/comparators/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/comparators/package-info.java rename to src/main/java/org/apache/commons/collections4/comparators/package-info.java diff --git a/src/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java diff --git a/src/org/apache/commons/collections4/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/AllPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AllPredicate.java diff --git a/src/org/apache/commons/collections4/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/AndPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AndPredicate.java diff --git a/src/org/apache/commons/collections4/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/AnyPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java diff --git a/src/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java rename to src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java diff --git a/src/org/apache/commons/collections4/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ChainedClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java diff --git a/src/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ChainedTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java diff --git a/src/org/apache/commons/collections4/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/CloneTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java diff --git a/src/org/apache/commons/collections4/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ClosureTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java diff --git a/src/org/apache/commons/collections4/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ComparatorPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java diff --git a/src/org/apache/commons/collections4/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ConstantFactory.java rename to src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java diff --git a/src/org/apache/commons/collections4/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ConstantTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java diff --git a/src/org/apache/commons/collections4/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java similarity index 100% rename from src/org/apache/commons/collections4/functors/DefaultEquator.java rename to src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java diff --git a/src/org/apache/commons/collections4/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/EqualPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java diff --git a/src/org/apache/commons/collections4/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ExceptionClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java diff --git a/src/org/apache/commons/collections4/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ExceptionFactory.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java diff --git a/src/org/apache/commons/collections4/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ExceptionPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java diff --git a/src/org/apache/commons/collections4/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ExceptionTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java diff --git a/src/org/apache/commons/collections4/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/FactoryTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java diff --git a/src/org/apache/commons/collections4/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/FalsePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java diff --git a/src/org/apache/commons/collections4/functors/ForClosure.java b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/ForClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ForClosure.java diff --git a/src/org/apache/commons/collections4/functors/FunctorUtils.java b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java similarity index 100% rename from src/org/apache/commons/collections4/functors/FunctorUtils.java rename to src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java diff --git a/src/org/apache/commons/collections4/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/IdentityPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java diff --git a/src/org/apache/commons/collections4/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/IfClosure.java rename to src/main/java/org/apache/commons/collections4/functors/IfClosure.java diff --git a/src/org/apache/commons/collections4/functors/IfTransformer.java b/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/IfTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/IfTransformer.java diff --git a/src/org/apache/commons/collections4/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/InstanceofPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java diff --git a/src/org/apache/commons/collections4/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java similarity index 100% rename from src/org/apache/commons/collections4/functors/InstantiateFactory.java rename to src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java diff --git a/src/org/apache/commons/collections4/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/InstantiateTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java diff --git a/src/org/apache/commons/collections4/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/InvokerTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java diff --git a/src/org/apache/commons/collections4/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/MapTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/MapTransformer.java diff --git a/src/org/apache/commons/collections4/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NOPClosure.java rename to src/main/java/org/apache/commons/collections4/functors/NOPClosure.java diff --git a/src/org/apache/commons/collections4/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NOPTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java diff --git a/src/org/apache/commons/collections4/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NonePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NonePredicate.java diff --git a/src/org/apache/commons/collections4/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NotNullPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java diff --git a/src/org/apache/commons/collections4/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NotPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NotPredicate.java diff --git a/src/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java diff --git a/src/org/apache/commons/collections4/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NullIsFalsePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java diff --git a/src/org/apache/commons/collections4/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NullIsTruePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java diff --git a/src/org/apache/commons/collections4/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/NullPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullPredicate.java diff --git a/src/org/apache/commons/collections4/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/OnePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/OnePredicate.java diff --git a/src/org/apache/commons/collections4/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/OrPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/OrPredicate.java diff --git a/src/org/apache/commons/collections4/functors/PredicateDecorator.java b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/functors/PredicateDecorator.java rename to src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java diff --git a/src/org/apache/commons/collections4/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/PredicateTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java diff --git a/src/org/apache/commons/collections4/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java similarity index 100% rename from src/org/apache/commons/collections4/functors/PrototypeFactory.java rename to src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java diff --git a/src/org/apache/commons/collections4/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/StringValueTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java diff --git a/src/org/apache/commons/collections4/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/SwitchClosure.java rename to src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java diff --git a/src/org/apache/commons/collections4/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java similarity index 100% rename from src/org/apache/commons/collections4/functors/SwitchTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java diff --git a/src/org/apache/commons/collections4/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/TransformedPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java diff --git a/src/org/apache/commons/collections4/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/TransformerClosure.java rename to src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java diff --git a/src/org/apache/commons/collections4/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/TransformerPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java diff --git a/src/org/apache/commons/collections4/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/TruePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TruePredicate.java diff --git a/src/org/apache/commons/collections4/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java similarity index 100% rename from src/org/apache/commons/collections4/functors/UniquePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java diff --git a/src/org/apache/commons/collections4/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java similarity index 100% rename from src/org/apache/commons/collections4/functors/WhileClosure.java rename to src/main/java/org/apache/commons/collections4/functors/WhileClosure.java diff --git a/src/org/apache/commons/collections4/functors/package-info.java b/src/main/java/org/apache/commons/collections4/functors/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/functors/package-info.java rename to src/main/java/org/apache/commons/collections4/functors/package-info.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java diff --git a/src/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java diff --git a/src/org/apache/commons/collections4/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ArrayIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ArrayListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/BoundedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/BoundedIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java diff --git a/src/org/apache/commons/collections4/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/CollatingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EmptyIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EmptyListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EmptyMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EntrySetMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/EnumerationIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java diff --git a/src/org/apache/commons/collections4/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/FilterIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java diff --git a/src/org/apache/commons/collections4/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/FilterListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/IteratorChain.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java diff --git a/src/org/apache/commons/collections4/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/IteratorEnumeration.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java diff --git a/src/org/apache/commons/collections4/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/IteratorIterable.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java diff --git a/src/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/LazyIteratorChain.java rename to src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java diff --git a/src/org/apache/commons/collections4/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ListIteratorWrapper.java rename to src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java diff --git a/src/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/LoopingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java diff --git a/src/org/apache/commons/collections4/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/LoopingListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/NodeListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ObjectArrayIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ObjectGraphIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java diff --git a/src/org/apache/commons/collections4/iterators/PeekingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/PeekingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java diff --git a/src/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/PermutationIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java diff --git a/src/org/apache/commons/collections4/iterators/PushbackIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/PushbackIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ReverseListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/SingletonIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java diff --git a/src/org/apache/commons/collections4/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/SingletonListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/SkippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/SkippingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java diff --git a/src/org/apache/commons/collections4/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/TransformIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java diff --git a/src/org/apache/commons/collections4/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/UniqueFilterIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java diff --git a/src/org/apache/commons/collections4/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/UnmodifiableIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java diff --git a/src/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java diff --git a/src/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java diff --git a/src/org/apache/commons/collections4/iterators/ZippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/ZippingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java diff --git a/src/org/apache/commons/collections4/iterators/package-info.java b/src/main/java/org/apache/commons/collections4/iterators/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/iterators/package-info.java rename to src/main/java/org/apache/commons/collections4/iterators/package-info.java diff --git a/src/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java diff --git a/src/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java diff --git a/src/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java diff --git a/src/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java diff --git a/src/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java diff --git a/src/org/apache/commons/collections4/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/MultiKey.java rename to src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java diff --git a/src/org/apache/commons/collections4/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/TiedMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java diff --git a/src/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java diff --git a/src/org/apache/commons/collections4/keyvalue/package-info.java b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/keyvalue/package-info.java rename to src/main/java/org/apache/commons/collections4/keyvalue/package-info.java diff --git a/src/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java similarity index 100% rename from src/org/apache/commons/collections4/list/AbstractLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java diff --git a/src/org/apache/commons/collections4/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/list/AbstractListDecorator.java rename to src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java diff --git a/src/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java rename to src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java diff --git a/src/org/apache/commons/collections4/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java similarity index 100% rename from src/org/apache/commons/collections4/list/CursorableLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java diff --git a/src/org/apache/commons/collections4/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java similarity index 100% rename from src/org/apache/commons/collections4/list/FixedSizeList.java rename to src/main/java/org/apache/commons/collections4/list/FixedSizeList.java diff --git a/src/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java similarity index 100% rename from src/org/apache/commons/collections4/list/GrowthList.java rename to src/main/java/org/apache/commons/collections4/list/GrowthList.java diff --git a/src/org/apache/commons/collections4/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java similarity index 100% rename from src/org/apache/commons/collections4/list/LazyList.java rename to src/main/java/org/apache/commons/collections4/list/LazyList.java diff --git a/src/org/apache/commons/collections4/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java similarity index 100% rename from src/org/apache/commons/collections4/list/NodeCachingLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java diff --git a/src/org/apache/commons/collections4/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java similarity index 100% rename from src/org/apache/commons/collections4/list/PredicatedList.java rename to src/main/java/org/apache/commons/collections4/list/PredicatedList.java diff --git a/src/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java similarity index 100% rename from src/org/apache/commons/collections4/list/SetUniqueList.java rename to src/main/java/org/apache/commons/collections4/list/SetUniqueList.java diff --git a/src/org/apache/commons/collections4/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java similarity index 100% rename from src/org/apache/commons/collections4/list/TransformedList.java rename to src/main/java/org/apache/commons/collections4/list/TransformedList.java diff --git a/src/org/apache/commons/collections4/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java similarity index 100% rename from src/org/apache/commons/collections4/list/TreeList.java rename to src/main/java/org/apache/commons/collections4/list/TreeList.java diff --git a/src/org/apache/commons/collections4/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java similarity index 100% rename from src/org/apache/commons/collections4/list/UnmodifiableList.java rename to src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java diff --git a/src/org/apache/commons/collections4/list/package-info.java b/src/main/java/org/apache/commons/collections4/list/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/list/package-info.java rename to src/main/java/org/apache/commons/collections4/list/package-info.java diff --git a/src/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractHashedMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java diff --git a/src/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java diff --git a/src/org/apache/commons/collections4/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractIterableMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java diff --git a/src/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractLinkedMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java diff --git a/src/org/apache/commons/collections4/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java diff --git a/src/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java diff --git a/src/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractReferenceMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java diff --git a/src/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java diff --git a/src/org/apache/commons/collections4/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/CaseInsensitiveMap.java rename to src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java diff --git a/src/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/CompositeMap.java rename to src/main/java/org/apache/commons/collections4/map/CompositeMap.java diff --git a/src/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/DefaultedMap.java rename to src/main/java/org/apache/commons/collections4/map/DefaultedMap.java diff --git a/src/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java similarity index 100% rename from src/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java rename to src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java diff --git a/src/org/apache/commons/collections4/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/FixedSizeMap.java rename to src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java diff --git a/src/org/apache/commons/collections4/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/FixedSizeSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java diff --git a/src/org/apache/commons/collections4/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java similarity index 100% rename from src/org/apache/commons/collections4/map/Flat3Map.java rename to src/main/java/org/apache/commons/collections4/map/Flat3Map.java diff --git a/src/org/apache/commons/collections4/map/HashedMap.java b/src/main/java/org/apache/commons/collections4/map/HashedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/HashedMap.java rename to src/main/java/org/apache/commons/collections4/map/HashedMap.java diff --git a/src/org/apache/commons/collections4/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/LRUMap.java rename to src/main/java/org/apache/commons/collections4/map/LRUMap.java diff --git a/src/org/apache/commons/collections4/map/LazyMap.java b/src/main/java/org/apache/commons/collections4/map/LazyMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/LazyMap.java rename to src/main/java/org/apache/commons/collections4/map/LazyMap.java diff --git a/src/org/apache/commons/collections4/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/LazySortedMap.java rename to src/main/java/org/apache/commons/collections4/map/LazySortedMap.java diff --git a/src/org/apache/commons/collections4/map/LinkedMap.java b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/LinkedMap.java rename to src/main/java/org/apache/commons/collections4/map/LinkedMap.java diff --git a/src/org/apache/commons/collections4/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/ListOrderedMap.java rename to src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java diff --git a/src/org/apache/commons/collections4/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/MultiKeyMap.java rename to src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java diff --git a/src/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/MultiValueMap.java rename to src/main/java/org/apache/commons/collections4/map/MultiValueMap.java diff --git a/src/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/PassiveExpiringMap.java rename to src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java diff --git a/src/org/apache/commons/collections4/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/PredicatedMap.java rename to src/main/java/org/apache/commons/collections4/map/PredicatedMap.java diff --git a/src/org/apache/commons/collections4/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/PredicatedSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java diff --git a/src/org/apache/commons/collections4/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/ReferenceIdentityMap.java rename to src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java diff --git a/src/org/apache/commons/collections4/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/ReferenceMap.java rename to src/main/java/org/apache/commons/collections4/map/ReferenceMap.java diff --git a/src/org/apache/commons/collections4/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/SingletonMap.java rename to src/main/java/org/apache/commons/collections4/map/SingletonMap.java diff --git a/src/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/StaticBucketMap.java rename to src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java diff --git a/src/org/apache/commons/collections4/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/TransformedMap.java rename to src/main/java/org/apache/commons/collections4/map/TransformedMap.java diff --git a/src/org/apache/commons/collections4/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/TransformedSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java diff --git a/src/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java similarity index 100% rename from src/org/apache/commons/collections4/map/UnmodifiableEntrySet.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java diff --git a/src/org/apache/commons/collections4/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/UnmodifiableMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java diff --git a/src/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java diff --git a/src/org/apache/commons/collections4/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java similarity index 100% rename from src/org/apache/commons/collections4/map/UnmodifiableSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java diff --git a/src/org/apache/commons/collections4/map/package-info.java b/src/main/java/org/apache/commons/collections4/map/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/map/package-info.java rename to src/main/java/org/apache/commons/collections4/map/package-info.java diff --git a/src/org/apache/commons/collections4/multimap/AbstractListValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/AbstractListValuedMap.java rename to src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java diff --git a/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java rename to src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java diff --git a/src/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java diff --git a/src/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java rename to src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java diff --git a/src/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java rename to src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java diff --git a/src/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java rename to src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java diff --git a/src/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java rename to src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java diff --git a/src/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java rename to src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java diff --git a/src/org/apache/commons/collections4/multimap/package-info.java b/src/main/java/org/apache/commons/collections4/multimap/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/multimap/package-info.java rename to src/main/java/org/apache/commons/collections4/multimap/package-info.java diff --git a/src/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/AbstractMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/AbstractMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java rename to src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java diff --git a/src/org/apache/commons/collections4/multiset/HashMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/HashMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/PredicatedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/PredicatedMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java rename to src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java diff --git a/src/org/apache/commons/collections4/multiset/package-info.java b/src/main/java/org/apache/commons/collections4/multiset/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/multiset/package-info.java rename to src/main/java/org/apache/commons/collections4/multiset/package-info.java diff --git a/src/org/apache/commons/collections4/overview.html b/src/main/java/org/apache/commons/collections4/overview.html similarity index 100% rename from src/org/apache/commons/collections4/overview.html rename to src/main/java/org/apache/commons/collections4/overview.html diff --git a/src/org/apache/commons/collections4/package-info.java b/src/main/java/org/apache/commons/collections4/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/package-info.java rename to src/main/java/org/apache/commons/collections4/package-info.java diff --git a/src/org/apache/commons/collections4/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/queue/AbstractQueueDecorator.java rename to src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java diff --git a/src/org/apache/commons/collections4/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java similarity index 100% rename from src/org/apache/commons/collections4/queue/CircularFifoQueue.java rename to src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java diff --git a/src/org/apache/commons/collections4/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java similarity index 100% rename from src/org/apache/commons/collections4/queue/PredicatedQueue.java rename to src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java diff --git a/src/org/apache/commons/collections4/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java similarity index 100% rename from src/org/apache/commons/collections4/queue/TransformedQueue.java rename to src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java diff --git a/src/org/apache/commons/collections4/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java similarity index 100% rename from src/org/apache/commons/collections4/queue/UnmodifiableQueue.java rename to src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java diff --git a/src/org/apache/commons/collections4/queue/package-info.java b/src/main/java/org/apache/commons/collections4/queue/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/queue/package-info.java rename to src/main/java/org/apache/commons/collections4/queue/package-info.java diff --git a/src/org/apache/commons/collections4/sequence/CommandVisitor.java b/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/CommandVisitor.java rename to src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java diff --git a/src/org/apache/commons/collections4/sequence/DeleteCommand.java b/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/DeleteCommand.java rename to src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java diff --git a/src/org/apache/commons/collections4/sequence/EditCommand.java b/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/EditCommand.java rename to src/main/java/org/apache/commons/collections4/sequence/EditCommand.java diff --git a/src/org/apache/commons/collections4/sequence/EditScript.java b/src/main/java/org/apache/commons/collections4/sequence/EditScript.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/EditScript.java rename to src/main/java/org/apache/commons/collections4/sequence/EditScript.java diff --git a/src/org/apache/commons/collections4/sequence/InsertCommand.java b/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/InsertCommand.java rename to src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java diff --git a/src/org/apache/commons/collections4/sequence/KeepCommand.java b/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/KeepCommand.java rename to src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java diff --git a/src/org/apache/commons/collections4/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/ReplacementsFinder.java rename to src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java diff --git a/src/org/apache/commons/collections4/sequence/ReplacementsHandler.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/ReplacementsHandler.java rename to src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java diff --git a/src/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/SequencesComparator.java rename to src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java diff --git a/src/org/apache/commons/collections4/sequence/package-info.java b/src/main/java/org/apache/commons/collections4/sequence/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/sequence/package-info.java rename to src/main/java/org/apache/commons/collections4/sequence/package-info.java diff --git a/src/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java diff --git a/src/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java diff --git a/src/org/apache/commons/collections4/set/AbstractSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/set/AbstractSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java diff --git a/src/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java diff --git a/src/org/apache/commons/collections4/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/CompositeSet.java rename to src/main/java/org/apache/commons/collections4/set/CompositeSet.java diff --git a/src/org/apache/commons/collections4/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/ListOrderedSet.java rename to src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java diff --git a/src/org/apache/commons/collections4/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/MapBackedSet.java rename to src/main/java/org/apache/commons/collections4/set/MapBackedSet.java diff --git a/src/org/apache/commons/collections4/set/PredicatedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/PredicatedNavigableSet.java rename to src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java diff --git a/src/org/apache/commons/collections4/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/PredicatedSet.java rename to src/main/java/org/apache/commons/collections4/set/PredicatedSet.java diff --git a/src/org/apache/commons/collections4/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/PredicatedSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java diff --git a/src/org/apache/commons/collections4/set/TransformedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/TransformedNavigableSet.java rename to src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java diff --git a/src/org/apache/commons/collections4/set/TransformedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/TransformedSet.java rename to src/main/java/org/apache/commons/collections4/set/TransformedSet.java diff --git a/src/org/apache/commons/collections4/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/TransformedSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java diff --git a/src/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java diff --git a/src/org/apache/commons/collections4/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/UnmodifiableSet.java rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java diff --git a/src/org/apache/commons/collections4/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java similarity index 100% rename from src/org/apache/commons/collections4/set/UnmodifiableSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java diff --git a/src/org/apache/commons/collections4/set/package-info.java b/src/main/java/org/apache/commons/collections4/set/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/set/package-info.java rename to src/main/java/org/apache/commons/collections4/set/package-info.java diff --git a/src/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java similarity index 100% rename from src/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java rename to src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java diff --git a/src/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java similarity index 100% rename from src/org/apache/commons/collections4/splitmap/TransformedSplitMap.java rename to src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java diff --git a/src/org/apache/commons/collections4/splitmap/package-info.java b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/splitmap/package-info.java rename to src/main/java/org/apache/commons/collections4/splitmap/package-info.java diff --git a/src/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java similarity index 100% rename from src/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java rename to src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java diff --git a/src/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java similarity index 100% rename from src/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java rename to src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java diff --git a/src/org/apache/commons/collections4/trie/KeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java similarity index 100% rename from src/org/apache/commons/collections4/trie/KeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java diff --git a/src/org/apache/commons/collections4/trie/PatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java similarity index 100% rename from src/org/apache/commons/collections4/trie/PatriciaTrie.java rename to src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java diff --git a/src/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java similarity index 100% rename from src/org/apache/commons/collections4/trie/UnmodifiableTrie.java rename to src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java diff --git a/src/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java similarity index 100% rename from src/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java diff --git a/src/org/apache/commons/collections4/trie/analyzer/package-info.java b/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/trie/analyzer/package-info.java rename to src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java diff --git a/src/org/apache/commons/collections4/trie/package-info.java b/src/main/java/org/apache/commons/collections4/trie/package-info.java similarity index 100% rename from src/org/apache/commons/collections4/trie/package-info.java rename to src/main/java/org/apache/commons/collections4/trie/package-info.java diff --git a/src/org/apache/commons/lang3/AnnotationUtils.java b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java similarity index 100% rename from src/org/apache/commons/lang3/AnnotationUtils.java rename to src/main/java/org/apache/commons/lang3/AnnotationUtils.java diff --git a/src/org/apache/commons/lang3/ArchUtils.java b/src/main/java/org/apache/commons/lang3/ArchUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ArchUtils.java rename to src/main/java/org/apache/commons/lang3/ArchUtils.java diff --git a/src/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ArrayUtils.java rename to src/main/java/org/apache/commons/lang3/ArrayUtils.java diff --git a/src/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java similarity index 100% rename from src/org/apache/commons/lang3/BitField.java rename to src/main/java/org/apache/commons/lang3/BitField.java diff --git a/src/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java similarity index 100% rename from src/org/apache/commons/lang3/BooleanUtils.java rename to src/main/java/org/apache/commons/lang3/BooleanUtils.java diff --git a/src/org/apache/commons/lang3/CharEncoding.java b/src/main/java/org/apache/commons/lang3/CharEncoding.java similarity index 100% rename from src/org/apache/commons/lang3/CharEncoding.java rename to src/main/java/org/apache/commons/lang3/CharEncoding.java diff --git a/src/org/apache/commons/lang3/CharRange.java b/src/main/java/org/apache/commons/lang3/CharRange.java similarity index 100% rename from src/org/apache/commons/lang3/CharRange.java rename to src/main/java/org/apache/commons/lang3/CharRange.java diff --git a/src/org/apache/commons/lang3/CharSequenceUtils.java b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java similarity index 100% rename from src/org/apache/commons/lang3/CharSequenceUtils.java rename to src/main/java/org/apache/commons/lang3/CharSequenceUtils.java diff --git a/src/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java similarity index 100% rename from src/org/apache/commons/lang3/CharSet.java rename to src/main/java/org/apache/commons/lang3/CharSet.java diff --git a/src/org/apache/commons/lang3/CharSetUtils.java b/src/main/java/org/apache/commons/lang3/CharSetUtils.java similarity index 100% rename from src/org/apache/commons/lang3/CharSetUtils.java rename to src/main/java/org/apache/commons/lang3/CharSetUtils.java diff --git a/src/org/apache/commons/lang3/CharUtils.java b/src/main/java/org/apache/commons/lang3/CharUtils.java similarity index 100% rename from src/org/apache/commons/lang3/CharUtils.java rename to src/main/java/org/apache/commons/lang3/CharUtils.java diff --git a/src/org/apache/commons/lang3/ClassPathUtils.java b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ClassPathUtils.java rename to src/main/java/org/apache/commons/lang3/ClassPathUtils.java diff --git a/src/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ClassUtils.java rename to src/main/java/org/apache/commons/lang3/ClassUtils.java diff --git a/src/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java similarity index 100% rename from src/org/apache/commons/lang3/Conversion.java rename to src/main/java/org/apache/commons/lang3/Conversion.java diff --git a/src/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java similarity index 100% rename from src/org/apache/commons/lang3/EnumUtils.java rename to src/main/java/org/apache/commons/lang3/EnumUtils.java diff --git a/src/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java similarity index 100% rename from src/org/apache/commons/lang3/JavaVersion.java rename to src/main/java/org/apache/commons/lang3/JavaVersion.java diff --git a/src/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java similarity index 100% rename from src/org/apache/commons/lang3/LocaleUtils.java rename to src/main/java/org/apache/commons/lang3/LocaleUtils.java diff --git a/src/org/apache/commons/lang3/NotImplementedException.java b/src/main/java/org/apache/commons/lang3/NotImplementedException.java similarity index 100% rename from src/org/apache/commons/lang3/NotImplementedException.java rename to src/main/java/org/apache/commons/lang3/NotImplementedException.java diff --git a/src/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ObjectUtils.java rename to src/main/java/org/apache/commons/lang3/ObjectUtils.java diff --git a/src/org/apache/commons/lang3/RandomStringUtils.java b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java similarity index 100% rename from src/org/apache/commons/lang3/RandomStringUtils.java rename to src/main/java/org/apache/commons/lang3/RandomStringUtils.java diff --git a/src/org/apache/commons/lang3/RandomUtils.java b/src/main/java/org/apache/commons/lang3/RandomUtils.java similarity index 100% rename from src/org/apache/commons/lang3/RandomUtils.java rename to src/main/java/org/apache/commons/lang3/RandomUtils.java diff --git a/src/org/apache/commons/lang3/Range.java b/src/main/java/org/apache/commons/lang3/Range.java similarity index 100% rename from src/org/apache/commons/lang3/Range.java rename to src/main/java/org/apache/commons/lang3/Range.java diff --git a/src/org/apache/commons/lang3/SerializationException.java b/src/main/java/org/apache/commons/lang3/SerializationException.java similarity index 100% rename from src/org/apache/commons/lang3/SerializationException.java rename to src/main/java/org/apache/commons/lang3/SerializationException.java diff --git a/src/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java similarity index 100% rename from src/org/apache/commons/lang3/SerializationUtils.java rename to src/main/java/org/apache/commons/lang3/SerializationUtils.java diff --git a/src/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java similarity index 100% rename from src/org/apache/commons/lang3/StringEscapeUtils.java rename to src/main/java/org/apache/commons/lang3/StringEscapeUtils.java diff --git a/src/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java similarity index 100% rename from src/org/apache/commons/lang3/StringUtils.java rename to src/main/java/org/apache/commons/lang3/StringUtils.java diff --git a/src/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java similarity index 100% rename from src/org/apache/commons/lang3/SystemUtils.java rename to src/main/java/org/apache/commons/lang3/SystemUtils.java diff --git a/src/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java similarity index 100% rename from src/org/apache/commons/lang3/ThreadUtils.java rename to src/main/java/org/apache/commons/lang3/ThreadUtils.java diff --git a/src/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java similarity index 100% rename from src/org/apache/commons/lang3/Validate.java rename to src/main/java/org/apache/commons/lang3/Validate.java diff --git a/src/org/apache/commons/lang3/arch/Processor.java b/src/main/java/org/apache/commons/lang3/arch/Processor.java similarity index 100% rename from src/org/apache/commons/lang3/arch/Processor.java rename to src/main/java/org/apache/commons/lang3/arch/Processor.java diff --git a/src/org/apache/commons/lang3/arch/package-info.java b/src/main/java/org/apache/commons/lang3/arch/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/arch/package-info.java rename to src/main/java/org/apache/commons/lang3/arch/package-info.java diff --git a/src/org/apache/commons/lang3/builder/Builder.java b/src/main/java/org/apache/commons/lang3/builder/Builder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/Builder.java rename to src/main/java/org/apache/commons/lang3/builder/Builder.java diff --git a/src/org/apache/commons/lang3/builder/CompareToBuilder.java b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/CompareToBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java diff --git a/src/org/apache/commons/lang3/builder/Diff.java b/src/main/java/org/apache/commons/lang3/builder/Diff.java similarity index 100% rename from src/org/apache/commons/lang3/builder/Diff.java rename to src/main/java/org/apache/commons/lang3/builder/Diff.java diff --git a/src/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/DiffBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java diff --git a/src/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java similarity index 100% rename from src/org/apache/commons/lang3/builder/DiffResult.java rename to src/main/java/org/apache/commons/lang3/builder/DiffResult.java diff --git a/src/org/apache/commons/lang3/builder/Diffable.java b/src/main/java/org/apache/commons/lang3/builder/Diffable.java similarity index 100% rename from src/org/apache/commons/lang3/builder/Diffable.java rename to src/main/java/org/apache/commons/lang3/builder/Diffable.java diff --git a/src/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/EqualsBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java diff --git a/src/org/apache/commons/lang3/builder/EqualsExclude.java b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java similarity index 100% rename from src/org/apache/commons/lang3/builder/EqualsExclude.java rename to src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java diff --git a/src/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/HashCodeBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java diff --git a/src/org/apache/commons/lang3/builder/HashCodeExclude.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java similarity index 100% rename from src/org/apache/commons/lang3/builder/HashCodeExclude.java rename to src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java diff --git a/src/org/apache/commons/lang3/builder/IDKey.java b/src/main/java/org/apache/commons/lang3/builder/IDKey.java similarity index 100% rename from src/org/apache/commons/lang3/builder/IDKey.java rename to src/main/java/org/apache/commons/lang3/builder/IDKey.java diff --git a/src/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java similarity index 100% rename from src/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java rename to src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java diff --git a/src/org/apache/commons/lang3/builder/RecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java similarity index 100% rename from src/org/apache/commons/lang3/builder/RecursiveToStringStyle.java rename to src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java diff --git a/src/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java diff --git a/src/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java diff --git a/src/org/apache/commons/lang3/builder/StandardToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java similarity index 100% rename from src/org/apache/commons/lang3/builder/StandardToStringStyle.java rename to src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java diff --git a/src/org/apache/commons/lang3/builder/ToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/builder/ToStringBuilder.java rename to src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java diff --git a/src/org/apache/commons/lang3/builder/ToStringExclude.java b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java similarity index 100% rename from src/org/apache/commons/lang3/builder/ToStringExclude.java rename to src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java diff --git a/src/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java similarity index 100% rename from src/org/apache/commons/lang3/builder/ToStringStyle.java rename to src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java diff --git a/src/org/apache/commons/lang3/builder/package-info.java b/src/main/java/org/apache/commons/lang3/builder/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/builder/package-info.java rename to src/main/java/org/apache/commons/lang3/builder/package-info.java diff --git a/src/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java rename to src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java diff --git a/src/org/apache/commons/lang3/concurrent/AtomicInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/AtomicInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/BackgroundInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/BasicThreadFactory.java b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/BasicThreadFactory.java rename to src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java diff --git a/src/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/CircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/CircuitBreaker.java rename to src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java diff --git a/src/org/apache/commons/lang3/concurrent/CircuitBreakingException.java b/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreakingException.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/CircuitBreakingException.java rename to src/main/java/org/apache/commons/lang3/concurrent/CircuitBreakingException.java diff --git a/src/org/apache/commons/lang3/concurrent/Computable.java b/src/main/java/org/apache/commons/lang3/concurrent/Computable.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/Computable.java rename to src/main/java/org/apache/commons/lang3/concurrent/Computable.java diff --git a/src/org/apache/commons/lang3/concurrent/ConcurrentException.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ConcurrentException.java rename to src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java diff --git a/src/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java rename to src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java diff --git a/src/org/apache/commons/lang3/concurrent/ConcurrentUtils.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ConcurrentUtils.java rename to src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java diff --git a/src/org/apache/commons/lang3/concurrent/ConstantInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ConstantInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java rename to src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java diff --git a/src/org/apache/commons/lang3/concurrent/LazyInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/LazyInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/Memoizer.java b/src/main/java/org/apache/commons/lang3/concurrent/Memoizer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/Memoizer.java rename to src/main/java/org/apache/commons/lang3/concurrent/Memoizer.java diff --git a/src/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java rename to src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java diff --git a/src/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java rename to src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java diff --git a/src/org/apache/commons/lang3/concurrent/TimedSemaphore.java b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/TimedSemaphore.java rename to src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java diff --git a/src/org/apache/commons/lang3/concurrent/annotation/GuardedBy.java b/src/main/java/org/apache/commons/lang3/concurrent/annotation/GuardedBy.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/annotation/GuardedBy.java rename to src/main/java/org/apache/commons/lang3/concurrent/annotation/GuardedBy.java diff --git a/src/org/apache/commons/lang3/concurrent/annotation/Immutable.java b/src/main/java/org/apache/commons/lang3/concurrent/annotation/Immutable.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/annotation/Immutable.java rename to src/main/java/org/apache/commons/lang3/concurrent/annotation/Immutable.java diff --git a/src/org/apache/commons/lang3/concurrent/annotation/NotThreadSafe.java b/src/main/java/org/apache/commons/lang3/concurrent/annotation/NotThreadSafe.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/annotation/NotThreadSafe.java rename to src/main/java/org/apache/commons/lang3/concurrent/annotation/NotThreadSafe.java diff --git a/src/org/apache/commons/lang3/concurrent/annotation/ThreadSafe.java b/src/main/java/org/apache/commons/lang3/concurrent/annotation/ThreadSafe.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/annotation/ThreadSafe.java rename to src/main/java/org/apache/commons/lang3/concurrent/annotation/ThreadSafe.java diff --git a/src/org/apache/commons/lang3/concurrent/annotation/package-info.java b/src/main/java/org/apache/commons/lang3/concurrent/annotation/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/annotation/package-info.java rename to src/main/java/org/apache/commons/lang3/concurrent/annotation/package-info.java diff --git a/src/org/apache/commons/lang3/concurrent/package-info.java b/src/main/java/org/apache/commons/lang3/concurrent/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/concurrent/package-info.java rename to src/main/java/org/apache/commons/lang3/concurrent/package-info.java diff --git a/src/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java similarity index 100% rename from src/org/apache/commons/lang3/event/EventListenerSupport.java rename to src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java diff --git a/src/org/apache/commons/lang3/event/EventUtils.java b/src/main/java/org/apache/commons/lang3/event/EventUtils.java similarity index 100% rename from src/org/apache/commons/lang3/event/EventUtils.java rename to src/main/java/org/apache/commons/lang3/event/EventUtils.java diff --git a/src/org/apache/commons/lang3/event/package-info.java b/src/main/java/org/apache/commons/lang3/event/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/event/package-info.java rename to src/main/java/org/apache/commons/lang3/event/package-info.java diff --git a/src/org/apache/commons/lang3/exception/CloneFailedException.java b/src/main/java/org/apache/commons/lang3/exception/CloneFailedException.java similarity index 100% rename from src/org/apache/commons/lang3/exception/CloneFailedException.java rename to src/main/java/org/apache/commons/lang3/exception/CloneFailedException.java diff --git a/src/org/apache/commons/lang3/exception/ContextedException.java b/src/main/java/org/apache/commons/lang3/exception/ContextedException.java similarity index 100% rename from src/org/apache/commons/lang3/exception/ContextedException.java rename to src/main/java/org/apache/commons/lang3/exception/ContextedException.java diff --git a/src/org/apache/commons/lang3/exception/ContextedRuntimeException.java b/src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java similarity index 100% rename from src/org/apache/commons/lang3/exception/ContextedRuntimeException.java rename to src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java diff --git a/src/org/apache/commons/lang3/exception/DefaultExceptionContext.java b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java similarity index 100% rename from src/org/apache/commons/lang3/exception/DefaultExceptionContext.java rename to src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java diff --git a/src/org/apache/commons/lang3/exception/ExceptionContext.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionContext.java similarity index 100% rename from src/org/apache/commons/lang3/exception/ExceptionContext.java rename to src/main/java/org/apache/commons/lang3/exception/ExceptionContext.java diff --git a/src/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java similarity index 100% rename from src/org/apache/commons/lang3/exception/ExceptionUtils.java rename to src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java diff --git a/src/org/apache/commons/lang3/exception/package-info.java b/src/main/java/org/apache/commons/lang3/exception/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/exception/package-info.java rename to src/main/java/org/apache/commons/lang3/exception/package-info.java diff --git a/src/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java similarity index 100% rename from src/org/apache/commons/lang3/math/Fraction.java rename to src/main/java/org/apache/commons/lang3/math/Fraction.java diff --git a/src/org/apache/commons/lang3/math/IEEE754rUtils.java b/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java similarity index 100% rename from src/org/apache/commons/lang3/math/IEEE754rUtils.java rename to src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java diff --git a/src/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java similarity index 100% rename from src/org/apache/commons/lang3/math/NumberUtils.java rename to src/main/java/org/apache/commons/lang3/math/NumberUtils.java diff --git a/src/org/apache/commons/lang3/math/package-info.java b/src/main/java/org/apache/commons/lang3/math/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/math/package-info.java rename to src/main/java/org/apache/commons/lang3/math/package-info.java diff --git a/src/org/apache/commons/lang3/mutable/Mutable.java b/src/main/java/org/apache/commons/lang3/mutable/Mutable.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/Mutable.java rename to src/main/java/org/apache/commons/lang3/mutable/Mutable.java diff --git a/src/org/apache/commons/lang3/mutable/MutableBoolean.java b/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableBoolean.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java diff --git a/src/org/apache/commons/lang3/mutable/MutableByte.java b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableByte.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableByte.java diff --git a/src/org/apache/commons/lang3/mutable/MutableDouble.java b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableDouble.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java diff --git a/src/org/apache/commons/lang3/mutable/MutableFloat.java b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableFloat.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java diff --git a/src/org/apache/commons/lang3/mutable/MutableInt.java b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableInt.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableInt.java diff --git a/src/org/apache/commons/lang3/mutable/MutableLong.java b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableLong.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableLong.java diff --git a/src/org/apache/commons/lang3/mutable/MutableObject.java b/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableObject.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableObject.java diff --git a/src/org/apache/commons/lang3/mutable/MutableShort.java b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/MutableShort.java rename to src/main/java/org/apache/commons/lang3/mutable/MutableShort.java diff --git a/src/org/apache/commons/lang3/mutable/package-info.java b/src/main/java/org/apache/commons/lang3/mutable/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/mutable/package-info.java rename to src/main/java/org/apache/commons/lang3/mutable/package-info.java diff --git a/src/org/apache/commons/lang3/package-info.java b/src/main/java/org/apache/commons/lang3/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/package-info.java rename to src/main/java/org/apache/commons/lang3/package-info.java diff --git a/src/org/apache/commons/lang3/reflect/ConstructorUtils.java b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/ConstructorUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java diff --git a/src/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/FieldUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java diff --git a/src/org/apache/commons/lang3/reflect/InheritanceUtils.java b/src/main/java/org/apache/commons/lang3/reflect/InheritanceUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/InheritanceUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/InheritanceUtils.java diff --git a/src/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/MemberUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java diff --git a/src/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/MethodUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java diff --git a/src/org/apache/commons/lang3/reflect/TypeLiteral.java b/src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/TypeLiteral.java rename to src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java diff --git a/src/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/TypeUtils.java rename to src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java diff --git a/src/org/apache/commons/lang3/reflect/Typed.java b/src/main/java/org/apache/commons/lang3/reflect/Typed.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/Typed.java rename to src/main/java/org/apache/commons/lang3/reflect/Typed.java diff --git a/src/org/apache/commons/lang3/reflect/package-info.java b/src/main/java/org/apache/commons/lang3/reflect/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/reflect/package-info.java rename to src/main/java/org/apache/commons/lang3/reflect/package-info.java diff --git a/src/org/apache/commons/lang3/text/CompositeFormat.java b/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java similarity index 100% rename from src/org/apache/commons/lang3/text/CompositeFormat.java rename to src/main/java/org/apache/commons/lang3/text/CompositeFormat.java diff --git a/src/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java similarity index 100% rename from src/org/apache/commons/lang3/text/ExtendedMessageFormat.java rename to src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java diff --git a/src/org/apache/commons/lang3/text/FormatFactory.java b/src/main/java/org/apache/commons/lang3/text/FormatFactory.java similarity index 100% rename from src/org/apache/commons/lang3/text/FormatFactory.java rename to src/main/java/org/apache/commons/lang3/text/FormatFactory.java diff --git a/src/org/apache/commons/lang3/text/FormattableUtils.java b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java similarity index 100% rename from src/org/apache/commons/lang3/text/FormattableUtils.java rename to src/main/java/org/apache/commons/lang3/text/FormattableUtils.java diff --git a/src/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java similarity index 100% rename from src/org/apache/commons/lang3/text/StrBuilder.java rename to src/main/java/org/apache/commons/lang3/text/StrBuilder.java diff --git a/src/org/apache/commons/lang3/text/StrLookup.java b/src/main/java/org/apache/commons/lang3/text/StrLookup.java similarity index 100% rename from src/org/apache/commons/lang3/text/StrLookup.java rename to src/main/java/org/apache/commons/lang3/text/StrLookup.java diff --git a/src/org/apache/commons/lang3/text/StrMatcher.java b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java similarity index 100% rename from src/org/apache/commons/lang3/text/StrMatcher.java rename to src/main/java/org/apache/commons/lang3/text/StrMatcher.java diff --git a/src/org/apache/commons/lang3/text/StrSubstitutor.java b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java similarity index 100% rename from src/org/apache/commons/lang3/text/StrSubstitutor.java rename to src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java diff --git a/src/org/apache/commons/lang3/text/StrTokenizer.java b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java similarity index 100% rename from src/org/apache/commons/lang3/text/StrTokenizer.java rename to src/main/java/org/apache/commons/lang3/text/StrTokenizer.java diff --git a/src/org/apache/commons/lang3/text/WordUtils.java b/src/main/java/org/apache/commons/lang3/text/WordUtils.java similarity index 100% rename from src/org/apache/commons/lang3/text/WordUtils.java rename to src/main/java/org/apache/commons/lang3/text/WordUtils.java diff --git a/src/org/apache/commons/lang3/text/package-info.java b/src/main/java/org/apache/commons/lang3/text/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/text/package-info.java rename to src/main/java/org/apache/commons/lang3/text/package-info.java diff --git a/src/org/apache/commons/lang3/text/translate/AggregateTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/AggregateTranslator.java rename to src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java diff --git a/src/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java rename to src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java diff --git a/src/org/apache/commons/lang3/text/translate/CodePointTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/CodePointTranslator.java rename to src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java diff --git a/src/org/apache/commons/lang3/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/EntityArrays.java rename to src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java diff --git a/src/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java diff --git a/src/org/apache/commons/lang3/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/LookupTranslator.java rename to src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java diff --git a/src/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java diff --git a/src/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java diff --git a/src/org/apache/commons/lang3/text/translate/OctalUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/OctalUnescaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java diff --git a/src/org/apache/commons/lang3/text/translate/UnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/UnicodeEscaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java diff --git a/src/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java rename to src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java diff --git a/src/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java rename to src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java diff --git a/src/org/apache/commons/lang3/text/translate/package-info.java b/src/main/java/org/apache/commons/lang3/text/translate/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/text/translate/package-info.java rename to src/main/java/org/apache/commons/lang3/text/translate/package-info.java diff --git a/src/org/apache/commons/lang3/time/DateFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java similarity index 100% rename from src/org/apache/commons/lang3/time/DateFormatUtils.java rename to src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java diff --git a/src/org/apache/commons/lang3/time/DateParser.java b/src/main/java/org/apache/commons/lang3/time/DateParser.java similarity index 100% rename from src/org/apache/commons/lang3/time/DateParser.java rename to src/main/java/org/apache/commons/lang3/time/DateParser.java diff --git a/src/org/apache/commons/lang3/time/DatePrinter.java b/src/main/java/org/apache/commons/lang3/time/DatePrinter.java similarity index 100% rename from src/org/apache/commons/lang3/time/DatePrinter.java rename to src/main/java/org/apache/commons/lang3/time/DatePrinter.java diff --git a/src/org/apache/commons/lang3/time/DateUtils.java b/src/main/java/org/apache/commons/lang3/time/DateUtils.java similarity index 100% rename from src/org/apache/commons/lang3/time/DateUtils.java rename to src/main/java/org/apache/commons/lang3/time/DateUtils.java diff --git a/src/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java similarity index 100% rename from src/org/apache/commons/lang3/time/DurationFormatUtils.java rename to src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java diff --git a/src/org/apache/commons/lang3/time/FastDateFormat.java b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java similarity index 100% rename from src/org/apache/commons/lang3/time/FastDateFormat.java rename to src/main/java/org/apache/commons/lang3/time/FastDateFormat.java diff --git a/src/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java similarity index 100% rename from src/org/apache/commons/lang3/time/FastDateParser.java rename to src/main/java/org/apache/commons/lang3/time/FastDateParser.java diff --git a/src/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java similarity index 100% rename from src/org/apache/commons/lang3/time/FastDatePrinter.java rename to src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java diff --git a/src/org/apache/commons/lang3/time/FormatCache.java b/src/main/java/org/apache/commons/lang3/time/FormatCache.java similarity index 100% rename from src/org/apache/commons/lang3/time/FormatCache.java rename to src/main/java/org/apache/commons/lang3/time/FormatCache.java diff --git a/src/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java similarity index 100% rename from src/org/apache/commons/lang3/time/StopWatch.java rename to src/main/java/org/apache/commons/lang3/time/StopWatch.java diff --git a/src/org/apache/commons/lang3/time/package-info.java b/src/main/java/org/apache/commons/lang3/time/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/time/package-info.java rename to src/main/java/org/apache/commons/lang3/time/package-info.java diff --git a/src/org/apache/commons/lang3/tuple/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/ImmutablePair.java rename to src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java diff --git a/src/org/apache/commons/lang3/tuple/ImmutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/ImmutableTriple.java rename to src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java diff --git a/src/org/apache/commons/lang3/tuple/MutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/MutablePair.java rename to src/main/java/org/apache/commons/lang3/tuple/MutablePair.java diff --git a/src/org/apache/commons/lang3/tuple/MutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/MutableTriple.java rename to src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java diff --git a/src/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/Pair.java rename to src/main/java/org/apache/commons/lang3/tuple/Pair.java diff --git a/src/org/apache/commons/lang3/tuple/Triple.java b/src/main/java/org/apache/commons/lang3/tuple/Triple.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/Triple.java rename to src/main/java/org/apache/commons/lang3/tuple/Triple.java diff --git a/src/org/apache/commons/lang3/tuple/package-info.java b/src/main/java/org/apache/commons/lang3/tuple/package-info.java similarity index 100% rename from src/org/apache/commons/lang3/tuple/package-info.java rename to src/main/java/org/apache/commons/lang3/tuple/package-info.java diff --git a/src/us/hcrealms/hcf/Base.java b/src/main/java/us/hcrealms/hcf/Base.java similarity index 100% rename from src/us/hcrealms/hcf/Base.java rename to src/main/java/us/hcrealms/hcf/Base.java diff --git a/src/us/hcrealms/hcf/BaseCommand.java b/src/main/java/us/hcrealms/hcf/BaseCommand.java similarity index 100% rename from src/us/hcrealms/hcf/BaseCommand.java rename to src/main/java/us/hcrealms/hcf/BaseCommand.java diff --git a/src/us/hcrealms/hcf/BaseConstants.java b/src/main/java/us/hcrealms/hcf/BaseConstants.java similarity index 100% rename from src/us/hcrealms/hcf/BaseConstants.java rename to src/main/java/us/hcrealms/hcf/BaseConstants.java diff --git a/src/us/hcrealms/hcf/BasePlugins.java b/src/main/java/us/hcrealms/hcf/BasePlugins.java similarity index 100% rename from src/us/hcrealms/hcf/BasePlugins.java rename to src/main/java/us/hcrealms/hcf/BasePlugins.java diff --git a/src/us/hcrealms/hcf/ConfigurationService.java b/src/main/java/us/hcrealms/hcf/ConfigurationService.java similarity index 100% rename from src/us/hcrealms/hcf/ConfigurationService.java rename to src/main/java/us/hcrealms/hcf/ConfigurationService.java diff --git a/src/us/hcrealms/hcf/Cooldowns.java b/src/main/java/us/hcrealms/hcf/Cooldowns.java similarity index 100% rename from src/us/hcrealms/hcf/Cooldowns.java rename to src/main/java/us/hcrealms/hcf/Cooldowns.java diff --git a/src/us/hcrealms/hcf/DateTimeFormats.java b/src/main/java/us/hcrealms/hcf/DateTimeFormats.java similarity index 100% rename from src/us/hcrealms/hcf/DateTimeFormats.java rename to src/main/java/us/hcrealms/hcf/DateTimeFormats.java diff --git a/src/us/hcrealms/hcf/Message.java b/src/main/java/us/hcrealms/hcf/Message.java similarity index 99% rename from src/us/hcrealms/hcf/Message.java rename to src/main/java/us/hcrealms/hcf/Message.java index cbb4157..6990161 100644 --- a/src/us/hcrealms/hcf/Message.java +++ b/src/main/java/us/hcrealms/hcf/Message.java @@ -37,4 +37,4 @@ public final class Message { this.messageDelay.putIfAbsent(player.getUniqueId(), Long.valueOf(System.currentTimeMillis() + 3000L)); text.send(player); } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/PersistableLocation.java b/src/main/java/us/hcrealms/hcf/PersistableLocation.java similarity index 100% rename from src/us/hcrealms/hcf/PersistableLocation.java rename to src/main/java/us/hcrealms/hcf/PersistableLocation.java diff --git a/src/us/hcrealms/hcf/ServerHandler.java b/src/main/java/us/hcrealms/hcf/ServerHandler.java similarity index 100% rename from src/us/hcrealms/hcf/ServerHandler.java rename to src/main/java/us/hcrealms/hcf/ServerHandler.java diff --git a/src/us/hcrealms/hcf/ServerParticipator.java b/src/main/java/us/hcrealms/hcf/ServerParticipator.java similarity index 100% rename from src/us/hcrealms/hcf/ServerParticipator.java rename to src/main/java/us/hcrealms/hcf/ServerParticipator.java diff --git a/src/us/hcrealms/hcf/StaffPriority.java b/src/main/java/us/hcrealms/hcf/StaffPriority.java similarity index 100% rename from src/us/hcrealms/hcf/StaffPriority.java rename to src/main/java/us/hcrealms/hcf/StaffPriority.java diff --git a/src/us/hcrealms/hcf/UUIDFetcher.java b/src/main/java/us/hcrealms/hcf/UUIDFetcher.java similarity index 100% rename from src/us/hcrealms/hcf/UUIDFetcher.java rename to src/main/java/us/hcrealms/hcf/UUIDFetcher.java diff --git a/src/us/hcrealms/hcf/balance/EconomyCommand.java b/src/main/java/us/hcrealms/hcf/balance/EconomyCommand.java similarity index 100% rename from src/us/hcrealms/hcf/balance/EconomyCommand.java rename to src/main/java/us/hcrealms/hcf/balance/EconomyCommand.java diff --git a/src/us/hcrealms/hcf/balance/EconomyManager.java b/src/main/java/us/hcrealms/hcf/balance/EconomyManager.java similarity index 100% rename from src/us/hcrealms/hcf/balance/EconomyManager.java rename to src/main/java/us/hcrealms/hcf/balance/EconomyManager.java diff --git a/src/us/hcrealms/hcf/balance/FlatFileEconomyManager.java b/src/main/java/us/hcrealms/hcf/balance/FlatFileEconomyManager.java similarity index 100% rename from src/us/hcrealms/hcf/balance/FlatFileEconomyManager.java rename to src/main/java/us/hcrealms/hcf/balance/FlatFileEconomyManager.java diff --git a/src/us/hcrealms/hcf/balance/PayCommand.java b/src/main/java/us/hcrealms/hcf/balance/PayCommand.java similarity index 100% rename from src/us/hcrealms/hcf/balance/PayCommand.java rename to src/main/java/us/hcrealms/hcf/balance/PayCommand.java diff --git a/src/us/hcrealms/hcf/balance/ShopSignListener.java b/src/main/java/us/hcrealms/hcf/balance/ShopSignListener.java similarity index 100% rename from src/us/hcrealms/hcf/balance/ShopSignListener.java rename to src/main/java/us/hcrealms/hcf/balance/ShopSignListener.java diff --git a/src/us/hcrealms/hcf/classes/PvpClass.java b/src/main/java/us/hcrealms/hcf/classes/PvpClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/PvpClass.java rename to src/main/java/us/hcrealms/hcf/classes/PvpClass.java diff --git a/src/us/hcrealms/hcf/classes/PvpClassManager.java b/src/main/java/us/hcrealms/hcf/classes/PvpClassManager.java similarity index 100% rename from src/us/hcrealms/hcf/classes/PvpClassManager.java rename to src/main/java/us/hcrealms/hcf/classes/PvpClassManager.java diff --git a/src/us/hcrealms/hcf/classes/archer/ArcherClass.java b/src/main/java/us/hcrealms/hcf/classes/archer/ArcherClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/archer/ArcherClass.java rename to src/main/java/us/hcrealms/hcf/classes/archer/ArcherClass.java diff --git a/src/us/hcrealms/hcf/classes/bard/BardClass.java b/src/main/java/us/hcrealms/hcf/classes/bard/BardClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/bard/BardClass.java rename to src/main/java/us/hcrealms/hcf/classes/bard/BardClass.java diff --git a/src/us/hcrealms/hcf/classes/bard/BardData.java b/src/main/java/us/hcrealms/hcf/classes/bard/BardData.java similarity index 100% rename from src/us/hcrealms/hcf/classes/bard/BardData.java rename to src/main/java/us/hcrealms/hcf/classes/bard/BardData.java diff --git a/src/us/hcrealms/hcf/classes/bard/BardEffect.java b/src/main/java/us/hcrealms/hcf/classes/bard/BardEffect.java similarity index 100% rename from src/us/hcrealms/hcf/classes/bard/BardEffect.java rename to src/main/java/us/hcrealms/hcf/classes/bard/BardEffect.java diff --git a/src/us/hcrealms/hcf/classes/bard/BardRestorer.java b/src/main/java/us/hcrealms/hcf/classes/bard/BardRestorer.java similarity index 100% rename from src/us/hcrealms/hcf/classes/bard/BardRestorer.java rename to src/main/java/us/hcrealms/hcf/classes/bard/BardRestorer.java diff --git a/src/us/hcrealms/hcf/classes/event/PvpClassEquipEvent.java b/src/main/java/us/hcrealms/hcf/classes/event/PvpClassEquipEvent.java similarity index 100% rename from src/us/hcrealms/hcf/classes/event/PvpClassEquipEvent.java rename to src/main/java/us/hcrealms/hcf/classes/event/PvpClassEquipEvent.java diff --git a/src/us/hcrealms/hcf/classes/event/PvpClassUnequipEvent.java b/src/main/java/us/hcrealms/hcf/classes/event/PvpClassUnequipEvent.java similarity index 100% rename from src/us/hcrealms/hcf/classes/event/PvpClassUnequipEvent.java rename to src/main/java/us/hcrealms/hcf/classes/event/PvpClassUnequipEvent.java diff --git a/src/us/hcrealms/hcf/classes/type/AssassinClass.java b/src/main/java/us/hcrealms/hcf/classes/type/AssassinClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/type/AssassinClass.java rename to src/main/java/us/hcrealms/hcf/classes/type/AssassinClass.java diff --git a/src/us/hcrealms/hcf/classes/type/MinerClass.java b/src/main/java/us/hcrealms/hcf/classes/type/MinerClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/type/MinerClass.java rename to src/main/java/us/hcrealms/hcf/classes/type/MinerClass.java diff --git a/src/us/hcrealms/hcf/classes/type/RogueClass.java b/src/main/java/us/hcrealms/hcf/classes/type/RogueClass.java similarity index 100% rename from src/us/hcrealms/hcf/classes/type/RogueClass.java rename to src/main/java/us/hcrealms/hcf/classes/type/RogueClass.java diff --git a/src/us/hcrealms/hcf/combatlog/CombatLogEntry.java b/src/main/java/us/hcrealms/hcf/combatlog/CombatLogEntry.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/CombatLogEntry.java rename to src/main/java/us/hcrealms/hcf/combatlog/CombatLogEntry.java diff --git a/src/us/hcrealms/hcf/combatlog/CombatLogListener.java b/src/main/java/us/hcrealms/hcf/combatlog/CombatLogListener.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/CombatLogListener.java rename to src/main/java/us/hcrealms/hcf/combatlog/CombatLogListener.java diff --git a/src/us/hcrealms/hcf/combatlog/CustomEntityRegistration.java b/src/main/java/us/hcrealms/hcf/combatlog/CustomEntityRegistration.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/CustomEntityRegistration.java rename to src/main/java/us/hcrealms/hcf/combatlog/CustomEntityRegistration.java diff --git a/src/us/hcrealms/hcf/combatlog/LoggerDeathEvent.java b/src/main/java/us/hcrealms/hcf/combatlog/LoggerDeathEvent.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/LoggerDeathEvent.java rename to src/main/java/us/hcrealms/hcf/combatlog/LoggerDeathEvent.java diff --git a/src/us/hcrealms/hcf/combatlog/LoggerEntity.java b/src/main/java/us/hcrealms/hcf/combatlog/LoggerEntity.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/LoggerEntity.java rename to src/main/java/us/hcrealms/hcf/combatlog/LoggerEntity.java diff --git a/src/us/hcrealms/hcf/combatlog/LoggerEntityHuman.java b/src/main/java/us/hcrealms/hcf/combatlog/LoggerEntityHuman.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/LoggerEntityHuman.java rename to src/main/java/us/hcrealms/hcf/combatlog/LoggerEntityHuman.java diff --git a/src/us/hcrealms/hcf/combatlog/LoggerRemovedEvent.java b/src/main/java/us/hcrealms/hcf/combatlog/LoggerRemovedEvent.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/LoggerRemovedEvent.java rename to src/main/java/us/hcrealms/hcf/combatlog/LoggerRemovedEvent.java diff --git a/src/us/hcrealms/hcf/combatlog/LoggerSpawnEvent.java b/src/main/java/us/hcrealms/hcf/combatlog/LoggerSpawnEvent.java similarity index 100% rename from src/us/hcrealms/hcf/combatlog/LoggerSpawnEvent.java rename to src/main/java/us/hcrealms/hcf/combatlog/LoggerSpawnEvent.java diff --git a/src/us/hcrealms/hcf/commands/BroadcastCommand.java b/src/main/java/us/hcrealms/hcf/commands/BroadcastCommand.java similarity index 86% rename from src/us/hcrealms/hcf/commands/BroadcastCommand.java rename to src/main/java/us/hcrealms/hcf/commands/BroadcastCommand.java index 5b613dd..7d8bb8b 100644 --- a/src/us/hcrealms/hcf/commands/BroadcastCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/BroadcastCommand.java @@ -16,13 +16,13 @@ public class BroadcastCommand implements CommandExecutor { for (int i = 0; i < args.length; i++) { r = r + args[i] + " "; } - r = r.replace("&", "§"); + r = r.replace("&", "§"); Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', r)); } else { sender.sendMessage(ChatColor.RED + "Usage: /broadcast "); } } else { - sender.sendMessage("§cYou lack the sufficient permissions to execute this command."); + sender.sendMessage("§cYou lack the sufficient permissions to execute this command."); } } return true; diff --git a/src/us/hcrealms/hcf/commands/ClearCommand.java b/src/main/java/us/hcrealms/hcf/commands/ClearCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/ClearCommand.java rename to src/main/java/us/hcrealms/hcf/commands/ClearCommand.java diff --git a/src/us/hcrealms/hcf/commands/CobbleCommand.java b/src/main/java/us/hcrealms/hcf/commands/CobbleCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/CobbleCommand.java rename to src/main/java/us/hcrealms/hcf/commands/CobbleCommand.java diff --git a/src/us/hcrealms/hcf/commands/CoordsCommand.java b/src/main/java/us/hcrealms/hcf/commands/CoordsCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/CoordsCommand.java rename to src/main/java/us/hcrealms/hcf/commands/CoordsCommand.java diff --git a/src/us/hcrealms/hcf/commands/CrowbarCommand.java b/src/main/java/us/hcrealms/hcf/commands/CrowbarCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/CrowbarCommand.java rename to src/main/java/us/hcrealms/hcf/commands/CrowbarCommand.java diff --git a/src/us/hcrealms/hcf/commands/DiamondReviveCommand.java b/src/main/java/us/hcrealms/hcf/commands/DiamondReviveCommand.java similarity index 95% rename from src/us/hcrealms/hcf/commands/DiamondReviveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/DiamondReviveCommand.java index b7feb57..1a43d2e 100644 --- a/src/us/hcrealms/hcf/commands/DiamondReviveCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/DiamondReviveCommand.java @@ -36,8 +36,8 @@ public class DiamondReviveCommand implements CommandExecutor { final Player player = (Player) sender; final OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (Cooldowns.isOnCooldown("diamond_cooldown", player)) { - sender.sendMessage("§cYou cannot do this for another §l" - + Cooldowns.getCooldownForPlayerInt("diamond_cooldown", player) / 60 + " §cminutes."); + sender.sendMessage("§cYou cannot do this for another §l" + + Cooldowns.getCooldownForPlayerInt("diamond_cooldown", player) / 60 + " §cminutes."); return true; } final UUID targetUUID = target.getUniqueId(); diff --git a/src/us/hcrealms/hcf/commands/EmeraldReviveCommand.java b/src/main/java/us/hcrealms/hcf/commands/EmeraldReviveCommand.java similarity index 95% rename from src/us/hcrealms/hcf/commands/EmeraldReviveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/EmeraldReviveCommand.java index ba717fa..a096e7e 100644 --- a/src/us/hcrealms/hcf/commands/EmeraldReviveCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/EmeraldReviveCommand.java @@ -36,8 +36,8 @@ public class EmeraldReviveCommand implements CommandExecutor { final Player player = (Player) sender; final OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (Cooldowns.isOnCooldown("emerald_cooldown", player)) { - sender.sendMessage("§cYou cannot do this for another §l" - + Cooldowns.getCooldownForPlayerInt("emerald_cooldown", player) / 60 + " §cminutes."); + sender.sendMessage("§cYou cannot do this for another §l" + + Cooldowns.getCooldownForPlayerInt("emerald_cooldown", player) / 60 + " §cminutes."); return true; } final UUID targetUUID = target.getUniqueId(); diff --git a/src/us/hcrealms/hcf/commands/EnchantCommand.java b/src/main/java/us/hcrealms/hcf/commands/EnchantCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/EnchantCommand.java rename to src/main/java/us/hcrealms/hcf/commands/EnchantCommand.java diff --git a/src/us/hcrealms/hcf/commands/EndPortalCommand.java b/src/main/java/us/hcrealms/hcf/commands/EndPortalCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/EndPortalCommand.java rename to src/main/java/us/hcrealms/hcf/commands/EndPortalCommand.java diff --git a/src/us/hcrealms/hcf/commands/FFACommand.java b/src/main/java/us/hcrealms/hcf/commands/FFACommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/FFACommand.java rename to src/main/java/us/hcrealms/hcf/commands/FFACommand.java diff --git a/src/us/hcrealms/hcf/commands/FeedCommand.java b/src/main/java/us/hcrealms/hcf/commands/FeedCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/FeedCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FeedCommand.java diff --git a/src/us/hcrealms/hcf/commands/FightCommand.java b/src/main/java/us/hcrealms/hcf/commands/FightCommand.java similarity index 97% rename from src/us/hcrealms/hcf/commands/FightCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FightCommand.java index 58ed5e4..0ebe846 100644 --- a/src/us/hcrealms/hcf/commands/FightCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/FightCommand.java @@ -50,7 +50,7 @@ public class FightCommand implements CommandExecutor return true; } Bukkit.broadcastMessage(ChatColor.DARK_GRAY + ChatColor.STRIKETHROUGH.toString() + "--------------------------------"); - Bukkit.broadcastMessage(ChatColor.AQUA + ChatColor.BOLD.toString() + sender.getName() + ChatColor.GRAY + " has broadcasted their Location §f(" + x + ", " + y + ", " + z + ")"); + Bukkit.broadcastMessage(ChatColor.AQUA + ChatColor.BOLD.toString() + sender.getName() + ChatColor.GRAY + " has broadcasted their Location §f(" + x + ", " + y + ", " + z + ")"); Bukkit.broadcastMessage(ChatColor.DARK_GRAY + ChatColor.STRIKETHROUGH.toString() + "--------------------------------"); } player.sendMessage(ChatColor.GRAY + "You have announced that you are looking for a fight, you must wait 30 minutes before doing this again."); diff --git a/src/us/hcrealms/hcf/commands/FiltersCommand.java b/src/main/java/us/hcrealms/hcf/commands/FiltersCommand.java similarity index 65% rename from src/us/hcrealms/hcf/commands/FiltersCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FiltersCommand.java index ddb399f..3b042a6 100644 --- a/src/us/hcrealms/hcf/commands/FiltersCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/FiltersCommand.java @@ -16,13 +16,13 @@ import net.md_5.bungee.api.ChatColor; import us.hcrealms.hcf.BasePlugins; public class FiltersCommand implements CommandExecutor, Listener { - + @SuppressWarnings("unused") private static HashMap blockfilter = new HashMap(); - + private static String colour(String s) { - return ChatColor.translateAlternateColorCodes('&', s); - } + return ChatColor.translateAlternateColorCodes('&', s); + } @Override public boolean onCommand(CommandSender sender, Command command, String string, String[] args) { @@ -35,7 +35,7 @@ public class FiltersCommand implements CommandExecutor, Listener { this.printDetail(player); return true; } - + if (args[0].equalsIgnoreCase("add")) { if (BasePlugins.getPlugin().getItemDb().getItem(args[1]) == null) { player.sendMessage(colour("&cItem or ID not found.")); @@ -56,50 +56,50 @@ public class FiltersCommand implements CommandExecutor, Listener { } return false; } - + private void addFilter(Material type, Player player) { // TODO Auto-generated method stub - + } private void removeFilter(Material type, Player player) { // TODO Auto-generated method stub - + } public void printDetail(Player player) { - player.sendMessage(colour("&8&m-----------------------")); - player.sendMessage(ChatColor.YELLOW + " /filter add " + ChatColor.GOLD + " » " + ChatColor.WHITE + "Add materials to your filter."); - player.sendMessage(ChatColor.YELLOW + " /filter remove " + ChatColor.GOLD + " » " + ChatColor.WHITE + "Remove materials from your filter."); - player.sendMessage(colour("&8&m-----------------------")); + player.sendMessage(colour("&8&m-----------------------")); + player.sendMessage(ChatColor.YELLOW + " /filter add " + ChatColor.GOLD + " » " + ChatColor.WHITE + "Add materials to your filter."); + player.sendMessage(ChatColor.YELLOW + " /filter remove " + ChatColor.GOLD + " » " + ChatColor.WHITE + "Remove materials from your filter."); + player.sendMessage(colour("&8&m-----------------------")); } - - public static String color(String s) { - return ChatColor.translateAlternateColorCodes('&', s); - } - @EventHandler - public void onPickUp(PlayerPickupItemEvent event) { - event.getPlayer(); - Material type = event.getItem().getItemStack().getType(); - //Bukkit.broadcastMessage("" + user.getFilter(type).toString()); - if (!inFilter()) { - return; - } - if (inFilter() && (getFilter() == type)) { - event.setCancelled(true); - } - } - private Material getFilter() { - // TODO Auto-generated method stub - return null; + public static String color(String s) { + return ChatColor.translateAlternateColorCodes('&', s); + } + @EventHandler + public void onPickUp(PlayerPickupItemEvent event) { + event.getPlayer(); + Material type = event.getItem().getItemStack().getType(); + //Bukkit.broadcastMessage("" + user.getFilter(type).toString()); + if (!inFilter()) { + return; } + if (inFilter() && (getFilter() == type)) { + event.setCancelled(true); + } + } - private boolean inFilter() { - // TODO Auto-generated method stub - return false; - - } - + private Material getFilter() { + // TODO Auto-generated method stub + return null; + } + + private boolean inFilter() { + // TODO Auto-generated method stub + return false; } + + +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/FixCommand.java b/src/main/java/us/hcrealms/hcf/commands/FixCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/FixCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FixCommand.java diff --git a/src/us/hcrealms/hcf/commands/FlyCommand.java b/src/main/java/us/hcrealms/hcf/commands/FlyCommand.java similarity index 97% rename from src/us/hcrealms/hcf/commands/FlyCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FlyCommand.java index ca02a04..0dab237 100644 --- a/src/us/hcrealms/hcf/commands/FlyCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/FlyCommand.java @@ -36,7 +36,7 @@ public class FlyCommand implements CommandExecutor { } Player t = Bukkit.getPlayer(args[0]); if (t == null) { - sender.sendMessage("§cPlayer not found."); + sender.sendMessage("§cPlayer not found."); return true; } if (t.getAllowFlight()) { diff --git a/src/us/hcrealms/hcf/commands/FreezeCommand.java b/src/main/java/us/hcrealms/hcf/commands/FreezeCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/FreezeCommand.java rename to src/main/java/us/hcrealms/hcf/commands/FreezeCommand.java diff --git a/src/us/hcrealms/hcf/commands/GMCCommand.java b/src/main/java/us/hcrealms/hcf/commands/GMCCommand.java similarity index 92% rename from src/us/hcrealms/hcf/commands/GMCCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GMCCommand.java index a97f5ff..b7dd7c9 100644 --- a/src/us/hcrealms/hcf/commands/GMCCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/GMCCommand.java @@ -13,7 +13,7 @@ public class GMCCommand implements CommandExecutor { Player p = (Player) sender; if (cmd.getName().equalsIgnoreCase("gmc")) { if ((!p.hasPermission("command.gamemode"))) { - p.sendMessage("§cYou do not have permission to run this command!"); + p.sendMessage("§cYou do not have permission to run this command!"); return true; } if (args.length == 0) { diff --git a/src/us/hcrealms/hcf/commands/GMSCommand.java b/src/main/java/us/hcrealms/hcf/commands/GMSCommand.java similarity index 89% rename from src/us/hcrealms/hcf/commands/GMSCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GMSCommand.java index e8bc20e..d7f2133 100644 --- a/src/us/hcrealms/hcf/commands/GMSCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/GMSCommand.java @@ -11,7 +11,7 @@ public class GMSCommand implements CommandExecutor { Player p = (Player) sender; if (cmd.getName().equalsIgnoreCase("gms")) { if ((!p.hasPermission("command.gamemode"))) { - p.sendMessage("§cYou do not have permission to run this command!"); + p.sendMessage("§cYou do not have permission to run this command!"); return true; } if (args.length == 0) { diff --git a/src/us/hcrealms/hcf/commands/GameModeCommand.java b/src/main/java/us/hcrealms/hcf/commands/GameModeCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/GameModeCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GameModeCommand.java diff --git a/src/us/hcrealms/hcf/commands/GiveCommand.java b/src/main/java/us/hcrealms/hcf/commands/GiveCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/GiveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GiveCommand.java diff --git a/src/us/hcrealms/hcf/commands/GodCommand.java b/src/main/java/us/hcrealms/hcf/commands/GodCommand.java similarity index 97% rename from src/us/hcrealms/hcf/commands/GodCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GodCommand.java index a151dcc..2c7c6b6 100644 --- a/src/us/hcrealms/hcf/commands/GodCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/GodCommand.java @@ -38,7 +38,7 @@ public class GodCommand implements CommandExecutor { } Player t = Bukkit.getPlayer(args[0]); if (t == null) { - sender.sendMessage("§cPlayer not found."); + sender.sendMessage("§cPlayer not found."); return true; } if (GodListener.getInstance().isinGod(t)) { diff --git a/src/us/hcrealms/hcf/commands/GoldReviveCommand.java b/src/main/java/us/hcrealms/hcf/commands/GoldReviveCommand.java similarity index 95% rename from src/us/hcrealms/hcf/commands/GoldReviveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GoldReviveCommand.java index 6de7ab0..5930bf4 100644 --- a/src/us/hcrealms/hcf/commands/GoldReviveCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/GoldReviveCommand.java @@ -36,8 +36,8 @@ public class GoldReviveCommand implements CommandExecutor { final Player player = (Player) sender; final OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (Cooldowns.isOnCooldown("gold_cooldown", player)) { - sender.sendMessage("§cYou cannot do this for another §l" - + Cooldowns.getCooldownForPlayerInt("gold_cooldown", player) / 60 + " §cminutes."); + sender.sendMessage("§cYou cannot do this for another §l" + + Cooldowns.getCooldownForPlayerInt("gold_cooldown", player) / 60 + " §cminutes."); return true; } final UUID targetUUID = target.getUniqueId(); diff --git a/src/us/hcrealms/hcf/commands/GoppleCommand.java b/src/main/java/us/hcrealms/hcf/commands/GoppleCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/GoppleCommand.java rename to src/main/java/us/hcrealms/hcf/commands/GoppleCommand.java diff --git a/src/us/hcrealms/hcf/commands/HatCommand.java b/src/main/java/us/hcrealms/hcf/commands/HatCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/HatCommand.java rename to src/main/java/us/hcrealms/hcf/commands/HatCommand.java diff --git a/src/us/hcrealms/hcf/commands/HealCommand.java b/src/main/java/us/hcrealms/hcf/commands/HealCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/HealCommand.java rename to src/main/java/us/hcrealms/hcf/commands/HealCommand.java diff --git a/src/us/hcrealms/hcf/commands/HelpCommand.java b/src/main/java/us/hcrealms/hcf/commands/HelpCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/HelpCommand.java rename to src/main/java/us/hcrealms/hcf/commands/HelpCommand.java diff --git a/src/us/hcrealms/hcf/commands/InvSeeCommand.java b/src/main/java/us/hcrealms/hcf/commands/InvSeeCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/InvSeeCommand.java rename to src/main/java/us/hcrealms/hcf/commands/InvSeeCommand.java diff --git a/src/us/hcrealms/hcf/commands/ItemCommand.java b/src/main/java/us/hcrealms/hcf/commands/ItemCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/ItemCommand.java rename to src/main/java/us/hcrealms/hcf/commands/ItemCommand.java diff --git a/src/us/hcrealms/hcf/commands/KillCommand.java b/src/main/java/us/hcrealms/hcf/commands/KillCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/KillCommand.java rename to src/main/java/us/hcrealms/hcf/commands/KillCommand.java diff --git a/src/us/hcrealms/hcf/commands/KingReviveCommand.java b/src/main/java/us/hcrealms/hcf/commands/KingReviveCommand.java similarity index 95% rename from src/us/hcrealms/hcf/commands/KingReviveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/KingReviveCommand.java index 9d5205f..a987d47 100644 --- a/src/us/hcrealms/hcf/commands/KingReviveCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/KingReviveCommand.java @@ -36,8 +36,8 @@ public class KingReviveCommand implements CommandExecutor { final Player player = (Player) sender; final OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (Cooldowns.isOnCooldown("king_cooldown", player)) { - sender.sendMessage("§cYou cannot do this for another §l" - + Cooldowns.getCooldownForPlayerInt("king_cooldown", player) / 60 + " §cminutes."); + sender.sendMessage("§cYou cannot do this for another §l" + + Cooldowns.getCooldownForPlayerInt("king_cooldown", player) / 60 + " §cminutes."); return true; } final UUID targetUUID = target.getUniqueId(); diff --git a/src/us/hcrealms/hcf/commands/LFFCommand.java b/src/main/java/us/hcrealms/hcf/commands/LFFCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/LFFCommand.java rename to src/main/java/us/hcrealms/hcf/commands/LFFCommand.java diff --git a/src/us/hcrealms/hcf/commands/LagCommand.java b/src/main/java/us/hcrealms/hcf/commands/LagCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/LagCommand.java rename to src/main/java/us/hcrealms/hcf/commands/LagCommand.java diff --git a/src/us/hcrealms/hcf/commands/ListCommand.java b/src/main/java/us/hcrealms/hcf/commands/ListCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/ListCommand.java rename to src/main/java/us/hcrealms/hcf/commands/ListCommand.java diff --git a/src/us/hcrealms/hcf/commands/LockdownCommand.java b/src/main/java/us/hcrealms/hcf/commands/LockdownCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/LockdownCommand.java rename to src/main/java/us/hcrealms/hcf/commands/LockdownCommand.java diff --git a/src/us/hcrealms/hcf/commands/LogoutCommand.java b/src/main/java/us/hcrealms/hcf/commands/LogoutCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/LogoutCommand.java rename to src/main/java/us/hcrealms/hcf/commands/LogoutCommand.java diff --git a/src/us/hcrealms/hcf/commands/MapKitCommand.java b/src/main/java/us/hcrealms/hcf/commands/MapKitCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/MapKitCommand.java rename to src/main/java/us/hcrealms/hcf/commands/MapKitCommand.java diff --git a/src/us/hcrealms/hcf/commands/MessageCommand.java b/src/main/java/us/hcrealms/hcf/commands/MessageCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/MessageCommand.java rename to src/main/java/us/hcrealms/hcf/commands/MessageCommand.java diff --git a/src/us/hcrealms/hcf/commands/MessageEvent.java b/src/main/java/us/hcrealms/hcf/commands/MessageEvent.java similarity index 91% rename from src/us/hcrealms/hcf/commands/MessageEvent.java rename to src/main/java/us/hcrealms/hcf/commands/MessageEvent.java index f36a6da..84994d3 100644 --- a/src/us/hcrealms/hcf/commands/MessageEvent.java +++ b/src/main/java/us/hcrealms/hcf/commands/MessageEvent.java @@ -2,10 +2,10 @@ package us.hcrealms.hcf.commands; public class MessageEvent { - + public static String format(String message) { - message = message.replaceAll("&", "§"); + message = message.replaceAll("&", "§"); return message; } @@ -21,4 +21,4 @@ public class MessageEvent } return returnString; } -} +} \ No newline at end of file diff --git a/src/main/java/us/hcrealms/hcf/commands/MiscCommands.java b/src/main/java/us/hcrealms/hcf/commands/MiscCommands.java new file mode 100644 index 0000000..616e5d1 --- /dev/null +++ b/src/main/java/us/hcrealms/hcf/commands/MiscCommands.java @@ -0,0 +1,177 @@ +package us.hcrealms.hcf.commands; + +import java.util.HashMap; + +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import net.md_5.bungee.api.ChatColor; + +public class MiscCommands implements CommandExecutor { + public boolean onCommand (final CommandSender sender, final Command cmd, final String commandLabel, final String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "You cannot do this in console"); + return true; + } + final Player p = (Player)sender; + p.getLocation(); + p.getInventory(); + String perm = ChatColor.translateAlternateColorCodes('&', "&cNo."); + perm = perm.replaceAll("&", "§"); + if (cmd.getName().equalsIgnoreCase("drop")) { + if (!p.hasPermission("drop.yes")) { + p.sendMessage(perm); + return true; + } + if (args.length == 0) { + p.sendMessage(ChatColor.GRAY + "/drop "); + return true; + } + if (args[0].equalsIgnoreCase("help") | args[0].equalsIgnoreCase("helpme") | args[0].equalsIgnoreCase("help")) { + p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " Help Menu " + ChatColor.RED + " \u2727"); + p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " /drop is a command that allows the user to remotely drop a target for a minecraft error message."); + p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " There are many diffrent options to choose from."); + p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To drop a player do §7/drop §9<§7player§9> <§7error§9>"); + p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To list the types of error's do §7/drop type"); + p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To get a list of error's and the number do §7/drop list"); + return true; + } + if (args[0].equalsIgnoreCase("types") | args[0].equalsIgnoreCase("type") | args[0].equalsIgnoreCase("t")) { + p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " All Types Of Errors " + ChatColor.RED + " \u2727"); + p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " - "); + p.sendMessage(" §c\u25cf §9Stream §7- §3End of stream"); + p.sendMessage(" §c\u25cf §9Hacked §7- §3You logged in from another location"); + p.sendMessage(" §c\u25cf §9Error §7- §3Java error message"); + p.sendMessage(" §c\u25cf §9Login §7- §3Failed to login: Invalid session"); + p.sendMessage(" §c\u25cf §9Drop §7- §3Long java error message"); + return true; + } + if (args[0].equalsIgnoreCase("list") | args[0].equalsIgnoreCase("all") | args[0].equalsIgnoreCase("number")) { + p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " Lists Of Errors " + ChatColor.RED + " \u2727"); + p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " /drop "); + p.sendMessage("§01.) §7End of stream"); + p.sendMessage("§02.) §7You logged in from another location"); + p.sendMessage("§03.) §7Java error message"); + p.sendMessage("§04.) §7Failed to login: Invalid session"); + p.sendMessage("§05.) §7Long java error message"); + return true; + } + final Player target3 = Bukkit.getServer().getPlayer(args[0]); + if (target3 == null) { + sender.sendMessage(ChatColor.RED + "Could not find player " + args[0] + "."); + return true; + } + if (args.length == 2) { + if (args[1].equalsIgnoreCase("stream") | args[1].equalsIgnoreCase("eos") | args[1].equalsIgnoreCase("logout") | args[1].equalsIgnoreCase("1")) { + target3.kickPlayer("End of stream"); + p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for End of stream"); + return true; + } + if (args[1].equalsIgnoreCase("hacked") | args[1].equalsIgnoreCase("location") | args[1].equalsIgnoreCase("dl") | args[1].equalsIgnoreCase("2")) { + target3.kickPlayer("You logged in from another location"); + p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for location log in"); + return true; + } + if (args[1].equalsIgnoreCase("error") | args[1].equalsIgnoreCase("javaerror") | args[1].equalsIgnoreCase("503") | args[1].equalsIgnoreCase("3")) { + target3.kickPlayer("java.io.IOException: Server returned HTTP response code: 503"); + p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Java Error"); + return true; + } + if (args[1].equalsIgnoreCase("login") | args[1].equalsIgnoreCase("fl") | args[1].equalsIgnoreCase("faildlogin") | args[1].equalsIgnoreCase("4")) { + target3.kickPlayer("Failed to login: Invalid session (Try restarting your game)"); + p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Failed to login"); + return true; + } + if (args[1].equalsIgnoreCase("drop") | args[1].equalsIgnoreCase("default") | args[1].equalsIgnoreCase("bye") | args[1].equalsIgnoreCase("5")) { + target3.kickPlayer("Java Exception: Socket reset | End of Stream | in com.bukkit.minecraftServer.Connection ln 3712 at Java.Sockets.Connection.TCP Unhandled exception: Java.Exception.Streams.EndOFStream"); + p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Long Error"); + return true; + } + } + else { + p.sendMessage(ChatColor.GRAY + "/drop "); + } + } + if (cmd.getName().equalsIgnoreCase("copyinv")) { + if (!p.hasPermission("copyinv.yes")) { + p.sendMessage(perm); + return true; + } + if (args.length == 0) { + p.sendMessage(ChatColor.GRAY + "/copyinv "); + } + if (args.length == 1) { + final Player all2 = Bukkit.getPlayer(args[0]); + if (all2 == null) { + p.sendMessage(ChatColor.RED + "That player does not exist!"); + } + else { + final ItemStack[] armor = all2.getInventory().getArmorContents(); + p.getInventory().clear(); + p.getInventory().setArmorContents((ItemStack[])null); + p.getInventory().setArmorContents(armor); + final ItemStack[] inv = all2.getInventory().getContents(); + final HashMap itemhash = new HashMap(); + itemhash.put(p, inv); + final ItemStack[] items = itemhash.get(p); + p.getInventory().setContents(items); + p.sendMessage(ChatColor.GRAY + "Copying " + ChatColor.RED + args[0] + ChatColor.GRAY + " Inventory"); + } + } + } + if (cmd.getName().equalsIgnoreCase("fsay")) { + if (!p.hasPermission("fsay.yes")) { + p.sendMessage(perm); + return true; + } + if (args.length == 0) { + sender.sendMessage(ChatColor.GRAY + "/fsay "); + return true; + } + if (args.length == 1) { + sender.sendMessage(ChatColor.GRAY + "/fsay "); + } + else if (args.length >= 2) { + final Player user = Bukkit.getServer().getPlayer(args[0]); + if (user == null) { + final StringBuilder message = new StringBuilder(args[1]); + for (int arg2 = 2; arg2 < args.length; ++arg2) { + message.append(" ").append(args[arg2]); + } + return true; + } + final StringBuilder message = new StringBuilder(args[1]); + for (int arg2 = 2; arg2 < args.length; ++arg2) { + message.append(" ").append(args[arg2]); + } + user.chat(message.toString()); + } + } + + if (!cmd.getName().equalsIgnoreCase("slowstop")) { + return false; + } + if (!p.hasPermission("core.slowstop")) { + p.sendMessage(perm); + return true; + } + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + " " + ChatColor.RED + "Server Restarting."); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588"); + Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588"); + Bukkit.getServer().dispatchCommand((CommandSender)Bukkit.getConsoleSender(), "restart"); + + return true; + } +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/MoreCommand.java b/src/main/java/us/hcrealms/hcf/commands/MoreCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/MoreCommand.java rename to src/main/java/us/hcrealms/hcf/commands/MoreCommand.java diff --git a/src/us/hcrealms/hcf/commands/OreStatsCommand.java b/src/main/java/us/hcrealms/hcf/commands/OreStatsCommand.java similarity index 65% rename from src/us/hcrealms/hcf/commands/OreStatsCommand.java rename to src/main/java/us/hcrealms/hcf/commands/OreStatsCommand.java index 8fc04ef..43f3622 100644 --- a/src/us/hcrealms/hcf/commands/OreStatsCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/OreStatsCommand.java @@ -20,44 +20,44 @@ public class OreStatsCommand implements CommandExecutor, Listener { public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { Player player = (Player) sender; if ((cmd.getName().equalsIgnoreCase("ores")) && ((sender instanceof Player)) && (args.length > 1)) { - sender.sendMessage("§cUsage: /ores "); + sender.sendMessage("§cUsage: /ores "); return true; } if (args.length == 0) { - sender.sendMessage("§cUsage: /ores "); + sender.sendMessage("§cUsage: /ores "); return true; } Player target = Bukkit.getServer().getPlayer(args[0]); if ((args.length == 1) && (target == null)) { - player.sendMessage("§cPlayer not found"); + player.sendMessage("§cPlayer not found"); return true; } this.onStatsGUI(player, target); /* - * /sender.sendMessage("§7§m--------------------------------------------------") - * ; sender.sendMessage(" §eOres mined by: §6" + - * target.getDisplayName()); sender.sendMessage("§bDiamond(s): §7" + + * /sender.sendMessage("§7§m--------------------------------------------------") + * ; sender.sendMessage(" §eOres mined by: §6" + + * target.getDisplayName()); sender.sendMessage("§bDiamond(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.DIAMOND_ORE)); - * sender.sendMessage("§aEmerald(s): §7" + + * sender.sendMessage("§aEmerald(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.EMERALD_ORE)); - * sender.sendMessage("§7Iron(s): §7" + + * sender.sendMessage("§7Iron(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.IRON_ORE)); - * sender.sendMessage("§6Gold(s): §7" + + * sender.sendMessage("§6Gold(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.GOLD_ORE)); - * sender.sendMessage("§cRedstone(s): §7" + + * sender.sendMessage("§cRedstone(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.REDSTONE_ORE)); - * sender.sendMessage("§8Coal(s): §7" + + * sender.sendMessage("§8Coal(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.COAL_ORE)); - * sender.sendMessage("§9Lapis(s): §7" + + * sender.sendMessage("§9Lapis(s): §7" + * target.getStatistic(Statistic.MINE_BLOCK, Material.LAPIS_ORE)); - * sender.sendMessage("§7§m--------------------------------------------------"); + * sender.sendMessage("§7§m--------------------------------------------------"); * / */ return false; } public void onStatsGUI(Player player, Player target) { - Inventory inv = Bukkit.createInventory(null, 9, ChatColor.DARK_AQUA + ChatColor.BOLD.toString() + "Ores §8- §7" + target.getName()); + Inventory inv = Bukkit.createInventory(null, 9, ChatColor.DARK_AQUA + ChatColor.BOLD.toString() + "Ores §8- §7" + target.getName()); ItemStack Diamond_ore = new ItemStack(Material.DIAMOND_ORE); ItemStack Emerald_ore = new ItemStack(Material.EMERALD_ORE); @@ -75,13 +75,13 @@ public class OreStatsCommand implements CommandExecutor, Listener { ItemMeta LapisMeta = Lapis_ore.getItemMeta(); ItemMeta RedStoneMeta = RedStone_ore.getItemMeta(); - DiamondMeta.setDisplayName("§bDiamond(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.DIAMOND_ORE)); - EmeraldMeta.setDisplayName("§aEmerald(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.EMERALD_ORE)); - IronMeta.setDisplayName("§7Iron(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.IRON_ORE)); - GoldMeta.setDisplayName("§6Gold(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.GOLD_ORE)); - RedStoneMeta.setDisplayName("§cRedstone(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.REDSTONE_ORE)); - CoalMeta.setDisplayName("§8Coal(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.COAL_ORE)); - LapisMeta.setDisplayName("§9Lapis(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.LAPIS_ORE)); + DiamondMeta.setDisplayName("§bDiamond(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.DIAMOND_ORE)); + EmeraldMeta.setDisplayName("§aEmerald(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.EMERALD_ORE)); + IronMeta.setDisplayName("§7Iron(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.IRON_ORE)); + GoldMeta.setDisplayName("§6Gold(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.GOLD_ORE)); + RedStoneMeta.setDisplayName("§cRedstone(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.REDSTONE_ORE)); + CoalMeta.setDisplayName("§8Coal(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.COAL_ORE)); + LapisMeta.setDisplayName("§9Lapis(s): §7" + target.getStatistic(Statistic.MINE_BLOCK, Material.LAPIS_ORE)); Diamond_ore.setItemMeta(DiamondMeta); Emerald_ore.setItemMeta(EmeraldMeta); @@ -105,7 +105,7 @@ public class OreStatsCommand implements CommandExecutor, Listener { @EventHandler public void onInventoryClick(InventoryClickEvent event) { - if (event.getInventory().getTitle().startsWith(ChatColor.DARK_AQUA + ChatColor.BOLD.toString() + "Ores §8- §7")) { + if (event.getInventory().getTitle().startsWith(ChatColor.DARK_AQUA + ChatColor.BOLD.toString() + "Ores §8- §7")) { event.setCancelled(true); } } diff --git a/src/us/hcrealms/hcf/commands/PanicCommand.java b/src/main/java/us/hcrealms/hcf/commands/PanicCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PanicCommand.java rename to src/main/java/us/hcrealms/hcf/commands/PanicCommand.java diff --git a/src/us/hcrealms/hcf/commands/PingCommand.java b/src/main/java/us/hcrealms/hcf/commands/PingCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PingCommand.java rename to src/main/java/us/hcrealms/hcf/commands/PingCommand.java diff --git a/src/us/hcrealms/hcf/commands/PlayTimeCommand.java b/src/main/java/us/hcrealms/hcf/commands/PlayTimeCommand.java similarity index 81% rename from src/us/hcrealms/hcf/commands/PlayTimeCommand.java rename to src/main/java/us/hcrealms/hcf/commands/PlayTimeCommand.java index c218122..6480fd3 100644 --- a/src/us/hcrealms/hcf/commands/PlayTimeCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/PlayTimeCommand.java @@ -16,10 +16,10 @@ import us.hcrealms.hcf.BaseConstants; import us.hcrealms.hcf.util.BukkitUtils; public class PlayTimeCommand - extends BaseCommand + extends BaseCommand { private final Base plugin; - + public PlayTimeCommand(Base plugin) { super("playtime", "Check the playtime of another player."); @@ -27,9 +27,9 @@ public class PlayTimeCommand setUsage("/(command) [playerName]"); this.plugin = plugin; } - + @SuppressWarnings("deprecation") -public boolean onCommand(CommandSender sender, Command command, String label, String[] args) + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { OfflinePlayer target; if (args.length >= 1) @@ -51,11 +51,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } sender.sendMessage(ChatColor.DARK_GRAY.toString() + ChatColor.STRIKETHROUGH + "-------------------------------------------------"); - sender.sendMessage(ChatColor.AQUA + target.getName() + " §7has a playtime of " + ChatColor.GREEN + DurationFormatUtils.formatDurationWords(this.plugin.getPlayTimeManager().getTotalPlayTime(target.getUniqueId()), true, true) + ChatColor.GRAY + " this map."); + sender.sendMessage(ChatColor.AQUA + target.getName() + " §7has a playtime of " + ChatColor.GREEN + DurationFormatUtils.formatDurationWords(this.plugin.getPlayTimeManager().getTotalPlayTime(target.getUniqueId()), true, true) + ChatColor.GRAY + " this map."); sender.sendMessage(ChatColor.DARK_GRAY.toString() + ChatColor.STRIKETHROUGH + "-------------------------------------------------"); return true; } - + public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { return args.length == 1 ? null : Collections.emptyList(); diff --git a/src/us/hcrealms/hcf/commands/PlayerFreezeEvent.java b/src/main/java/us/hcrealms/hcf/commands/PlayerFreezeEvent.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PlayerFreezeEvent.java rename to src/main/java/us/hcrealms/hcf/commands/PlayerFreezeEvent.java diff --git a/src/us/hcrealms/hcf/commands/PlayerVanishEvent.java b/src/main/java/us/hcrealms/hcf/commands/PlayerVanishEvent.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PlayerVanishEvent.java rename to src/main/java/us/hcrealms/hcf/commands/PlayerVanishEvent.java diff --git a/src/us/hcrealms/hcf/commands/PlayerVaultCommand.java b/src/main/java/us/hcrealms/hcf/commands/PlayerVaultCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PlayerVaultCommand.java rename to src/main/java/us/hcrealms/hcf/commands/PlayerVaultCommand.java diff --git a/src/us/hcrealms/hcf/commands/PvpTimerCommand.java b/src/main/java/us/hcrealms/hcf/commands/PvpTimerCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/PvpTimerCommand.java rename to src/main/java/us/hcrealms/hcf/commands/PvpTimerCommand.java diff --git a/src/us/hcrealms/hcf/commands/RandomCommand.java b/src/main/java/us/hcrealms/hcf/commands/RandomCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/RandomCommand.java rename to src/main/java/us/hcrealms/hcf/commands/RandomCommand.java diff --git a/src/us/hcrealms/hcf/commands/RefundCommand.java b/src/main/java/us/hcrealms/hcf/commands/RefundCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/RefundCommand.java rename to src/main/java/us/hcrealms/hcf/commands/RefundCommand.java diff --git a/src/us/hcrealms/hcf/commands/RenameCommand.java b/src/main/java/us/hcrealms/hcf/commands/RenameCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/RenameCommand.java rename to src/main/java/us/hcrealms/hcf/commands/RenameCommand.java diff --git a/src/us/hcrealms/hcf/commands/ReplyCommand.java b/src/main/java/us/hcrealms/hcf/commands/ReplyCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/ReplyCommand.java rename to src/main/java/us/hcrealms/hcf/commands/ReplyCommand.java diff --git a/src/main/java/us/hcrealms/hcf/commands/ResetCommand.java b/src/main/java/us/hcrealms/hcf/commands/ResetCommand.java new file mode 100644 index 0000000..f92644e --- /dev/null +++ b/src/main/java/us/hcrealms/hcf/commands/ResetCommand.java @@ -0,0 +1,47 @@ +package us.hcrealms.hcf.commands; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Statistic; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class ResetCommand implements CommandExecutor{ + + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) + { + Player player = (Player)sender; + if ((command.getName().equalsIgnoreCase("reset")) && ((sender instanceof Player)) && + (args.length > 1)) + { + sender.sendMessage("§cUsage: /Reset "); + return true; + } + if (args.length == 0) + { + sender.sendMessage("§cUsage: /Reset "); + return true; + } + Player target = Bukkit.getServer().getPlayer(args[0]); + if ((args.length == 1) && + (target == null)) + { + player.sendMessage("§cPlayer not found"); + return true; + } + target.setStatistic(Statistic.DEATHS, 0); + target.setStatistic(Statistic.PLAYER_KILLS, 0); + + sender.sendMessage(ChatColor.RED + "You have reset " + target.getPlayer().getName() + " 's stats!"); + for (Player s : Bukkit.getOnlinePlayers()) { + if (s.hasPermission("command.reset")) { + s.sendMessage(ChatColor.translateAlternateColorCodes('&', "&b" + sender.getName() + " &7has reset the &3&lStatistics &7of &b" + target.getName())); + return false; + } + + } + return false; + } +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/RubyReviveCommand.java b/src/main/java/us/hcrealms/hcf/commands/RubyReviveCommand.java similarity index 94% rename from src/us/hcrealms/hcf/commands/RubyReviveCommand.java rename to src/main/java/us/hcrealms/hcf/commands/RubyReviveCommand.java index ff1df47..d24c886 100644 --- a/src/us/hcrealms/hcf/commands/RubyReviveCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/RubyReviveCommand.java @@ -24,7 +24,7 @@ public class RubyReviveCommand implements CommandExecutor { @SuppressWarnings("deprecation") public boolean onCommand(final CommandSender sender, final Command command, final String label, - final String[] args) { + final String[] args) { if (!(sender instanceof Player)) { sender.sendMessage(ChatColor.RED + "This command is only executable by players."); return true; @@ -36,8 +36,8 @@ public class RubyReviveCommand implements CommandExecutor { final Player player = (Player) sender; final OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (Cooldowns.isOnCooldown("ruby_cooldown", player)) { - sender.sendMessage("§cYou cannot do this for another §l" - + Cooldowns.getCooldownForPlayerInt("ruby_cooldown", player) / 60 + " §cminutes."); + sender.sendMessage("§cYou cannot do this for another §l" + + Cooldowns.getCooldownForPlayerInt("ruby_cooldown", player) / 60 + " §cminutes."); return true; } final UUID targetUUID = target.getUniqueId(); @@ -57,4 +57,4 @@ public class RubyReviveCommand implements CommandExecutor { return true; } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/SetBorderCommand.java b/src/main/java/us/hcrealms/hcf/commands/SetBorderCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SetBorderCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SetBorderCommand.java diff --git a/src/us/hcrealms/hcf/commands/SetCommand.java b/src/main/java/us/hcrealms/hcf/commands/SetCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SetCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SetCommand.java diff --git a/src/us/hcrealms/hcf/commands/SetKBCommand.java b/src/main/java/us/hcrealms/hcf/commands/SetKBCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SetKBCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SetKBCommand.java diff --git a/src/us/hcrealms/hcf/commands/SkullCommand.java b/src/main/java/us/hcrealms/hcf/commands/SkullCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SkullCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SkullCommand.java diff --git a/src/us/hcrealms/hcf/commands/SpawnCommand.java b/src/main/java/us/hcrealms/hcf/commands/SpawnCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SpawnCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SpawnCommand.java diff --git a/src/us/hcrealms/hcf/commands/SpawnerCommand.java b/src/main/java/us/hcrealms/hcf/commands/SpawnerCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SpawnerCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SpawnerCommand.java diff --git a/src/us/hcrealms/hcf/commands/StaffModeCommand.java b/src/main/java/us/hcrealms/hcf/commands/StaffModeCommand.java similarity index 84% rename from src/us/hcrealms/hcf/commands/StaffModeCommand.java rename to src/main/java/us/hcrealms/hcf/commands/StaffModeCommand.java index 26425fa..eed8269 100644 --- a/src/us/hcrealms/hcf/commands/StaffModeCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/StaffModeCommand.java @@ -1,6 +1,6 @@ package us.hcrealms.hcf.commands; -import java.util.ArrayList; +import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; @@ -35,7 +35,7 @@ public class StaffModeCommand implements Listener, CommandExecutor { public static boolean isMod(Player p) { return Staff.contains(p.getUniqueId()); - + } public static boolean enterMod(final Player p) { @@ -52,7 +52,7 @@ public class StaffModeCommand implements Listener, CommandExecutor { p.setAllowFlight(true); p.setGameMode(GameMode.CREATIVE); StaffItems.modItems(p); - p.sendMessage("§7You have §aenabled §7your §3§lStaff Mode"); + p.sendMessage("§7You have §aenabled §7your §3§lStaff Mode"); return true; } @@ -65,7 +65,7 @@ public class StaffModeCommand implements Listener, CommandExecutor { VanishListener.getInstance().setVanish(p, false); p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&7You have &cdisabled &7your &3&lStaff Mode")); p.setGameMode(GameMode.SURVIVAL); - + return true; } @@ -93,7 +93,7 @@ public class StaffModeCommand implements Listener, CommandExecutor { } Player t = Bukkit.getPlayer(args[0]); if (t == null) { - sender.sendMessage("§cPlayer not found."); + sender.sendMessage("§cPlayer not found."); return true; } if (modMode.contains(t)) { @@ -107,18 +107,18 @@ public class StaffModeCommand implements Listener, CommandExecutor { } return false; } - @SuppressWarnings({ "deprecation" }) + @SuppressWarnings({ "deprecation" }) public static void onDisableMod() { - Player[] arrayOfPlayer; - int j = (arrayOfPlayer = Bukkit.getOnlinePlayers()).length; - for (int i = 0; i < j; i++) { - Player p = arrayOfPlayer[i]; - if (Staff.contains(p.getUniqueId())) { - leaveMod(p); - p.sendMessage(ChatColor.RED.toString() + "You have been taken out of staff mode because of a reload."); - teleportList.remove(p); - } - } - } + Player[] arrayOfPlayer; + int j = (arrayOfPlayer = Bukkit.getOnlinePlayers()).length; + for (int i = 0; i < j; i++) { + Player p = arrayOfPlayer[i]; + if (Staff.contains(p.getUniqueId())) { + leaveMod(p); + p.sendMessage(ChatColor.RED.toString() + "You have been taken out of staff mode because of a reload."); + teleportList.remove(p); + } + } + } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/StatsCommand.java b/src/main/java/us/hcrealms/hcf/commands/StatsCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/StatsCommand.java rename to src/main/java/us/hcrealms/hcf/commands/StatsCommand.java diff --git a/src/us/hcrealms/hcf/commands/SudoCommand.java b/src/main/java/us/hcrealms/hcf/commands/SudoCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/SudoCommand.java rename to src/main/java/us/hcrealms/hcf/commands/SudoCommand.java diff --git a/src/us/hcrealms/hcf/commands/TLCommand.java b/src/main/java/us/hcrealms/hcf/commands/TLCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TLCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TLCommand.java diff --git a/src/us/hcrealms/hcf/commands/TeamspeakCommand.java b/src/main/java/us/hcrealms/hcf/commands/TeamspeakCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TeamspeakCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TeamspeakCommand.java diff --git a/src/us/hcrealms/hcf/commands/TeleportAllCommand.java b/src/main/java/us/hcrealms/hcf/commands/TeleportAllCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TeleportAllCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TeleportAllCommand.java diff --git a/src/us/hcrealms/hcf/commands/TeleportCommand.java b/src/main/java/us/hcrealms/hcf/commands/TeleportCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TeleportCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TeleportCommand.java diff --git a/src/us/hcrealms/hcf/commands/TeleportHereCommand.java b/src/main/java/us/hcrealms/hcf/commands/TeleportHereCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TeleportHereCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TeleportHereCommand.java diff --git a/src/us/hcrealms/hcf/commands/ToggleMessageCommand.java b/src/main/java/us/hcrealms/hcf/commands/ToggleMessageCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/ToggleMessageCommand.java rename to src/main/java/us/hcrealms/hcf/commands/ToggleMessageCommand.java diff --git a/src/us/hcrealms/hcf/commands/TopCommand.java b/src/main/java/us/hcrealms/hcf/commands/TopCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/TopCommand.java rename to src/main/java/us/hcrealms/hcf/commands/TopCommand.java diff --git a/src/us/hcrealms/hcf/commands/VanishCommand.java b/src/main/java/us/hcrealms/hcf/commands/VanishCommand.java similarity index 96% rename from src/us/hcrealms/hcf/commands/VanishCommand.java rename to src/main/java/us/hcrealms/hcf/commands/VanishCommand.java index 3581db5..c115bcb 100644 --- a/src/us/hcrealms/hcf/commands/VanishCommand.java +++ b/src/main/java/us/hcrealms/hcf/commands/VanishCommand.java @@ -44,7 +44,7 @@ public class VanishCommand implements CommandExecutor { } Player t = Bukkit.getPlayer(args[0]); if (t == null) { - sender.sendMessage("§6Could not find player §f" + args[0].toString() + "§6."); + sender.sendMessage("§6Could not find player §f" + args[0].toString() + "§6."); return true; } VanishListener.getInstance(); @@ -60,4 +60,4 @@ public class VanishCommand implements CommandExecutor { return false; } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/commands/WhoisCommand.java b/src/main/java/us/hcrealms/hcf/commands/WhoisCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/WhoisCommand.java rename to src/main/java/us/hcrealms/hcf/commands/WhoisCommand.java diff --git a/src/us/hcrealms/hcf/commands/WorldCommand.java b/src/main/java/us/hcrealms/hcf/commands/WorldCommand.java similarity index 100% rename from src/us/hcrealms/hcf/commands/WorldCommand.java rename to src/main/java/us/hcrealms/hcf/commands/WorldCommand.java diff --git a/src/us/hcrealms/hcf/config/FileConfig.java b/src/main/java/us/hcrealms/hcf/config/FileConfig.java similarity index 100% rename from src/us/hcrealms/hcf/config/FileConfig.java rename to src/main/java/us/hcrealms/hcf/config/FileConfig.java diff --git a/src/us/hcrealms/hcf/config/PlayerData.java b/src/main/java/us/hcrealms/hcf/config/PlayerData.java similarity index 100% rename from src/us/hcrealms/hcf/config/PlayerData.java rename to src/main/java/us/hcrealms/hcf/config/PlayerData.java diff --git a/src/us/hcrealms/hcf/config/PotionLimiterData.java b/src/main/java/us/hcrealms/hcf/config/PotionLimiterData.java similarity index 100% rename from src/us/hcrealms/hcf/config/PotionLimiterData.java rename to src/main/java/us/hcrealms/hcf/config/PotionLimiterData.java diff --git a/src/us/hcrealms/hcf/config/WorldData.java b/src/main/java/us/hcrealms/hcf/config/WorldData.java similarity index 100% rename from src/us/hcrealms/hcf/config/WorldData.java rename to src/main/java/us/hcrealms/hcf/config/WorldData.java diff --git a/src/us/hcrealms/hcf/crowbar/Crowbar.java b/src/main/java/us/hcrealms/hcf/crowbar/Crowbar.java similarity index 100% rename from src/us/hcrealms/hcf/crowbar/Crowbar.java rename to src/main/java/us/hcrealms/hcf/crowbar/Crowbar.java diff --git a/src/us/hcrealms/hcf/deathban/Deathban.java b/src/main/java/us/hcrealms/hcf/deathban/Deathban.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/Deathban.java rename to src/main/java/us/hcrealms/hcf/deathban/Deathban.java diff --git a/src/us/hcrealms/hcf/deathban/DeathbanListener.java b/src/main/java/us/hcrealms/hcf/deathban/DeathbanListener.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/DeathbanListener.java rename to src/main/java/us/hcrealms/hcf/deathban/DeathbanListener.java diff --git a/src/us/hcrealms/hcf/deathban/DeathbanManager.java b/src/main/java/us/hcrealms/hcf/deathban/DeathbanManager.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/DeathbanManager.java rename to src/main/java/us/hcrealms/hcf/deathban/DeathbanManager.java diff --git a/src/us/hcrealms/hcf/deathban/FlatFileDeathbanManager.java b/src/main/java/us/hcrealms/hcf/deathban/FlatFileDeathbanManager.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/FlatFileDeathbanManager.java rename to src/main/java/us/hcrealms/hcf/deathban/FlatFileDeathbanManager.java diff --git a/src/us/hcrealms/hcf/deathban/lives/LivesExecutor.java b/src/main/java/us/hcrealms/hcf/deathban/lives/LivesExecutor.java similarity index 82% rename from src/us/hcrealms/hcf/deathban/lives/LivesExecutor.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/LivesExecutor.java index bd995fa..0299681 100644 --- a/src/us/hcrealms/hcf/deathban/lives/LivesExecutor.java +++ b/src/main/java/us/hcrealms/hcf/deathban/lives/LivesExecutor.java @@ -17,7 +17,7 @@ import us.hcrealms.hcf.util.command.ArgumentExecutor; import us.hcrealms.hcf.util.command.CommandArgument; public class LivesExecutor - extends ArgumentExecutor + extends ArgumentExecutor { public LivesExecutor(Base plugin) { @@ -30,21 +30,21 @@ public class LivesExecutor addArgument(new LivesSetArgument(plugin)); addArgument(new LivesSetDeathbanTimeArgument()); } - + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (args.length < 1) { sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); sender.sendMessage(ChatColor.GOLD + "Lives Help"); - sender.sendMessage(ChatColor.YELLOW + " /lives check" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Check how many lives a player currently has"); - sender.sendMessage(ChatColor.YELLOW + " /lives give" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Gives a player a live if there death-banned"); - sender.sendMessage(ChatColor.YELLOW + " /lives revive" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Revive a player that's death-banned"); + sender.sendMessage(ChatColor.YELLOW + " /lives check" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Check how many lives a player currently has"); + sender.sendMessage(ChatColor.YELLOW + " /lives give" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Gives a player a live if there death-banned"); + sender.sendMessage(ChatColor.YELLOW + " /lives revive" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Revive a player that's death-banned"); if (sender.hasPermission("lives.admin")) { - sender.sendMessage(ChatColor.YELLOW + " /lives cleardeathbans" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Clear all the server's deathbans"); - sender.sendMessage(ChatColor.YELLOW + " /lives set" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Set the player's amount of lives."); - sender.sendMessage(ChatColor.YELLOW + " /lives setdeathbantime" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Sets the base deathban time."); + sender.sendMessage(ChatColor.YELLOW + " /lives cleardeathbans" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Clear all the server's deathbans"); + sender.sendMessage(ChatColor.YELLOW + " /lives set" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Set the player's amount of lives."); + sender.sendMessage(ChatColor.YELLOW + " /lives setdeathbantime" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Sets the base deathban time."); } sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); return true; @@ -59,4 +59,4 @@ public class LivesExecutor argument2.onCommand(sender, command, label, args); return true; } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/deathban/lives/StaffReviveCommand.java b/src/main/java/us/hcrealms/hcf/deathban/lives/StaffReviveCommand.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/StaffReviveCommand.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/StaffReviveCommand.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesCheckArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesCheckArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesCheckArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesCheckArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesCheckDeathbanArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesCheckDeathbanArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesCheckDeathbanArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesCheckDeathbanArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesClearDeathbansArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesClearDeathbansArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesClearDeathbansArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesClearDeathbansArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesGiveArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesGiveArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesGiveArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesGiveArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesReviveArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesReviveArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesReviveArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesReviveArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesSetArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesSetArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesSetArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesSetArgument.java diff --git a/src/us/hcrealms/hcf/deathban/lives/argument/LivesSetDeathbanTimeArgument.java b/src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesSetDeathbanTimeArgument.java similarity index 100% rename from src/us/hcrealms/hcf/deathban/lives/argument/LivesSetDeathbanTimeArgument.java rename to src/main/java/us/hcrealms/hcf/deathban/lives/argument/LivesSetDeathbanTimeArgument.java diff --git a/src/us/hcrealms/hcf/event/CaptureZone.java b/src/main/java/us/hcrealms/hcf/event/CaptureZone.java similarity index 100% rename from src/us/hcrealms/hcf/event/CaptureZone.java rename to src/main/java/us/hcrealms/hcf/event/CaptureZone.java diff --git a/src/us/hcrealms/hcf/event/EventExecutor.java b/src/main/java/us/hcrealms/hcf/event/EventExecutor.java similarity index 81% rename from src/us/hcrealms/hcf/event/EventExecutor.java rename to src/main/java/us/hcrealms/hcf/event/EventExecutor.java index 10dad38..04a4406 100644 --- a/src/us/hcrealms/hcf/event/EventExecutor.java +++ b/src/main/java/us/hcrealms/hcf/event/EventExecutor.java @@ -18,7 +18,7 @@ import us.hcrealms.hcf.util.command.ArgumentExecutor; import us.hcrealms.hcf.util.command.CommandArgument; public class EventExecutor - extends ArgumentExecutor + extends ArgumentExecutor { public EventExecutor(Base plugin) { @@ -32,7 +32,7 @@ public class EventExecutor addArgument(new EventStartArgument(plugin)); addArgument(new EventUptimeArgument(plugin)); } - + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (args.length < 1) @@ -41,14 +41,14 @@ public class EventExecutor { sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Event Help"); - sender.sendMessage(ChatColor.AQUA + " /event cancel" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Cancels a running event."); - sender.sendMessage(ChatColor.AQUA + " /event create" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Defines a new event."); - sender.sendMessage(ChatColor.AQUA + " /event delete" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Deletes an event."); - sender.sendMessage(ChatColor.AQUA + " /event setarea" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Sets the area of an event."); - sender.sendMessage(ChatColor.AQUA + " /event setcapzone" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Sets the capzone of an event."); - sender.sendMessage(ChatColor.AQUA + " /event start" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Start an event."); - sender.sendMessage(ChatColor.AQUA + " /event rename" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Renames an event."); - sender.sendMessage(ChatColor.AQUA + " /event uptime" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Check the uptime of an event."); + sender.sendMessage(ChatColor.AQUA + " /event cancel" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Cancels a running event."); + sender.sendMessage(ChatColor.AQUA + " /event create" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Defines a new event."); + sender.sendMessage(ChatColor.AQUA + " /event delete" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Deletes an event."); + sender.sendMessage(ChatColor.AQUA + " /event setarea" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Sets the area of an event."); + sender.sendMessage(ChatColor.AQUA + " /event setcapzone" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Sets the capzone of an event."); + sender.sendMessage(ChatColor.AQUA + " /event start" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Start an event."); + sender.sendMessage(ChatColor.AQUA + " /event rename" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Renames an event."); + sender.sendMessage(ChatColor.AQUA + " /event uptime" + ChatColor.DARK_GRAY +" » " + ChatColor.GRAY + "Check the uptime of an event."); sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); } return true; @@ -63,4 +63,4 @@ public class EventExecutor argument2.onCommand(sender, command, label, args); return true; } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/event/EventScheduler.java b/src/main/java/us/hcrealms/hcf/event/EventScheduler.java similarity index 100% rename from src/us/hcrealms/hcf/event/EventScheduler.java rename to src/main/java/us/hcrealms/hcf/event/EventScheduler.java diff --git a/src/us/hcrealms/hcf/event/EventTimer.java b/src/main/java/us/hcrealms/hcf/event/EventTimer.java similarity index 100% rename from src/us/hcrealms/hcf/event/EventTimer.java rename to src/main/java/us/hcrealms/hcf/event/EventTimer.java diff --git a/src/us/hcrealms/hcf/event/EventType.java b/src/main/java/us/hcrealms/hcf/event/EventType.java similarity index 100% rename from src/us/hcrealms/hcf/event/EventType.java rename to src/main/java/us/hcrealms/hcf/event/EventType.java diff --git a/src/us/hcrealms/hcf/event/argument/EventCancelArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventCancelArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventCancelArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventCancelArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventCreateArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventCreateArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventCreateArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventCreateArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventDeleteArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventDeleteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventDeleteArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventDeleteArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventRenameArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventRenameArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventRenameArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventRenameArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventSetAreaArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventSetAreaArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventSetAreaArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventSetAreaArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventSetCapzoneArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventSetCapzoneArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventSetCapzoneArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventSetCapzoneArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventStartArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventStartArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventStartArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventStartArgument.java diff --git a/src/us/hcrealms/hcf/event/argument/EventUptimeArgument.java b/src/main/java/us/hcrealms/hcf/event/argument/EventUptimeArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/argument/EventUptimeArgument.java rename to src/main/java/us/hcrealms/hcf/event/argument/EventUptimeArgument.java diff --git a/src/us/hcrealms/hcf/event/conquest/ConquestExecutor.java b/src/main/java/us/hcrealms/hcf/event/conquest/ConquestExecutor.java similarity index 100% rename from src/us/hcrealms/hcf/event/conquest/ConquestExecutor.java rename to src/main/java/us/hcrealms/hcf/event/conquest/ConquestExecutor.java diff --git a/src/us/hcrealms/hcf/event/conquest/ConquestSetpointsArgument.java b/src/main/java/us/hcrealms/hcf/event/conquest/ConquestSetpointsArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/conquest/ConquestSetpointsArgument.java rename to src/main/java/us/hcrealms/hcf/event/conquest/ConquestSetpointsArgument.java diff --git a/src/us/hcrealms/hcf/event/eotw/EOTWHandler.java b/src/main/java/us/hcrealms/hcf/event/eotw/EOTWHandler.java similarity index 100% rename from src/us/hcrealms/hcf/event/eotw/EOTWHandler.java rename to src/main/java/us/hcrealms/hcf/event/eotw/EOTWHandler.java diff --git a/src/us/hcrealms/hcf/event/eotw/EotwCommand.java b/src/main/java/us/hcrealms/hcf/event/eotw/EotwCommand.java similarity index 100% rename from src/us/hcrealms/hcf/event/eotw/EotwCommand.java rename to src/main/java/us/hcrealms/hcf/event/eotw/EotwCommand.java diff --git a/src/us/hcrealms/hcf/event/eotw/EotwListener.java b/src/main/java/us/hcrealms/hcf/event/eotw/EotwListener.java similarity index 100% rename from src/us/hcrealms/hcf/event/eotw/EotwListener.java rename to src/main/java/us/hcrealms/hcf/event/eotw/EotwListener.java diff --git a/src/us/hcrealms/hcf/event/faction/CapturableFaction.java b/src/main/java/us/hcrealms/hcf/event/faction/CapturableFaction.java similarity index 100% rename from src/us/hcrealms/hcf/event/faction/CapturableFaction.java rename to src/main/java/us/hcrealms/hcf/event/faction/CapturableFaction.java diff --git a/src/us/hcrealms/hcf/event/faction/ConquestFaction.java b/src/main/java/us/hcrealms/hcf/event/faction/ConquestFaction.java similarity index 100% rename from src/us/hcrealms/hcf/event/faction/ConquestFaction.java rename to src/main/java/us/hcrealms/hcf/event/faction/ConquestFaction.java diff --git a/src/us/hcrealms/hcf/event/faction/EventFaction.java b/src/main/java/us/hcrealms/hcf/event/faction/EventFaction.java similarity index 100% rename from src/us/hcrealms/hcf/event/faction/EventFaction.java rename to src/main/java/us/hcrealms/hcf/event/faction/EventFaction.java diff --git a/src/us/hcrealms/hcf/event/faction/KothFaction.java b/src/main/java/us/hcrealms/hcf/event/faction/KothFaction.java similarity index 100% rename from src/us/hcrealms/hcf/event/faction/KothFaction.java rename to src/main/java/us/hcrealms/hcf/event/faction/KothFaction.java diff --git a/src/us/hcrealms/hcf/event/glmountain/CountdownManager.java b/src/main/java/us/hcrealms/hcf/event/glmountain/CountdownManager.java similarity index 100% rename from src/us/hcrealms/hcf/event/glmountain/CountdownManager.java rename to src/main/java/us/hcrealms/hcf/event/glmountain/CountdownManager.java diff --git a/src/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java b/src/main/java/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java similarity index 89% rename from src/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java rename to src/main/java/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java index 3cdd8bc..e2e0470 100644 --- a/src/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java +++ b/src/main/java/us/hcrealms/hcf/event/glmountain/GlowstoneMountain.java @@ -34,11 +34,11 @@ public final class GlowstoneMountain implements CommandExecutor { } if (args.length == 0 || args.length > 1) { - sender.sendMessage("§9§m--------------------------------"); + sender.sendMessage("§9§m--------------------------------"); sender.sendMessage( - "§c/glowstone set - Sets the location for Glowstone Mountain. §7(Make sure you have made a selection with WorldEdit)"); - sender.sendMessage("§c/glowstone reset - Resets Glowstone Mountain."); - sender.sendMessage("§9§m--------------------------------"); + "§c/glowstone set - Sets the location for Glowstone Mountain. §7(Make sure you have made a selection with WorldEdit)"); + sender.sendMessage("§c/glowstone reset - Resets Glowstone Mountain."); + sender.sendMessage("§9§m--------------------------------"); return true; } @@ -84,12 +84,12 @@ public final class GlowstoneMountain implements CommandExecutor { for (int x = min.getBlockX(); x <= max.getBlockX(); x++) { for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) { block = min.getWorld().getBlockAt(x, minY, z); - + if(!block.getChunk().isLoaded()) { block.getChunk().load(); continue; } - + block.setType(Material.GLOWSTONE); } } @@ -106,4 +106,4 @@ public final class GlowstoneMountain implements CommandExecutor { } } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/event/glmountain/MountainHandler.java b/src/main/java/us/hcrealms/hcf/event/glmountain/MountainHandler.java similarity index 100% rename from src/us/hcrealms/hcf/event/glmountain/MountainHandler.java rename to src/main/java/us/hcrealms/hcf/event/glmountain/MountainHandler.java diff --git a/src/us/hcrealms/hcf/event/glmountain/models/CuboidRegion.java b/src/main/java/us/hcrealms/hcf/event/glmountain/models/CuboidRegion.java similarity index 100% rename from src/us/hcrealms/hcf/event/glmountain/models/CuboidRegion.java rename to src/main/java/us/hcrealms/hcf/event/glmountain/models/CuboidRegion.java diff --git a/src/us/hcrealms/hcf/event/glmountain/models/Mountain.java b/src/main/java/us/hcrealms/hcf/event/glmountain/models/Mountain.java similarity index 100% rename from src/us/hcrealms/hcf/event/glmountain/models/Mountain.java rename to src/main/java/us/hcrealms/hcf/event/glmountain/models/Mountain.java diff --git a/src/us/hcrealms/hcf/event/koth/KothExecutor.java b/src/main/java/us/hcrealms/hcf/event/koth/KothExecutor.java similarity index 100% rename from src/us/hcrealms/hcf/event/koth/KothExecutor.java rename to src/main/java/us/hcrealms/hcf/event/koth/KothExecutor.java diff --git a/src/us/hcrealms/hcf/event/koth/argument/KothNextArgument.java b/src/main/java/us/hcrealms/hcf/event/koth/argument/KothNextArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/koth/argument/KothNextArgument.java rename to src/main/java/us/hcrealms/hcf/event/koth/argument/KothNextArgument.java diff --git a/src/us/hcrealms/hcf/event/koth/argument/KothScheduleArgument.java b/src/main/java/us/hcrealms/hcf/event/koth/argument/KothScheduleArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/koth/argument/KothScheduleArgument.java rename to src/main/java/us/hcrealms/hcf/event/koth/argument/KothScheduleArgument.java diff --git a/src/us/hcrealms/hcf/event/koth/argument/KothSetCapDelayArgument.java b/src/main/java/us/hcrealms/hcf/event/koth/argument/KothSetCapDelayArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/koth/argument/KothSetCapDelayArgument.java rename to src/main/java/us/hcrealms/hcf/event/koth/argument/KothSetCapDelayArgument.java diff --git a/src/us/hcrealms/hcf/event/koth/argument/KothShowArgument.java b/src/main/java/us/hcrealms/hcf/event/koth/argument/KothShowArgument.java similarity index 100% rename from src/us/hcrealms/hcf/event/koth/argument/KothShowArgument.java rename to src/main/java/us/hcrealms/hcf/event/koth/argument/KothShowArgument.java diff --git a/src/us/hcrealms/hcf/event/tracker/ConquestTracker.java b/src/main/java/us/hcrealms/hcf/event/tracker/ConquestTracker.java similarity index 100% rename from src/us/hcrealms/hcf/event/tracker/ConquestTracker.java rename to src/main/java/us/hcrealms/hcf/event/tracker/ConquestTracker.java diff --git a/src/us/hcrealms/hcf/event/tracker/EventTracker.java b/src/main/java/us/hcrealms/hcf/event/tracker/EventTracker.java similarity index 100% rename from src/us/hcrealms/hcf/event/tracker/EventTracker.java rename to src/main/java/us/hcrealms/hcf/event/tracker/EventTracker.java diff --git a/src/us/hcrealms/hcf/event/tracker/KothTracker.java b/src/main/java/us/hcrealms/hcf/event/tracker/KothTracker.java similarity index 100% rename from src/us/hcrealms/hcf/event/tracker/KothTracker.java rename to src/main/java/us/hcrealms/hcf/event/tracker/KothTracker.java diff --git a/src/us/hcrealms/hcf/faction/CaseInsensitiveHashingStrategy.java b/src/main/java/us/hcrealms/hcf/faction/CaseInsensitiveHashingStrategy.java similarity index 100% rename from src/us/hcrealms/hcf/faction/CaseInsensitiveHashingStrategy.java rename to src/main/java/us/hcrealms/hcf/faction/CaseInsensitiveHashingStrategy.java diff --git a/src/us/hcrealms/hcf/faction/CaseInsensitiveMap.java b/src/main/java/us/hcrealms/hcf/faction/CaseInsensitiveMap.java similarity index 100% rename from src/us/hcrealms/hcf/faction/CaseInsensitiveMap.java rename to src/main/java/us/hcrealms/hcf/faction/CaseInsensitiveMap.java diff --git a/src/us/hcrealms/hcf/faction/FactionExecutor.java b/src/main/java/us/hcrealms/hcf/faction/FactionExecutor.java similarity index 100% rename from src/us/hcrealms/hcf/faction/FactionExecutor.java rename to src/main/java/us/hcrealms/hcf/faction/FactionExecutor.java diff --git a/src/us/hcrealms/hcf/faction/FactionManager.java b/src/main/java/us/hcrealms/hcf/faction/FactionManager.java similarity index 100% rename from src/us/hcrealms/hcf/faction/FactionManager.java rename to src/main/java/us/hcrealms/hcf/faction/FactionManager.java diff --git a/src/us/hcrealms/hcf/faction/FactionMember.java b/src/main/java/us/hcrealms/hcf/faction/FactionMember.java similarity index 100% rename from src/us/hcrealms/hcf/faction/FactionMember.java rename to src/main/java/us/hcrealms/hcf/faction/FactionMember.java diff --git a/src/us/hcrealms/hcf/faction/FlatFileFactionManager.java b/src/main/java/us/hcrealms/hcf/faction/FlatFileFactionManager.java similarity index 100% rename from src/us/hcrealms/hcf/faction/FlatFileFactionManager.java rename to src/main/java/us/hcrealms/hcf/faction/FlatFileFactionManager.java diff --git a/src/us/hcrealms/hcf/faction/LandMap.java b/src/main/java/us/hcrealms/hcf/faction/LandMap.java similarity index 100% rename from src/us/hcrealms/hcf/faction/LandMap.java rename to src/main/java/us/hcrealms/hcf/faction/LandMap.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionAcceptArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionAcceptArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionAcceptArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionAcceptArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionAllyArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionAllyArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionAllyArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionAllyArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionAnnouncementArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionAnnouncementArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionAnnouncementArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionAnnouncementArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionBuildArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionBuildArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionBuildArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionBuildArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionChatArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionChatArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionChatArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionChatArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionClaimArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionClaimArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionClaimArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionClaimArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionClaimsArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionClaimsArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionClaimsArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionClaimsArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionCoLeaderArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionCoLeaderArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionCoLeaderArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionCoLeaderArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionCreateArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionCreateArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionCreateArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionCreateArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionDemoteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionDemoteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionDemoteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionDemoteArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionDepositArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionDepositArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionDepositArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionDepositArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionDisbandArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionDisbandArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionDisbandArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionDisbandArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionHelpArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionHelpArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionHelpArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionHelpArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionHomeArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionHomeArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionHomeArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionHomeArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionInviteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionInviteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionInviteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionInviteArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionInvitesArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionInvitesArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionInvitesArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionInvitesArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionKickArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionKickArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionKickArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionKickArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionLeaderArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionLeaderArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionLeaderArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionLeaderArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionLeaveArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionLeaveArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionLeaveArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionLeaveArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionListArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionListArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionListArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionListArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionMapArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionMapArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionMapArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionMapArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionMessageArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionMessageArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionMessageArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionMessageArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionOpenArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionOpenArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionOpenArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionOpenArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionPromoteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionPromoteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionPromoteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionPromoteArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionRenameArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionRenameArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionRenameArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionRenameArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionSetHomeArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionSetHomeArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionSetHomeArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionSetHomeArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionShowArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionShowArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionShowArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionShowArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionStuckArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionStuckArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionStuckArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionStuckArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionUnallyArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionUnallyArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionUnallyArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionUnallyArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionUnclaimArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionUnclaimArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionUnclaimArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionUnclaimArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionUninviteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionUninviteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionUninviteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionUninviteArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/FactionWithdrawArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/FactionWithdrawArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/FactionWithdrawArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/FactionWithdrawArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionChatSpyArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionChatSpyArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionChatSpyArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionChatSpyArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionClaimForArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionClaimForArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionClaimForArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionClaimForArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionClearClaimsArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionClearClaimsArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionClearClaimsArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionClearClaimsArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionForceJoinArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForceJoinArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionForceJoinArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForceJoinArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionForceLeaderArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForceLeaderArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionForceLeaderArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForceLeaderArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionForcePromoteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForcePromoteArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionForcePromoteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionForcePromoteArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionLockArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionLockArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionLockArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionLockArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java similarity index 91% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java index 8b220e4..acc80cf 100644 --- a/src/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java +++ b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionMuteArgument.java @@ -18,22 +18,22 @@ import us.hcrealms.hcf.util.BukkitUtils; import us.hcrealms.hcf.util.command.CommandArgument; public class FactionMuteArgument - extends CommandArgument + extends CommandArgument { private final Base plugin; - + public FactionMuteArgument(Base plugin) { super("mute", "Mutes every member in this faction."); this.plugin = plugin; this.permission = ("hcf.command.faction.argument." + getName()); } - + public String getUsage(String label) { return '/' + label + ' ' + getName() + " "; } - + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (args.length < 3) @@ -57,12 +57,12 @@ public class FactionMuteArgument console.getServer().dispatchCommand(sender, commandLine); } sender.sendMessage(BukkitUtils.STRAIGHT_LINE_DEFAULT); - sender.sendMessage("§c§l[Server] §7Executing mutes for the faction §c§l" + playerFaction.getName() + "."); - sender.sendMessage("§c§lReason§7: §7" + extraArgs); + sender.sendMessage("§c§l[Server] §7Executing mutes for the faction §c§l" + playerFaction.getName() + "."); + sender.sendMessage("§c§lReason§7: §7" + extraArgs); sender.sendMessage(BukkitUtils.STRAIGHT_LINE_DEFAULT); return true; } - + public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { return args.length == 2 ? null : Collections.emptyList(); diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionRemoveArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionRemoveArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionRemoveArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionRemoveArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionSetDeathbanMultiplierArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDeathbanMultiplierArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionSetDeathbanMultiplierArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDeathbanMultiplierArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrArgument.java diff --git a/src/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrRegenArgument.java b/src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrRegenArgument.java similarity index 100% rename from src/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrRegenArgument.java rename to src/main/java/us/hcrealms/hcf/faction/argument/staff/FactionSetDtrRegenArgument.java diff --git a/src/us/hcrealms/hcf/faction/claim/Claim.java b/src/main/java/us/hcrealms/hcf/faction/claim/Claim.java similarity index 100% rename from src/us/hcrealms/hcf/faction/claim/Claim.java rename to src/main/java/us/hcrealms/hcf/faction/claim/Claim.java diff --git a/src/us/hcrealms/hcf/faction/claim/ClaimHandler.java b/src/main/java/us/hcrealms/hcf/faction/claim/ClaimHandler.java similarity index 100% rename from src/us/hcrealms/hcf/faction/claim/ClaimHandler.java rename to src/main/java/us/hcrealms/hcf/faction/claim/ClaimHandler.java diff --git a/src/us/hcrealms/hcf/faction/claim/ClaimSelection.java b/src/main/java/us/hcrealms/hcf/faction/claim/ClaimSelection.java similarity index 100% rename from src/us/hcrealms/hcf/faction/claim/ClaimSelection.java rename to src/main/java/us/hcrealms/hcf/faction/claim/ClaimSelection.java diff --git a/src/us/hcrealms/hcf/faction/claim/ClaimWandListener.java b/src/main/java/us/hcrealms/hcf/faction/claim/ClaimWandListener.java similarity index 100% rename from src/us/hcrealms/hcf/faction/claim/ClaimWandListener.java rename to src/main/java/us/hcrealms/hcf/faction/claim/ClaimWandListener.java diff --git a/src/us/hcrealms/hcf/faction/claim/Subclaim.java b/src/main/java/us/hcrealms/hcf/faction/claim/Subclaim.java similarity index 100% rename from src/us/hcrealms/hcf/faction/claim/Subclaim.java rename to src/main/java/us/hcrealms/hcf/faction/claim/Subclaim.java diff --git a/src/us/hcrealms/hcf/faction/event/CaptureZoneEnterEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/CaptureZoneEnterEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/CaptureZoneEnterEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/CaptureZoneEnterEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/CaptureZoneLeaveEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/CaptureZoneLeaveEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/CaptureZoneLeaveEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/CaptureZoneLeaveEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionChatEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionChatEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionChatEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionChatEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionClaimChangeEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionClaimChangeEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionClaimChangeEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionClaimChangeEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionClaimChangedEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionClaimChangedEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionClaimChangedEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionClaimChangedEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionCreateEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionCreateEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionCreateEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionCreateEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionDtrChangeEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionDtrChangeEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionDtrChangeEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionDtrChangeEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionFocusChangeEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionFocusChangeEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionFocusChangeEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionFocusChangeEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionRelationCreateEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionRelationCreateEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionRelationCreateEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionRelationCreateEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionRelationRemoveEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionRelationRemoveEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionRelationRemoveEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionRelationRemoveEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionRemoveEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionRemoveEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionRemoveEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionRemoveEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/FactionRenameEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/FactionRenameEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/FactionRenameEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/FactionRenameEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerClaimEnterEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerClaimEnterEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerClaimEnterEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerClaimEnterEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerFreezeEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerFreezeEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerFreezeEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerFreezeEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerJoinFactionEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerJoinFactionEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerJoinFactionEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerJoinFactionEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerJoinedFactionEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerJoinedFactionEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerJoinedFactionEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerJoinedFactionEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerLeaveFactionEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerLeaveFactionEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerLeaveFactionEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerLeaveFactionEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/PlayerLeftFactionEvent.java b/src/main/java/us/hcrealms/hcf/faction/event/PlayerLeftFactionEvent.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/PlayerLeftFactionEvent.java rename to src/main/java/us/hcrealms/hcf/faction/event/PlayerLeftFactionEvent.java diff --git a/src/us/hcrealms/hcf/faction/event/cause/ClaimChangeCause.java b/src/main/java/us/hcrealms/hcf/faction/event/cause/ClaimChangeCause.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/cause/ClaimChangeCause.java rename to src/main/java/us/hcrealms/hcf/faction/event/cause/ClaimChangeCause.java diff --git a/src/us/hcrealms/hcf/faction/event/cause/FactionLeaveCause.java b/src/main/java/us/hcrealms/hcf/faction/event/cause/FactionLeaveCause.java similarity index 100% rename from src/us/hcrealms/hcf/faction/event/cause/FactionLeaveCause.java rename to src/main/java/us/hcrealms/hcf/faction/event/cause/FactionLeaveCause.java diff --git a/src/us/hcrealms/hcf/faction/struct/ChatChannel.java b/src/main/java/us/hcrealms/hcf/faction/struct/ChatChannel.java similarity index 100% rename from src/us/hcrealms/hcf/faction/struct/ChatChannel.java rename to src/main/java/us/hcrealms/hcf/faction/struct/ChatChannel.java diff --git a/src/us/hcrealms/hcf/faction/struct/Raidable.java b/src/main/java/us/hcrealms/hcf/faction/struct/Raidable.java similarity index 100% rename from src/us/hcrealms/hcf/faction/struct/Raidable.java rename to src/main/java/us/hcrealms/hcf/faction/struct/Raidable.java diff --git a/src/us/hcrealms/hcf/faction/struct/RegenStatus.java b/src/main/java/us/hcrealms/hcf/faction/struct/RegenStatus.java similarity index 100% rename from src/us/hcrealms/hcf/faction/struct/RegenStatus.java rename to src/main/java/us/hcrealms/hcf/faction/struct/RegenStatus.java diff --git a/src/us/hcrealms/hcf/faction/struct/Relation.java b/src/main/java/us/hcrealms/hcf/faction/struct/Relation.java similarity index 100% rename from src/us/hcrealms/hcf/faction/struct/Relation.java rename to src/main/java/us/hcrealms/hcf/faction/struct/Relation.java diff --git a/src/us/hcrealms/hcf/faction/struct/Role.java b/src/main/java/us/hcrealms/hcf/faction/struct/Role.java similarity index 100% rename from src/us/hcrealms/hcf/faction/struct/Role.java rename to src/main/java/us/hcrealms/hcf/faction/struct/Role.java diff --git a/src/us/hcrealms/hcf/faction/type/ClaimableFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/ClaimableFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/ClaimableFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/ClaimableFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/EndPortalFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/EndPortalFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/EndPortalFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/EndPortalFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/Faction.java b/src/main/java/us/hcrealms/hcf/faction/type/Faction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/Faction.java rename to src/main/java/us/hcrealms/hcf/faction/type/Faction.java diff --git a/src/us/hcrealms/hcf/faction/type/GlowstoneFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/GlowstoneFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/GlowstoneFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/GlowstoneFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/PlayerFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/PlayerFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/PlayerFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/PlayerFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/RoadFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/RoadFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/RoadFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/RoadFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/SpawnFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/SpawnFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/SpawnFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/SpawnFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/WarzoneFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/WarzoneFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/WarzoneFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/WarzoneFaction.java diff --git a/src/us/hcrealms/hcf/faction/type/WildernessFaction.java b/src/main/java/us/hcrealms/hcf/faction/type/WildernessFaction.java similarity index 100% rename from src/us/hcrealms/hcf/faction/type/WildernessFaction.java rename to src/main/java/us/hcrealms/hcf/faction/type/WildernessFaction.java diff --git a/src/us/hcrealms/hcf/inventory/CustomInventory.java b/src/main/java/us/hcrealms/hcf/inventory/CustomInventory.java similarity index 100% rename from src/us/hcrealms/hcf/inventory/CustomInventory.java rename to src/main/java/us/hcrealms/hcf/inventory/CustomInventory.java diff --git a/src/us/hcrealms/hcf/inventory/CustomInventoryListener.java b/src/main/java/us/hcrealms/hcf/inventory/CustomInventoryListener.java similarity index 100% rename from src/us/hcrealms/hcf/inventory/CustomInventoryListener.java rename to src/main/java/us/hcrealms/hcf/inventory/CustomInventoryListener.java diff --git a/src/us/hcrealms/hcf/inventory/implementation/ClaimSettingsInventory.java b/src/main/java/us/hcrealms/hcf/inventory/implementation/ClaimSettingsInventory.java similarity index 100% rename from src/us/hcrealms/hcf/inventory/implementation/ClaimSettingsInventory.java rename to src/main/java/us/hcrealms/hcf/inventory/implementation/ClaimSettingsInventory.java diff --git a/src/us/hcrealms/hcf/inventory/implementation/runnable/BlockChangeRunnable.java b/src/main/java/us/hcrealms/hcf/inventory/implementation/runnable/BlockChangeRunnable.java similarity index 100% rename from src/us/hcrealms/hcf/inventory/implementation/runnable/BlockChangeRunnable.java rename to src/main/java/us/hcrealms/hcf/inventory/implementation/runnable/BlockChangeRunnable.java diff --git a/src/us/hcrealms/hcf/listener/AutoSmeltOreListener.java b/src/main/java/us/hcrealms/hcf/listener/AutoSmeltOreListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/AutoSmeltOreListener.java rename to src/main/java/us/hcrealms/hcf/listener/AutoSmeltOreListener.java diff --git a/src/us/hcrealms/hcf/listener/BookDeenchantListener.java b/src/main/java/us/hcrealms/hcf/listener/BookDeenchantListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/BookDeenchantListener.java rename to src/main/java/us/hcrealms/hcf/listener/BookDeenchantListener.java diff --git a/src/us/hcrealms/hcf/listener/BorderListener.java b/src/main/java/us/hcrealms/hcf/listener/BorderListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/BorderListener.java rename to src/main/java/us/hcrealms/hcf/listener/BorderListener.java diff --git a/src/us/hcrealms/hcf/listener/BottledExpListener.java b/src/main/java/us/hcrealms/hcf/listener/BottledExpListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/BottledExpListener.java rename to src/main/java/us/hcrealms/hcf/listener/BottledExpListener.java diff --git a/src/main/java/us/hcrealms/hcf/listener/ChatListener.java b/src/main/java/us/hcrealms/hcf/listener/ChatListener.java new file mode 100644 index 0000000..6cc5142 --- /dev/null +++ b/src/main/java/us/hcrealms/hcf/listener/ChatListener.java @@ -0,0 +1,136 @@ +package us.hcrealms.hcf.listener; + +import java.util.Collection; +import java.util.Set; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.AsyncPlayerChatEvent; + +import com.google.common.collect.ImmutableSet; + +import java.util.*; + +import ru.tehkode.permissions.bukkit.PermissionsEx; +import us.hcrealms.hcf.Base; +import us.hcrealms.hcf.faction.event.FactionChatEvent; +import us.hcrealms.hcf.faction.struct.ChatChannel; +import us.hcrealms.hcf.faction.type.PlayerFaction; + +public class ChatListener implements Listener +{ + public static final List blocked; + public ChatListener(Base plugin) + { + this.plugin = plugin; + } + + @SuppressWarnings({ "deprecation", "unchecked" }) + @EventHandler(ignoreCancelled=true, priority=EventPriority.HIGHEST) + public void onPlayerChat(AsyncPlayerChatEvent event) + { + String message = event.getMessage(); + Player player = event.getPlayer(); + PlayerFaction playerFaction = this.plugin.getFactionManager().getPlayerFaction(player); + ChatChannel chatChannel = playerFaction == null ? ChatChannel.PUBLIC : playerFaction.getMember(player).getChatChannel(); + Set recipients = event.getRecipients(); + + if ((chatChannel == ChatChannel.FACTION) || (chatChannel == ChatChannel.ALLIANCE)) + { + if (!isGlobalChannel(message)) + { + Collection online = playerFaction.getOnlinePlayers(); + if (chatChannel == ChatChannel.ALLIANCE) + { + Collection allies = playerFaction.getAlliedFactions(); + for (PlayerFaction ally : allies) { + online.addAll(ally.getOnlinePlayers()); + } + } + recipients.retainAll(online); + event.setFormat(chatChannel.getRawFormat(player)); + Bukkit.getPluginManager().callEvent(new FactionChatEvent(true, playerFaction, player, chatChannel, recipients, event.getMessage())); + return; + } + message = message.substring(1, message.length()).trim(); + event.setMessage(message); + } + event.setCancelled(true); + Boolean.valueOf(true); + if (player.hasPermission("faction.removetag")) { + Boolean.valueOf(true); + } + String rank = ChatColor.translateAlternateColorCodes('&', "&f" + PermissionsEx.getUser(player).getPrefix()).replace("_", " "); + String displayName = player.getDisplayName(); + displayName = rank + displayName; + ConsoleCommandSender console = Bukkit.getConsoleSender(); + for (final String word : blocked) { + if ((message.toLowerCase().contains(word))) + { + Bukkit.dispatchCommand(console, "tempmute " + player.getName() + " 5m Blocked Word -s"); + Player[] arrayOfPlayer; + int j = (arrayOfPlayer = Bukkit.getOnlinePlayers()).length; + for (int i = 0; i < j; i++) + { + Player on = arrayOfPlayer[i]; + if (on.hasPermission("command.mod")) { + on.sendMessage(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_RED.toString() + ChatColor.BOLD + "BLOCKED" + ChatColor.DARK_GRAY + "] " + ChatColor.RED + player.getDisplayName() + ChatColor.GRAY + " attempted to say " + ChatColor.RED + message); + } + } + event.setCancelled(true); + return; + } + } + String tag = playerFaction == null ? ChatColor.DARK_RED + "-" : playerFaction.getDisplayName(console); + console.sendMessage(ChatColor.GOLD + "[" + tag + ChatColor.GOLD + "] " + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); + for (Player recipient : event.getRecipients()) + { + if (playerFaction != null) + { + tag = playerFaction == null ? ChatColor.RED + "*" : playerFaction.getDisplayName(recipient); + recipient.sendMessage(ChatColor.GOLD + "[" + tag + ChatColor.GOLD + "] " + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); + } + else + { + recipient.sendMessage(ChatColor.GOLD + "[§c*§6] §r" + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); + } + } + } + + private boolean isGlobalChannel(String input) + { + int length = input.length(); + if ((length <= 1) || (!input.startsWith("!"))) { + return false; + } + int i = 1; + while (i < length) + { + char character = input.charAt(i); + if (character == ' ') + { + i++; + } + else + { + if (character != '/') { + break; + } + return false; + } + } + return true; + } + + static + { + blocked = Arrays.asList("hitler", "kys", "nigga", "kill yourself", "nigger", "rip off", "shit staff", "shit server", "gay server", "kys", "leaked", "ddos", "kill yourself", "shit owner", "join my server", "new hcf server", "server is shit", "server is crap", "bad server", "kult", "this is shit", "customkkk", "niggerfaggot", "faggot", "heil"); + ImmutableSet.builder(); + } + + private final Base plugin; +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/listener/CommandBlockerListener.java b/src/main/java/us/hcrealms/hcf/listener/CommandBlockerListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/CommandBlockerListener.java rename to src/main/java/us/hcrealms/hcf/listener/CommandBlockerListener.java diff --git a/src/us/hcrealms/hcf/listener/CoreListener.java b/src/main/java/us/hcrealms/hcf/listener/CoreListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/CoreListener.java rename to src/main/java/us/hcrealms/hcf/listener/CoreListener.java diff --git a/src/us/hcrealms/hcf/listener/CrowbarListener.java b/src/main/java/us/hcrealms/hcf/listener/CrowbarListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/CrowbarListener.java rename to src/main/java/us/hcrealms/hcf/listener/CrowbarListener.java diff --git a/src/us/hcrealms/hcf/listener/DeathListener.java b/src/main/java/us/hcrealms/hcf/listener/DeathListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/DeathListener.java rename to src/main/java/us/hcrealms/hcf/listener/DeathListener.java diff --git a/src/us/hcrealms/hcf/listener/DeathMessageListener.java b/src/main/java/us/hcrealms/hcf/listener/DeathMessageListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/DeathMessageListener.java rename to src/main/java/us/hcrealms/hcf/listener/DeathMessageListener.java diff --git a/src/us/hcrealms/hcf/listener/ElevatorListener.java b/src/main/java/us/hcrealms/hcf/listener/ElevatorListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/ElevatorListener.java rename to src/main/java/us/hcrealms/hcf/listener/ElevatorListener.java diff --git a/src/us/hcrealms/hcf/listener/EnderPearlFix.java b/src/main/java/us/hcrealms/hcf/listener/EnderPearlFix.java similarity index 100% rename from src/us/hcrealms/hcf/listener/EnderPearlFix.java rename to src/main/java/us/hcrealms/hcf/listener/EnderPearlFix.java diff --git a/src/us/hcrealms/hcf/listener/EntityLimitListener.java b/src/main/java/us/hcrealms/hcf/listener/EntityLimitListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/EntityLimitListener.java rename to src/main/java/us/hcrealms/hcf/listener/EntityLimitListener.java diff --git a/src/us/hcrealms/hcf/listener/ExpMultiplierListener.java b/src/main/java/us/hcrealms/hcf/listener/ExpMultiplierListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/ExpMultiplierListener.java rename to src/main/java/us/hcrealms/hcf/listener/ExpMultiplierListener.java diff --git a/src/us/hcrealms/hcf/listener/FactionListener.java b/src/main/java/us/hcrealms/hcf/listener/FactionListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FactionListener.java rename to src/main/java/us/hcrealms/hcf/listener/FactionListener.java diff --git a/src/us/hcrealms/hcf/listener/FactionsCoreListener.java b/src/main/java/us/hcrealms/hcf/listener/FactionsCoreListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FactionsCoreListener.java rename to src/main/java/us/hcrealms/hcf/listener/FactionsCoreListener.java diff --git a/src/us/hcrealms/hcf/listener/FastBrewingListener.java b/src/main/java/us/hcrealms/hcf/listener/FastBrewingListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FastBrewingListener.java rename to src/main/java/us/hcrealms/hcf/listener/FastBrewingListener.java diff --git a/src/us/hcrealms/hcf/listener/FastPotListener.java b/src/main/java/us/hcrealms/hcf/listener/FastPotListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FastPotListener.java rename to src/main/java/us/hcrealms/hcf/listener/FastPotListener.java diff --git a/src/us/hcrealms/hcf/listener/FastSmeltListener.java b/src/main/java/us/hcrealms/hcf/listener/FastSmeltListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FastSmeltListener.java rename to src/main/java/us/hcrealms/hcf/listener/FastSmeltListener.java diff --git a/src/us/hcrealms/hcf/listener/FoundDiamondsListener.java b/src/main/java/us/hcrealms/hcf/listener/FoundDiamondsListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FoundDiamondsListener.java rename to src/main/java/us/hcrealms/hcf/listener/FoundDiamondsListener.java diff --git a/src/us/hcrealms/hcf/listener/FurnaceSmeltSpeederListener.java b/src/main/java/us/hcrealms/hcf/listener/FurnaceSmeltSpeederListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/FurnaceSmeltSpeederListener.java rename to src/main/java/us/hcrealms/hcf/listener/FurnaceSmeltSpeederListener.java diff --git a/src/us/hcrealms/hcf/listener/GodListener.java b/src/main/java/us/hcrealms/hcf/listener/GodListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/GodListener.java rename to src/main/java/us/hcrealms/hcf/listener/GodListener.java diff --git a/src/us/hcrealms/hcf/listener/ItemStatTrackingListener.java b/src/main/java/us/hcrealms/hcf/listener/ItemStatTrackingListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/ItemStatTrackingListener.java rename to src/main/java/us/hcrealms/hcf/listener/ItemStatTrackingListener.java diff --git a/src/us/hcrealms/hcf/listener/KitMapListener.java b/src/main/java/us/hcrealms/hcf/listener/KitMapListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/KitMapListener.java rename to src/main/java/us/hcrealms/hcf/listener/KitMapListener.java diff --git a/src/us/hcrealms/hcf/listener/LoginEvent.java b/src/main/java/us/hcrealms/hcf/listener/LoginEvent.java similarity index 100% rename from src/us/hcrealms/hcf/listener/LoginEvent.java rename to src/main/java/us/hcrealms/hcf/listener/LoginEvent.java diff --git a/src/us/hcrealms/hcf/listener/OreCountListener.java b/src/main/java/us/hcrealms/hcf/listener/OreCountListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/OreCountListener.java rename to src/main/java/us/hcrealms/hcf/listener/OreCountListener.java diff --git a/src/us/hcrealms/hcf/listener/PearlGlitchListener.java b/src/main/java/us/hcrealms/hcf/listener/PearlGlitchListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/PearlGlitchListener.java rename to src/main/java/us/hcrealms/hcf/listener/PearlGlitchListener.java diff --git a/src/us/hcrealms/hcf/listener/PlayTimeManager.java b/src/main/java/us/hcrealms/hcf/listener/PlayTimeManager.java similarity index 100% rename from src/us/hcrealms/hcf/listener/PlayTimeManager.java rename to src/main/java/us/hcrealms/hcf/listener/PlayTimeManager.java diff --git a/src/us/hcrealms/hcf/listener/PotionLimitListener.java b/src/main/java/us/hcrealms/hcf/listener/PotionLimitListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/PotionLimitListener.java rename to src/main/java/us/hcrealms/hcf/listener/PotionLimitListener.java diff --git a/src/us/hcrealms/hcf/listener/PotionListener.java b/src/main/java/us/hcrealms/hcf/listener/PotionListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/PotionListener.java rename to src/main/java/us/hcrealms/hcf/listener/PotionListener.java diff --git a/src/us/hcrealms/hcf/listener/SEMListener.java b/src/main/java/us/hcrealms/hcf/listener/SEMListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/SEMListener.java rename to src/main/java/us/hcrealms/hcf/listener/SEMListener.java diff --git a/src/us/hcrealms/hcf/listener/SignSubclaimListener.java b/src/main/java/us/hcrealms/hcf/listener/SignSubclaimListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/SignSubclaimListener.java rename to src/main/java/us/hcrealms/hcf/listener/SignSubclaimListener.java diff --git a/src/us/hcrealms/hcf/listener/SkullListener.java b/src/main/java/us/hcrealms/hcf/listener/SkullListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/SkullListener.java rename to src/main/java/us/hcrealms/hcf/listener/SkullListener.java diff --git a/src/us/hcrealms/hcf/listener/StaffChatListener.java b/src/main/java/us/hcrealms/hcf/listener/StaffChatListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/StaffChatListener.java rename to src/main/java/us/hcrealms/hcf/listener/StaffChatListener.java diff --git a/src/us/hcrealms/hcf/listener/StaffModeListener.java b/src/main/java/us/hcrealms/hcf/listener/StaffModeListener.java similarity index 69% rename from src/us/hcrealms/hcf/listener/StaffModeListener.java rename to src/main/java/us/hcrealms/hcf/listener/StaffModeListener.java index 440fd9b..95f75f2 100644 --- a/src/us/hcrealms/hcf/listener/StaffModeListener.java +++ b/src/main/java/us/hcrealms/hcf/listener/StaffModeListener.java @@ -48,17 +48,17 @@ public class StaffModeListener implements Listener { private final Map fakeChestLocationMap = new HashMap(); - - - public static void handleFakeChest(Player player, Chest chest, boolean open) - { - Inventory chestInventory = chest.getInventory(); - if ((chestInventory instanceof DoubleChestInventory)) { - chest = (Chest)((DoubleChestInventory)chestInventory).getHolder().getLeftSide(); - } - ((CraftPlayer)player).getHandle().playerConnection.sendPacket(new PacketPlayOutBlockAction(chest.getX(), chest.getY(), chest.getZ(), Blocks.CHEST, 1, open ? 1 : 0)); - player.playSound(chest.getLocation(), open ? Sound.CHEST_OPEN : Sound.CHEST_CLOSE, 1.0F, 1.0F); - } + + + public static void handleFakeChest(Player player, Chest chest, boolean open) + { + Inventory chestInventory = chest.getInventory(); + if ((chestInventory instanceof DoubleChestInventory)) { + chest = (Chest)((DoubleChestInventory)chestInventory).getHolder().getLeftSide(); + } + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(new PacketPlayOutBlockAction(chest.getX(), chest.getY(), chest.getZ(), Blocks.CHEST, 1, open ? 1 : 0)); + player.playSound(chest.getLocation(), open ? Sound.CHEST_OPEN : Sound.CHEST_CLOSE, 1.0F, 1.0F); + } @EventHandler public void onQuit(PlayerQuitEvent event) { if (StaffModeCommand.modMode.contains(event.getPlayer())) { @@ -77,8 +77,8 @@ public class StaffModeListener implements Listener { } } } - - + + @EventHandler public void oJoin(PlayerJoinEvent event) { if (event.getPlayer().hasPermission("core.mod")) { @@ -186,26 +186,26 @@ public class StaffModeListener implements Listener { || (e.getAction() == Action.LEFT_CLICK_BLOCK)) { return; } - if ((StaffModeCommand.modMode.contains(p)) && (p.getItemInHand().getItemMeta().getDisplayName().equalsIgnoreCase("§eVanish: §aOn")) && (e.getAction().toString().contains("RIGHT"))) { + if ((StaffModeCommand.modMode.contains(p)) && (p.getItemInHand().getItemMeta().getDisplayName().equalsIgnoreCase("§eVanish: §aOn")) && (e.getAction().toString().contains("RIGHT"))) { VanishListener.getInstance().setVanish(p, false); p.sendMessage(ChatColor.YELLOW.toString() + "You have toggled your vanish " + ChatColor.RED + "off" + ChatColor.YELLOW + "."); ItemStack carpet = new ItemStack(351, 1, (short) 8); ItemMeta carpetMeta = carpet.getItemMeta(); - carpetMeta.setDisplayName("§eVanish: §cOff"); + carpetMeta.setDisplayName("§eVanish: §cOff"); carpet.setItemMeta(carpetMeta); p.getInventory().setItemInHand(carpet); } else if ((StaffModeCommand.modMode.contains(p)) - && (p.getItemInHand().getItemMeta().getDisplayName().equalsIgnoreCase("§eVanish: §cOff")) + && (p.getItemInHand().getItemMeta().getDisplayName().equalsIgnoreCase("§eVanish: §cOff")) && (e.getAction().toString().contains("RIGHT"))) { VanishListener.getInstance().setVanish(p, true); p.sendMessage(ChatColor.YELLOW.toString() + "You have toggled your vanish " + ChatColor.GREEN + "on" + ChatColor.YELLOW + "."); ItemStack carpet = new ItemStack(351, 1, (short) 10); ItemMeta carpetMeta = carpet.getItemMeta(); - carpetMeta.setDisplayName("§eVanish: §aOn"); + carpetMeta.setDisplayName("§eVanish: §aOn"); carpet.setItemMeta(carpetMeta); p.getInventory().setItemInHand(carpet); @@ -218,7 +218,7 @@ public class StaffModeListener implements Listener { if (e.getInventory().getTitle().startsWith(ChatColor.translateAlternateColorCodes('&', "&eInspecting: "))) { e.setCancelled(true); } - + } @EventHandler public void rightClick2(PlayerInteractEntityEvent e) { @@ -247,63 +247,63 @@ public class StaffModeListener implements Listener { } } - @SuppressWarnings("incomplete-switch") + @SuppressWarnings("incomplete-switch") @EventHandler(ignoreCancelled=true, priority=EventPriority.NORMAL) - public void onPlayerInteract(PlayerInteractEvent event) - { - Player player = event.getPlayer(); - UUID uuid = player.getUniqueId(); - switch (event.getAction()) - { - case LEFT_CLICK_BLOCK: - if ((StaffModeCommand.modMode.contains(player))) { - event.setCancelled(true); - } - break; - case RIGHT_CLICK_BLOCK: - Block block = event.getClickedBlock(); - BlockState state = block.getState(); - if (((state instanceof Chest)) && ((StaffModeCommand.modMode.contains(player)))) - { - Chest chest = (Chest)state; - Location chestLocation = chest.getLocation(); - InventoryType type = chest.getInventory().getType(); - if ((type == InventoryType.CHEST) && (this.fakeChestLocationMap.putIfAbsent(uuid, chestLocation) == null)) - { - ItemStack[] contents = chest.getInventory().getContents(); - Inventory fakeInventory = Bukkit.createInventory(null, contents.length, ChatColor.YELLOW + "[Silent] " + type.getDefaultTitle()); - fakeInventory.setContents(contents); - event.setCancelled(true); - player.openInventory(fakeInventory); - handleFakeChest(player, chest, true); - this.fakeChestLocationMap.put(uuid, chestLocation); - } - } - break; - } - } - - @EventHandler(ignoreCancelled=true, priority=EventPriority.NORMAL) - public void onInventoryClose(InventoryCloseEvent event) - { - Player player = (Player)event.getPlayer(); - Location chestLocation = (Location)this.fakeChestLocationMap.remove(player.getUniqueId()); - BlockState blockState; - if ((chestLocation != null) && (((blockState = chestLocation.getBlock().getState()) instanceof Chest))) { - handleFakeChest(player, (Chest)blockState, false); - } - } - - @EventHandler(ignoreCancelled=true, priority=EventPriority.NORMAL) - public void onInventoryClick(InventoryClickEvent event) - { - HumanEntity humanEntity = event.getWhoClicked(); - Player player; - ItemStack stack; - if (((humanEntity instanceof Player)) && (this.fakeChestLocationMap.containsKey((player = (Player)humanEntity).getUniqueId())) && ((stack = event.getCurrentItem()) != null) && (stack.getType() != Material.AIR) && (!player.hasPermission("vanish.chestinteract"))) - { - event.setCancelled(true); - player.sendMessage(ChatColor.RED + "You cannot interact with this."); - } - } - } \ No newline at end of file + public void onPlayerInteract(PlayerInteractEvent event) + { + Player player = event.getPlayer(); + UUID uuid = player.getUniqueId(); + switch (event.getAction()) + { + case LEFT_CLICK_BLOCK: + if ((StaffModeCommand.modMode.contains(player))) { + event.setCancelled(true); + } + break; + case RIGHT_CLICK_BLOCK: + Block block = event.getClickedBlock(); + BlockState state = block.getState(); + if (((state instanceof Chest)) && ((StaffModeCommand.modMode.contains(player)))) + { + Chest chest = (Chest)state; + Location chestLocation = chest.getLocation(); + InventoryType type = chest.getInventory().getType(); + if ((type == InventoryType.CHEST) && (this.fakeChestLocationMap.putIfAbsent(uuid, chestLocation) == null)) + { + ItemStack[] contents = chest.getInventory().getContents(); + Inventory fakeInventory = Bukkit.createInventory(null, contents.length, ChatColor.YELLOW + "[Silent] " + type.getDefaultTitle()); + fakeInventory.setContents(contents); + event.setCancelled(true); + player.openInventory(fakeInventory); + handleFakeChest(player, chest, true); + this.fakeChestLocationMap.put(uuid, chestLocation); + } + } + break; + } + } + + @EventHandler(ignoreCancelled=true, priority=EventPriority.NORMAL) + public void onInventoryClose(InventoryCloseEvent event) + { + Player player = (Player)event.getPlayer(); + Location chestLocation = (Location)this.fakeChestLocationMap.remove(player.getUniqueId()); + BlockState blockState; + if ((chestLocation != null) && (((blockState = chestLocation.getBlock().getState()) instanceof Chest))) { + handleFakeChest(player, (Chest)blockState, false); + } + } + + @EventHandler(ignoreCancelled=true, priority=EventPriority.NORMAL) + public void onInventoryClick(InventoryClickEvent event) + { + HumanEntity humanEntity = event.getWhoClicked(); + Player player; + ItemStack stack; + if (((humanEntity instanceof Player)) && (this.fakeChestLocationMap.containsKey((player = (Player)humanEntity).getUniqueId())) && ((stack = event.getCurrentItem()) != null) && (stack.getType() != Material.AIR) && (!player.hasPermission("vanish.chestinteract"))) + { + event.setCancelled(true); + player.sendMessage(ChatColor.RED + "You cannot interact with this."); + } + } +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/listener/UnRepairableListener.java b/src/main/java/us/hcrealms/hcf/listener/UnRepairableListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/UnRepairableListener.java rename to src/main/java/us/hcrealms/hcf/listener/UnRepairableListener.java diff --git a/src/us/hcrealms/hcf/listener/VanishListener.java b/src/main/java/us/hcrealms/hcf/listener/VanishListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/VanishListener.java rename to src/main/java/us/hcrealms/hcf/listener/VanishListener.java diff --git a/src/us/hcrealms/hcf/listener/WorldListener.java b/src/main/java/us/hcrealms/hcf/listener/WorldListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/WorldListener.java rename to src/main/java/us/hcrealms/hcf/listener/WorldListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/ArmorFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/ArmorFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/ArmorFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/ArmorFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BeaconStrengthFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BeaconStrengthFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BeaconStrengthFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BeaconStrengthFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BlockClipListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BlockClipListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BlockClipListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BlockClipListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BlockHitFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BlockHitFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BlockHitFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BlockHitFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BlockJumpGlitchFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BlockJumpGlitchFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BlockJumpGlitchFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BlockJumpGlitchFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BoatGlitchFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BoatGlitchFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BoatGlitchFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BoatGlitchFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/BookQuillFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/BookQuillFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/BookQuillFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/BookQuillFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/CommandBlocker.java b/src/main/java/us/hcrealms/hcf/listener/fixes/CommandBlocker.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/CommandBlocker.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/CommandBlocker.java diff --git a/src/us/hcrealms/hcf/listener/fixes/DupeGlitchFix.java b/src/main/java/us/hcrealms/hcf/listener/fixes/DupeGlitchFix.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/DupeGlitchFix.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/DupeGlitchFix.java diff --git a/src/us/hcrealms/hcf/listener/fixes/EnchantLimitListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/EnchantLimitListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/EnchantLimitListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/EnchantLimitListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/EnderChestRemovalListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/EnderChestRemovalListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/EnderChestRemovalListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/EnderChestRemovalListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/HungerFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/HungerFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/HungerFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/HungerFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/InfinityArrowFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/InfinityArrowFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/InfinityArrowFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/InfinityArrowFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/MaterialUtils.java b/src/main/java/us/hcrealms/hcf/listener/fixes/MaterialUtils.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/MaterialUtils.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/MaterialUtils.java diff --git a/src/us/hcrealms/hcf/listener/fixes/NaturalMobSpawnFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/NaturalMobSpawnFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/NaturalMobSpawnFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/NaturalMobSpawnFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/PearlGlitchListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/PearlGlitchListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/PearlGlitchListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/PearlGlitchListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/PexCrashFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/PexCrashFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/PexCrashFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/PexCrashFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/PortalListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/PortalListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/PortalListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/PortalListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/PotionLimitData.java b/src/main/java/us/hcrealms/hcf/listener/fixes/PotionLimitData.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/PotionLimitData.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/PotionLimitData.java diff --git a/src/us/hcrealms/hcf/listener/fixes/StrengthFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/StrengthFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/StrengthFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/StrengthFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/StrengthListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/StrengthListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/StrengthListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/StrengthListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/SyntaxBlocker.java b/src/main/java/us/hcrealms/hcf/listener/fixes/SyntaxBlocker.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/SyntaxBlocker.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/SyntaxBlocker.java diff --git a/src/us/hcrealms/hcf/listener/fixes/VoidGlitchFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/VoidGlitchFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/VoidGlitchFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/VoidGlitchFixListener.java diff --git a/src/us/hcrealms/hcf/listener/fixes/WeatherFixListener.java b/src/main/java/us/hcrealms/hcf/listener/fixes/WeatherFixListener.java similarity index 100% rename from src/us/hcrealms/hcf/listener/fixes/WeatherFixListener.java rename to src/main/java/us/hcrealms/hcf/listener/fixes/WeatherFixListener.java diff --git a/src/us/hcrealms/hcf/reboot/RebootCommand.java b/src/main/java/us/hcrealms/hcf/reboot/RebootCommand.java similarity index 91% rename from src/us/hcrealms/hcf/reboot/RebootCommand.java rename to src/main/java/us/hcrealms/hcf/reboot/RebootCommand.java index 764b947..cf1252f 100644 --- a/src/us/hcrealms/hcf/reboot/RebootCommand.java +++ b/src/main/java/us/hcrealms/hcf/reboot/RebootCommand.java @@ -35,13 +35,13 @@ public class RebootCommand implements CommandExecutor, TabCompleter { if (args.length == 0 || args.length > 2) { sender.sendMessage( - "§9§m--------------------------------"); + "§9§m--------------------------------"); sender.sendMessage( - "§c/reboot start - Starts the reboot timer."); + "§c/reboot start - Starts the reboot timer."); sender.sendMessage( - "§c/reboot end - Ends the current reboot timer."); + "§c/reboot end - Ends the current reboot timer."); sender.sendMessage( - "§9§m--------------------------------"); + "§9§m--------------------------------"); return true; } diff --git a/src/us/hcrealms/hcf/reboot/RebootListener.java b/src/main/java/us/hcrealms/hcf/reboot/RebootListener.java similarity index 100% rename from src/us/hcrealms/hcf/reboot/RebootListener.java rename to src/main/java/us/hcrealms/hcf/reboot/RebootListener.java diff --git a/src/us/hcrealms/hcf/reboot/RebootTimer.java b/src/main/java/us/hcrealms/hcf/reboot/RebootTimer.java similarity index 100% rename from src/us/hcrealms/hcf/reboot/RebootTimer.java rename to src/main/java/us/hcrealms/hcf/reboot/RebootTimer.java diff --git a/src/us/hcrealms/hcf/sale/SaleCommand.java b/src/main/java/us/hcrealms/hcf/sale/SaleCommand.java similarity index 89% rename from src/us/hcrealms/hcf/sale/SaleCommand.java rename to src/main/java/us/hcrealms/hcf/sale/SaleCommand.java index 847583a..d987b82 100644 --- a/src/us/hcrealms/hcf/sale/SaleCommand.java +++ b/src/main/java/us/hcrealms/hcf/sale/SaleCommand.java @@ -35,14 +35,14 @@ public class SaleCommand implements CommandExecutor, TabCompleter { } if (args.length == 0 || args.length > 2) { - sender.sendMessage( - "§9§m--------------------------------"); - sender.sendMessage( - "§c/sale start - Starts the sale timer."); - sender.sendMessage( - "§c/sale end - Ends the current sale timer."); - sender.sendMessage( - "§9§m--------------------------------"); + sender.sendMessage( + "§9§m--------------------------------"); + sender.sendMessage( + "§c/sale start - Starts the sale timer."); + sender.sendMessage( + "§c/sale end - Ends the current sale timer."); + sender.sendMessage( + "§9§m--------------------------------"); return true; } @@ -100,4 +100,4 @@ public class SaleCommand implements CommandExecutor, TabCompleter { public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { return Collections.emptyList(); } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/sale/SaleListener.java b/src/main/java/us/hcrealms/hcf/sale/SaleListener.java similarity index 100% rename from src/us/hcrealms/hcf/sale/SaleListener.java rename to src/main/java/us/hcrealms/hcf/sale/SaleListener.java diff --git a/src/us/hcrealms/hcf/sale/SaleTimer.java b/src/main/java/us/hcrealms/hcf/sale/SaleTimer.java similarity index 100% rename from src/us/hcrealms/hcf/sale/SaleTimer.java rename to src/main/java/us/hcrealms/hcf/sale/SaleTimer.java diff --git a/src/us/hcrealms/hcf/scoreboard/BufferedObjective.java b/src/main/java/us/hcrealms/hcf/scoreboard/BufferedObjective.java similarity index 100% rename from src/us/hcrealms/hcf/scoreboard/BufferedObjective.java rename to src/main/java/us/hcrealms/hcf/scoreboard/BufferedObjective.java diff --git a/src/us/hcrealms/hcf/scoreboard/PlayerBoard.java b/src/main/java/us/hcrealms/hcf/scoreboard/PlayerBoard.java similarity index 100% rename from src/us/hcrealms/hcf/scoreboard/PlayerBoard.java rename to src/main/java/us/hcrealms/hcf/scoreboard/PlayerBoard.java diff --git a/src/us/hcrealms/hcf/scoreboard/ScoreboardHandler.java b/src/main/java/us/hcrealms/hcf/scoreboard/ScoreboardHandler.java similarity index 100% rename from src/us/hcrealms/hcf/scoreboard/ScoreboardHandler.java rename to src/main/java/us/hcrealms/hcf/scoreboard/ScoreboardHandler.java diff --git a/src/us/hcrealms/hcf/scoreboard/SidebarEntry.java b/src/main/java/us/hcrealms/hcf/scoreboard/SidebarEntry.java similarity index 100% rename from src/us/hcrealms/hcf/scoreboard/SidebarEntry.java rename to src/main/java/us/hcrealms/hcf/scoreboard/SidebarEntry.java diff --git a/src/us/hcrealms/hcf/scoreboard/SidebarProvider.java b/src/main/java/us/hcrealms/hcf/scoreboard/SidebarProvider.java similarity index 100% rename from src/us/hcrealms/hcf/scoreboard/SidebarProvider.java rename to src/main/java/us/hcrealms/hcf/scoreboard/SidebarProvider.java diff --git a/src/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java b/src/main/java/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java similarity index 97% rename from src/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java rename to src/main/java/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java index 6ba0761..0a5245f 100644 --- a/src/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java +++ b/src/main/java/us/hcrealms/hcf/scoreboard/provider/TimerSidebarProvider.java @@ -89,9 +89,9 @@ public class TimerSidebarProvider implements SidebarProvider { if ((StaffModeCommand.getInstance().isMod(player))) { lines.add(new SidebarEntry(ChatColor.GOLD + ChatColor.BOLD.toString() + "Staff Mode:")); - lines.add(new SidebarEntry(ChatColor.GOLD + " » ", ChatColor.YELLOW + "Vanish" + ChatColor.GRAY + ": ", + lines.add(new SidebarEntry(ChatColor.GOLD + " » ", ChatColor.YELLOW + "Vanish" + ChatColor.GRAY + ": ", VanishListener.getInstance().isVanished(player) ? ChatColor.GREEN + "On" : ChatColor.RED + "Off")); - } + } if ((ConfigurationService.KIT_MAP) == true) { lines.add(new SidebarEntry("", @@ -106,7 +106,7 @@ public class TimerSidebarProvider implements SidebarProvider { BardClass bardClass = (BardClass) pvpClass; lines.add(new SidebarEntry(ChatColor.AQUA + ChatColor.BOLD.toString() + "Bard ", ChatColor.AQUA + ChatColor.BOLD.toString() + "Energy", ChatColor.GRAY + ": " + ChatColor.RED - + handleBardFormat(bardClass.getEnergyMillis(player), true))); + + handleBardFormat(bardClass.getEnergyMillis(player), true))); long remaining2 = bardClass.getRemainingBuffDelay(player); if (remaining2 > 0L) { lines.add(new SidebarEntry(ChatColor.GREEN + ChatColor.BOLD.toString() + "Bard ", @@ -125,17 +125,14 @@ public class TimerSidebarProvider implements SidebarProvider { lines.add(new SidebarEntry(ChatColor.GREEN.toString(), "Active Class", ChatColor.GRAY + ": " + ChatColor.RED + "Miner")); } - if ((pvpClass instanceof ArcherClass)) { lines.add(new SidebarEntry(ChatColor.GREEN.toString(), "Active Class", ChatColor.GRAY + ": " + ChatColor.RED + "Archer")); } - if ((pvpClass instanceof BardClass)) { lines.add(new SidebarEntry(ChatColor.GREEN.toString(), "Active Class", ChatColor.GRAY + ": " + ChatColor.RED + "Bard")); } - if ((pvpClass instanceof RogueClass)) { lines.add(new SidebarEntry(ChatColor.GREEN.toString(), "Active Class", ChatColor.GRAY + ": " + ChatColor.RED + "Rogue")); @@ -203,7 +200,7 @@ public class TimerSidebarProvider implements SidebarProvider { if ((conquestLines != null) && (!conquestLines.isEmpty())) { if (player.hasPermission("command.mod")) { - conquestLines.add(new SidebarEntry("§7§m------", "------", "--------")); + conquestLines.add(new SidebarEntry("§7§m------", "------", "--------")); } conquestLines.addAll(lines); lines = conquestLines; @@ -221,4 +218,4 @@ public class TimerSidebarProvider implements SidebarProvider { return new DecimalFormat("00.0"); } }; -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/serializable/SerializableLocation.java b/src/main/java/us/hcrealms/hcf/serializable/SerializableLocation.java similarity index 100% rename from src/us/hcrealms/hcf/serializable/SerializableLocation.java rename to src/main/java/us/hcrealms/hcf/serializable/SerializableLocation.java diff --git a/src/us/hcrealms/hcf/signs/EventSignListener.java b/src/main/java/us/hcrealms/hcf/signs/EventSignListener.java similarity index 100% rename from src/us/hcrealms/hcf/signs/EventSignListener.java rename to src/main/java/us/hcrealms/hcf/signs/EventSignListener.java diff --git a/src/us/hcrealms/hcf/signs/Kit.java b/src/main/java/us/hcrealms/hcf/signs/Kit.java similarity index 100% rename from src/us/hcrealms/hcf/signs/Kit.java rename to src/main/java/us/hcrealms/hcf/signs/Kit.java diff --git a/src/us/hcrealms/hcf/signs/KitSignListener.java b/src/main/java/us/hcrealms/hcf/signs/KitSignListener.java similarity index 100% rename from src/us/hcrealms/hcf/signs/KitSignListener.java rename to src/main/java/us/hcrealms/hcf/signs/KitSignListener.java diff --git a/src/us/hcrealms/hcf/sotw/SotwCommand.java b/src/main/java/us/hcrealms/hcf/sotw/SotwCommand.java similarity index 100% rename from src/us/hcrealms/hcf/sotw/SotwCommand.java rename to src/main/java/us/hcrealms/hcf/sotw/SotwCommand.java diff --git a/src/us/hcrealms/hcf/sotw/SotwListener.java b/src/main/java/us/hcrealms/hcf/sotw/SotwListener.java similarity index 100% rename from src/us/hcrealms/hcf/sotw/SotwListener.java rename to src/main/java/us/hcrealms/hcf/sotw/SotwListener.java diff --git a/src/us/hcrealms/hcf/sotw/SotwTimer.java b/src/main/java/us/hcrealms/hcf/sotw/SotwTimer.java similarity index 100% rename from src/us/hcrealms/hcf/sotw/SotwTimer.java rename to src/main/java/us/hcrealms/hcf/sotw/SotwTimer.java diff --git a/src/us/hcrealms/hcf/staffmode/StaffInventory.java b/src/main/java/us/hcrealms/hcf/staffmode/StaffInventory.java similarity index 100% rename from src/us/hcrealms/hcf/staffmode/StaffInventory.java rename to src/main/java/us/hcrealms/hcf/staffmode/StaffInventory.java diff --git a/src/us/hcrealms/hcf/staffmode/StaffItems.java b/src/main/java/us/hcrealms/hcf/staffmode/StaffItems.java similarity index 88% rename from src/us/hcrealms/hcf/staffmode/StaffItems.java rename to src/main/java/us/hcrealms/hcf/staffmode/StaffItems.java index a26a6c8..c8a3100 100644 --- a/src/us/hcrealms/hcf/staffmode/StaffItems.java +++ b/src/main/java/us/hcrealms/hcf/staffmode/StaffItems.java @@ -28,11 +28,11 @@ public class StaffItems { ItemMeta vanishMeta = vanish.getItemMeta(); ItemMeta carpetMeta = carpet.getItemMeta(); - compassMeta.setDisplayName("§eTeleporter"); - bookMeta.setDisplayName("§eInventory"); - eggMeta.setDisplayName("§eRandom TP"); - vanishMeta.setDisplayName("§eVanish: §aOn"); - carpetMeta.setDisplayName("§eBetter Looking"); + compassMeta.setDisplayName("§eTeleporter"); + bookMeta.setDisplayName("§eInventory"); + eggMeta.setDisplayName("§eRandom TP"); + vanishMeta.setDisplayName("§eVanish: §aOn"); + carpetMeta.setDisplayName("§eBetter Looking"); compass.setItemMeta(compassMeta); book.setItemMeta(bookMeta); @@ -62,4 +62,4 @@ public class StaffItems { StaffModeCommand.armorContents.remove(p.getName()); } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/staffmode/StaffPriority.java b/src/main/java/us/hcrealms/hcf/staffmode/StaffPriority.java similarity index 100% rename from src/us/hcrealms/hcf/staffmode/StaffPriority.java rename to src/main/java/us/hcrealms/hcf/staffmode/StaffPriority.java diff --git a/src/us/hcrealms/hcf/stattracker/OreTrackerListener.java b/src/main/java/us/hcrealms/hcf/stattracker/OreTrackerListener.java similarity index 100% rename from src/us/hcrealms/hcf/stattracker/OreTrackerListener.java rename to src/main/java/us/hcrealms/hcf/stattracker/OreTrackerListener.java diff --git a/src/us/hcrealms/hcf/stattracker/StatTrackListener.java b/src/main/java/us/hcrealms/hcf/stattracker/StatTrackListener.java similarity index 100% rename from src/us/hcrealms/hcf/stattracker/StatTrackListener.java rename to src/main/java/us/hcrealms/hcf/stattracker/StatTrackListener.java diff --git a/src/us/hcrealms/hcf/stattracker/StatTrackUtils.java b/src/main/java/us/hcrealms/hcf/stattracker/StatTrackUtils.java similarity index 100% rename from src/us/hcrealms/hcf/stattracker/StatTrackUtils.java rename to src/main/java/us/hcrealms/hcf/stattracker/StatTrackUtils.java diff --git a/src/us/hcrealms/hcf/timer/GlobalTimer.java b/src/main/java/us/hcrealms/hcf/timer/GlobalTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/GlobalTimer.java rename to src/main/java/us/hcrealms/hcf/timer/GlobalTimer.java diff --git a/src/us/hcrealms/hcf/timer/PlayerTimer.java b/src/main/java/us/hcrealms/hcf/timer/PlayerTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/PlayerTimer.java rename to src/main/java/us/hcrealms/hcf/timer/PlayerTimer.java diff --git a/src/us/hcrealms/hcf/timer/Timer.java b/src/main/java/us/hcrealms/hcf/timer/Timer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/Timer.java rename to src/main/java/us/hcrealms/hcf/timer/Timer.java diff --git a/src/us/hcrealms/hcf/timer/TimerCooldown.java b/src/main/java/us/hcrealms/hcf/timer/TimerCooldown.java similarity index 100% rename from src/us/hcrealms/hcf/timer/TimerCooldown.java rename to src/main/java/us/hcrealms/hcf/timer/TimerCooldown.java diff --git a/src/main/java/us/hcrealms/hcf/timer/TimerExecutor.java b/src/main/java/us/hcrealms/hcf/timer/TimerExecutor.java new file mode 100644 index 0000000..f8119ff --- /dev/null +++ b/src/main/java/us/hcrealms/hcf/timer/TimerExecutor.java @@ -0,0 +1,50 @@ +package us.hcrealms.hcf.timer; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; + +import us.hcrealms.hcf.Base; +import us.hcrealms.hcf.timer.argument.TimerCheckArgument; +import us.hcrealms.hcf.timer.argument.TimerSetArgument; +import us.hcrealms.hcf.util.BukkitUtils; +import us.hcrealms.hcf.util.command.ArgumentExecutor; +import us.hcrealms.hcf.util.command.CommandArgument; + +/** + * Handles the execution and tab completion of the timer command. + */ +public class TimerExecutor extends ArgumentExecutor { + + public TimerExecutor(Base plugin) { + super("timer"); + + addArgument(new TimerCheckArgument(plugin)); + addArgument(new TimerSetArgument(plugin)); + } + + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) + { + if (args.length < 1) + { + if (sender.hasPermission("timer.admin")) + { + sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); + sender.sendMessage(ChatColor.GOLD + "Timer Help"); + sender.sendMessage(ChatColor.YELLOW + " /timer set" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Set remaining timer time."); + sender.sendMessage(ChatColor.YELLOW + " /timer check" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Check remaining timer time."); + sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); + } + return true; + } + CommandArgument argument2 = getArgument(args[0]); + String permission2 = argument2 == null ? null : argument2.getPermission(); + if ((argument2 == null) || ((permission2 != null) && (!sender.hasPermission(permission2)))) + { + sender.sendMessage(ChatColor.RED + "Command not found"); + return true; + } + argument2.onCommand(sender, command, label, args); + return true; + } +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/timer/TimerManager.java b/src/main/java/us/hcrealms/hcf/timer/TimerManager.java similarity index 100% rename from src/us/hcrealms/hcf/timer/TimerManager.java rename to src/main/java/us/hcrealms/hcf/timer/TimerManager.java diff --git a/src/us/hcrealms/hcf/timer/argument/TimerCheckArgument.java b/src/main/java/us/hcrealms/hcf/timer/argument/TimerCheckArgument.java similarity index 100% rename from src/us/hcrealms/hcf/timer/argument/TimerCheckArgument.java rename to src/main/java/us/hcrealms/hcf/timer/argument/TimerCheckArgument.java diff --git a/src/us/hcrealms/hcf/timer/argument/TimerSetArgument.java b/src/main/java/us/hcrealms/hcf/timer/argument/TimerSetArgument.java similarity index 100% rename from src/us/hcrealms/hcf/timer/argument/TimerSetArgument.java rename to src/main/java/us/hcrealms/hcf/timer/argument/TimerSetArgument.java diff --git a/src/us/hcrealms/hcf/timer/event/TimerClearEvent.java b/src/main/java/us/hcrealms/hcf/timer/event/TimerClearEvent.java similarity index 100% rename from src/us/hcrealms/hcf/timer/event/TimerClearEvent.java rename to src/main/java/us/hcrealms/hcf/timer/event/TimerClearEvent.java diff --git a/src/us/hcrealms/hcf/timer/event/TimerExpireEvent.java b/src/main/java/us/hcrealms/hcf/timer/event/TimerExpireEvent.java similarity index 100% rename from src/us/hcrealms/hcf/timer/event/TimerExpireEvent.java rename to src/main/java/us/hcrealms/hcf/timer/event/TimerExpireEvent.java diff --git a/src/us/hcrealms/hcf/timer/event/TimerExtendEvent.java b/src/main/java/us/hcrealms/hcf/timer/event/TimerExtendEvent.java similarity index 100% rename from src/us/hcrealms/hcf/timer/event/TimerExtendEvent.java rename to src/main/java/us/hcrealms/hcf/timer/event/TimerExtendEvent.java diff --git a/src/us/hcrealms/hcf/timer/event/TimerPauseEvent.java b/src/main/java/us/hcrealms/hcf/timer/event/TimerPauseEvent.java similarity index 100% rename from src/us/hcrealms/hcf/timer/event/TimerPauseEvent.java rename to src/main/java/us/hcrealms/hcf/timer/event/TimerPauseEvent.java diff --git a/src/us/hcrealms/hcf/timer/event/TimerStartEvent.java b/src/main/java/us/hcrealms/hcf/timer/event/TimerStartEvent.java similarity index 100% rename from src/us/hcrealms/hcf/timer/event/TimerStartEvent.java rename to src/main/java/us/hcrealms/hcf/timer/event/TimerStartEvent.java diff --git a/src/us/hcrealms/hcf/timer/type/AppleTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/AppleTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/AppleTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/AppleTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/ArcherTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/ArcherTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/ArcherTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/ArcherTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/EnderPearlTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/EnderPearlTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/EnderPearlTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/EnderPearlTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/GappleTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/GappleTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/GappleTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/GappleTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/HomeTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/HomeTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/HomeTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/HomeTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/LogoutTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/LogoutTimer.java similarity index 95% rename from src/us/hcrealms/hcf/timer/type/LogoutTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/LogoutTimer.java index ae52a3b..f167bbd 100644 --- a/src/us/hcrealms/hcf/timer/type/LogoutTimer.java +++ b/src/main/java/us/hcrealms/hcf/timer/type/LogoutTimer.java @@ -21,19 +21,19 @@ import us.hcrealms.hcf.combatlog.CombatLogListener; import us.hcrealms.hcf.timer.PlayerTimer; public class LogoutTimer - extends PlayerTimer - implements Listener + extends PlayerTimer + implements Listener { public LogoutTimer() { super("Logout", TimeUnit.SECONDS.toMillis(30L), false); } - + public String getScoreboardPrefix() { return ChatColor.DARK_RED.toString() + ChatColor.BOLD; } - + private void checkMovement(Player player, Location from, Location to) { if ((from.getBlockX() == to.getBlockX()) && (from.getBlockZ() == to.getBlockZ())) { @@ -45,19 +45,19 @@ public class LogoutTimer clearCooldown(player); } } - + @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR) public void onPlayerMove(PlayerMoveEvent event) { checkMovement(event.getPlayer(), event.getFrom(), event.getTo()); } - + @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR) public void onPlayerTeleport(PlayerTeleportEvent event) { checkMovement(event.getPlayer(), event.getFrom(), event.getTo()); } - + @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR) public void onPlayerKick(PlayerKickEvent event) { @@ -66,7 +66,7 @@ public class LogoutTimer clearCooldown(uuid); } } - + @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR) public void onPlayerQuit(PlayerQuitEvent event) { @@ -75,7 +75,7 @@ public class LogoutTimer clearCooldown(uuid); } } - + @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR) public void onPlayerDamage(EntityDamageEvent event) { @@ -90,7 +90,7 @@ public class LogoutTimer } } } - + public void onExpire(UUID userUUID) { Player player = Bukkit.getPlayer(userUUID); @@ -99,14 +99,14 @@ public class LogoutTimer } CombatLogListener.safelyDisconnect(player, ChatColor.GREEN + "You have been safely logged out."); } - + public void run(Player player) { long remainingMillis = getRemaining(player); if (remainingMillis > 0L) { - player.sendMessage(ChatColor.YELLOW.toString() + "Logging out in" + ChatColor.GRAY + " » " + ChatColor.RED + Base.getRemaining(remainingMillis, true)); + player.sendMessage(ChatColor.YELLOW.toString() + "Logging out in" + ChatColor.GRAY + " » " + ChatColor.RED + Base.getRemaining(remainingMillis, true)); player.sendMessage(getDisplayName() + ChatColor.YELLOW + " timer is disconnecting you in " + ChatColor.RED + ChatColor.BOLD + Base.getRemaining(remainingMillis, true, false) + ChatColor.BLUE + '.'); } } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/timer/type/PvPTimerProtection.java b/src/main/java/us/hcrealms/hcf/timer/type/PvPTimerProtection.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/PvPTimerProtection.java rename to src/main/java/us/hcrealms/hcf/timer/type/PvPTimerProtection.java diff --git a/src/us/hcrealms/hcf/timer/type/PvpClassWarmupTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/PvpClassWarmupTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/PvpClassWarmupTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/PvpClassWarmupTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/SpawnTagTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/SpawnTagTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/SpawnTagTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/SpawnTagTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/StuckTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/StuckTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/StuckTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/StuckTimer.java diff --git a/src/us/hcrealms/hcf/timer/type/TeleportTimer.java b/src/main/java/us/hcrealms/hcf/timer/type/TeleportTimer.java similarity index 100% rename from src/us/hcrealms/hcf/timer/type/TeleportTimer.java rename to src/main/java/us/hcrealms/hcf/timer/type/TeleportTimer.java diff --git a/src/us/hcrealms/hcf/user/AbstractUserManager.java b/src/main/java/us/hcrealms/hcf/user/AbstractUserManager.java similarity index 100% rename from src/us/hcrealms/hcf/user/AbstractUserManager.java rename to src/main/java/us/hcrealms/hcf/user/AbstractUserManager.java diff --git a/src/us/hcrealms/hcf/user/ConsoleUser.java b/src/main/java/us/hcrealms/hcf/user/ConsoleUser.java similarity index 100% rename from src/us/hcrealms/hcf/user/ConsoleUser.java rename to src/main/java/us/hcrealms/hcf/user/ConsoleUser.java diff --git a/src/us/hcrealms/hcf/user/FactionUser.java b/src/main/java/us/hcrealms/hcf/user/FactionUser.java similarity index 100% rename from src/us/hcrealms/hcf/user/FactionUser.java rename to src/main/java/us/hcrealms/hcf/user/FactionUser.java diff --git a/src/us/hcrealms/hcf/user/UserManager.java b/src/main/java/us/hcrealms/hcf/user/UserManager.java similarity index 100% rename from src/us/hcrealms/hcf/user/UserManager.java rename to src/main/java/us/hcrealms/hcf/user/UserManager.java diff --git a/src/us/hcrealms/hcf/util/BukkitUtils.java b/src/main/java/us/hcrealms/hcf/util/BukkitUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/BukkitUtils.java rename to src/main/java/us/hcrealms/hcf/util/BukkitUtils.java diff --git a/src/us/hcrealms/hcf/util/Color.java b/src/main/java/us/hcrealms/hcf/util/Color.java similarity index 100% rename from src/us/hcrealms/hcf/util/Color.java rename to src/main/java/us/hcrealms/hcf/util/Color.java diff --git a/src/us/hcrealms/hcf/util/ConcurrentValueOrderedMap.java b/src/main/java/us/hcrealms/hcf/util/ConcurrentValueOrderedMap.java similarity index 100% rename from src/us/hcrealms/hcf/util/ConcurrentValueOrderedMap.java rename to src/main/java/us/hcrealms/hcf/util/ConcurrentValueOrderedMap.java diff --git a/src/us/hcrealms/hcf/util/Config.java b/src/main/java/us/hcrealms/hcf/util/Config.java similarity index 100% rename from src/us/hcrealms/hcf/util/Config.java rename to src/main/java/us/hcrealms/hcf/util/Config.java diff --git a/src/us/hcrealms/hcf/util/DelayedMessageRunnable.java b/src/main/java/us/hcrealms/hcf/util/DelayedMessageRunnable.java similarity index 100% rename from src/us/hcrealms/hcf/util/DelayedMessageRunnable.java rename to src/main/java/us/hcrealms/hcf/util/DelayedMessageRunnable.java diff --git a/src/us/hcrealms/hcf/util/DurationFormatter.java b/src/main/java/us/hcrealms/hcf/util/DurationFormatter.java similarity index 100% rename from src/us/hcrealms/hcf/util/DurationFormatter.java rename to src/main/java/us/hcrealms/hcf/util/DurationFormatter.java diff --git a/src/us/hcrealms/hcf/util/ExperienceManager.java b/src/main/java/us/hcrealms/hcf/util/ExperienceManager.java similarity index 100% rename from src/us/hcrealms/hcf/util/ExperienceManager.java rename to src/main/java/us/hcrealms/hcf/util/ExperienceManager.java diff --git a/src/us/hcrealms/hcf/util/GenericUtils.java b/src/main/java/us/hcrealms/hcf/util/GenericUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/GenericUtils.java rename to src/main/java/us/hcrealms/hcf/util/GenericUtils.java diff --git a/src/us/hcrealms/hcf/util/Handler.java b/src/main/java/us/hcrealms/hcf/util/Handler.java similarity index 100% rename from src/us/hcrealms/hcf/util/Handler.java rename to src/main/java/us/hcrealms/hcf/util/Handler.java diff --git a/src/us/hcrealms/hcf/util/InventorySerialisation.java b/src/main/java/us/hcrealms/hcf/util/InventorySerialisation.java similarity index 100% rename from src/us/hcrealms/hcf/util/InventorySerialisation.java rename to src/main/java/us/hcrealms/hcf/util/InventorySerialisation.java diff --git a/src/us/hcrealms/hcf/util/InventoryUtils.java b/src/main/java/us/hcrealms/hcf/util/InventoryUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/InventoryUtils.java rename to src/main/java/us/hcrealms/hcf/util/InventoryUtils.java diff --git a/src/us/hcrealms/hcf/util/ItemBuilder.java b/src/main/java/us/hcrealms/hcf/util/ItemBuilder.java similarity index 100% rename from src/us/hcrealms/hcf/util/ItemBuilder.java rename to src/main/java/us/hcrealms/hcf/util/ItemBuilder.java diff --git a/src/us/hcrealms/hcf/util/ItemUtil.java b/src/main/java/us/hcrealms/hcf/util/ItemUtil.java similarity index 100% rename from src/us/hcrealms/hcf/util/ItemUtil.java rename to src/main/java/us/hcrealms/hcf/util/ItemUtil.java diff --git a/src/us/hcrealms/hcf/util/JavaUtils.java b/src/main/java/us/hcrealms/hcf/util/JavaUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/JavaUtils.java rename to src/main/java/us/hcrealms/hcf/util/JavaUtils.java diff --git a/src/us/hcrealms/hcf/util/MapSorting.java b/src/main/java/us/hcrealms/hcf/util/MapSorting.java similarity index 100% rename from src/us/hcrealms/hcf/util/MapSorting.java rename to src/main/java/us/hcrealms/hcf/util/MapSorting.java diff --git a/src/us/hcrealms/hcf/util/Message.java b/src/main/java/us/hcrealms/hcf/util/Message.java similarity index 93% rename from src/us/hcrealms/hcf/util/Message.java rename to src/main/java/us/hcrealms/hcf/util/Message.java index 7246d9b..7081f29 100644 --- a/src/us/hcrealms/hcf/util/Message.java +++ b/src/main/java/us/hcrealms/hcf/util/Message.java @@ -6,12 +6,12 @@ public enum Message { NO_PERMISSION(ChatColor.RED + "No permission."), ARROW_PREFIX(ChatColor.GOLD + ""), - ARROW_SINGLE(ChatColor.DARK_GRAY + " » "), + ARROW_SINGLE(ChatColor.DARK_GRAY + " » "), CLEAR_INVENTORY(ChatColor.GOLD + "You have cleared the inventory of " + ChatColor.RESET + "%player%" + ChatColor.GOLD + "."), TELEPORT_MESSAGE(ChatColor.GOLD + "Teleported to " + ChatColor.WHITE + ChatColor.GOLD.toString() + ChatColor.BOLD + "%player%"), OFFLINE_PLAYER(ChatColor.RED + "That player is not currently online."), OPENING_CHEST_SILENTY(ChatColor.YELLOW + "Opening chest silenty.."); - + private final String message; Message(String message) { @@ -23,4 +23,4 @@ public enum Message { return this.message; } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/util/NameHistory.java b/src/main/java/us/hcrealms/hcf/util/NameHistory.java similarity index 100% rename from src/us/hcrealms/hcf/util/NameHistory.java rename to src/main/java/us/hcrealms/hcf/util/NameHistory.java diff --git a/src/us/hcrealms/hcf/util/NmsUtils.java b/src/main/java/us/hcrealms/hcf/util/NmsUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/NmsUtils.java rename to src/main/java/us/hcrealms/hcf/util/NmsUtils.java diff --git a/src/us/hcrealms/hcf/util/ParticleEffect.java b/src/main/java/us/hcrealms/hcf/util/ParticleEffect.java similarity index 100% rename from src/us/hcrealms/hcf/util/ParticleEffect.java rename to src/main/java/us/hcrealms/hcf/util/ParticleEffect.java diff --git a/src/us/hcrealms/hcf/util/PersistableLocation.java b/src/main/java/us/hcrealms/hcf/util/PersistableLocation.java similarity index 100% rename from src/us/hcrealms/hcf/util/PersistableLocation.java rename to src/main/java/us/hcrealms/hcf/util/PersistableLocation.java diff --git a/src/us/hcrealms/hcf/util/SignHandler.java b/src/main/java/us/hcrealms/hcf/util/SignHandler.java similarity index 100% rename from src/us/hcrealms/hcf/util/SignHandler.java rename to src/main/java/us/hcrealms/hcf/util/SignHandler.java diff --git a/src/us/hcrealms/hcf/util/SpigotUtils.java b/src/main/java/us/hcrealms/hcf/util/SpigotUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/SpigotUtils.java rename to src/main/java/us/hcrealms/hcf/util/SpigotUtils.java diff --git a/src/us/hcrealms/hcf/util/TimeUtils.java b/src/main/java/us/hcrealms/hcf/util/TimeUtils.java similarity index 100% rename from src/us/hcrealms/hcf/util/TimeUtils.java rename to src/main/java/us/hcrealms/hcf/util/TimeUtils.java diff --git a/src/us/hcrealms/hcf/util/UUIDFetcher.java b/src/main/java/us/hcrealms/hcf/util/UUIDFetcher.java similarity index 100% rename from src/us/hcrealms/hcf/util/UUIDFetcher.java rename to src/main/java/us/hcrealms/hcf/util/UUIDFetcher.java diff --git a/src/us/hcrealms/hcf/util/chat/ChatUtil.java b/src/main/java/us/hcrealms/hcf/util/chat/ChatUtil.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/ChatUtil.java rename to src/main/java/us/hcrealms/hcf/util/chat/ChatUtil.java diff --git a/src/us/hcrealms/hcf/util/chat/ClickAction.java b/src/main/java/us/hcrealms/hcf/util/chat/ClickAction.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/ClickAction.java rename to src/main/java/us/hcrealms/hcf/util/chat/ClickAction.java diff --git a/src/us/hcrealms/hcf/util/chat/HoverAction.java b/src/main/java/us/hcrealms/hcf/util/chat/HoverAction.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/HoverAction.java rename to src/main/java/us/hcrealms/hcf/util/chat/HoverAction.java diff --git a/src/us/hcrealms/hcf/util/chat/Lang.java b/src/main/java/us/hcrealms/hcf/util/chat/Lang.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/Lang.java rename to src/main/java/us/hcrealms/hcf/util/chat/Lang.java diff --git a/src/us/hcrealms/hcf/util/chat/Text.java b/src/main/java/us/hcrealms/hcf/util/chat/Text.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/Text.java rename to src/main/java/us/hcrealms/hcf/util/chat/Text.java diff --git a/src/us/hcrealms/hcf/util/chat/TextUtil.java b/src/main/java/us/hcrealms/hcf/util/chat/TextUtil.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/TextUtil.java rename to src/main/java/us/hcrealms/hcf/util/chat/TextUtil.java diff --git a/src/us/hcrealms/hcf/util/chat/Trans.java b/src/main/java/us/hcrealms/hcf/util/chat/Trans.java similarity index 100% rename from src/us/hcrealms/hcf/util/chat/Trans.java rename to src/main/java/us/hcrealms/hcf/util/chat/Trans.java diff --git a/src/us/hcrealms/hcf/util/command/ArgumentExecutor.java b/src/main/java/us/hcrealms/hcf/util/command/ArgumentExecutor.java similarity index 95% rename from src/us/hcrealms/hcf/util/command/ArgumentExecutor.java rename to src/main/java/us/hcrealms/hcf/util/command/ArgumentExecutor.java index 464a1e3..bf33e2b 100644 --- a/src/us/hcrealms/hcf/util/command/ArgumentExecutor.java +++ b/src/main/java/us/hcrealms/hcf/util/command/ArgumentExecutor.java @@ -52,13 +52,13 @@ public abstract class ArgumentExecutor implements CommandExecutor, TabCompleter } @SuppressWarnings({ "unchecked", "rawtypes" }) - public List getArguments() { + public List getArguments() { return (List) ImmutableList.copyOf((Collection) this.arguments); } public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) { if (args.length < 1) { - sender.sendMessage(ChatColor.GRAY + " » " + ChatColor.RED + WordUtils.capitalizeFully(label) + " Help" + ChatColor.GRAY + " (1 out of 1 pages)"); + sender.sendMessage(ChatColor.GRAY + " » " + ChatColor.RED + WordUtils.capitalizeFully(label) + " Help" + ChatColor.GRAY + " (1 out of 1 pages)"); sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); for (final CommandArgument argument : this.arguments) { @@ -103,4 +103,4 @@ public abstract class ArgumentExecutor implements CommandExecutor, TabCompleter } return BukkitUtils.getCompletions(args, results); } -} +} \ No newline at end of file diff --git a/src/us/hcrealms/hcf/util/command/CommandArgument.java b/src/main/java/us/hcrealms/hcf/util/command/CommandArgument.java similarity index 100% rename from src/us/hcrealms/hcf/util/command/CommandArgument.java rename to src/main/java/us/hcrealms/hcf/util/command/CommandArgument.java diff --git a/src/us/hcrealms/hcf/util/command/CommandWrapper.java b/src/main/java/us/hcrealms/hcf/util/command/CommandWrapper.java similarity index 100% rename from src/us/hcrealms/hcf/util/command/CommandWrapper.java rename to src/main/java/us/hcrealms/hcf/util/command/CommandWrapper.java diff --git a/src/us/hcrealms/hcf/util/cuboid/CoordinatePair.java b/src/main/java/us/hcrealms/hcf/util/cuboid/CoordinatePair.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/CoordinatePair.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/CoordinatePair.java diff --git a/src/us/hcrealms/hcf/util/cuboid/Cuboid.java b/src/main/java/us/hcrealms/hcf/util/cuboid/Cuboid.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/Cuboid.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/Cuboid.java diff --git a/src/us/hcrealms/hcf/util/cuboid/CuboidBlockIterator.java b/src/main/java/us/hcrealms/hcf/util/cuboid/CuboidBlockIterator.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/CuboidBlockIterator.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/CuboidBlockIterator.java diff --git a/src/us/hcrealms/hcf/util/cuboid/CuboidDirection.java b/src/main/java/us/hcrealms/hcf/util/cuboid/CuboidDirection.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/CuboidDirection.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/CuboidDirection.java diff --git a/src/us/hcrealms/hcf/util/cuboid/CuboidLocationIterator.java b/src/main/java/us/hcrealms/hcf/util/cuboid/CuboidLocationIterator.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/CuboidLocationIterator.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/CuboidLocationIterator.java diff --git a/src/us/hcrealms/hcf/util/cuboid/NamedCuboid.java b/src/main/java/us/hcrealms/hcf/util/cuboid/NamedCuboid.java similarity index 100% rename from src/us/hcrealms/hcf/util/cuboid/NamedCuboid.java rename to src/main/java/us/hcrealms/hcf/util/cuboid/NamedCuboid.java diff --git a/src/us/hcrealms/hcf/util/imagemessage/ImageChar.java b/src/main/java/us/hcrealms/hcf/util/imagemessage/ImageChar.java similarity index 100% rename from src/us/hcrealms/hcf/util/imagemessage/ImageChar.java rename to src/main/java/us/hcrealms/hcf/util/imagemessage/ImageChar.java diff --git a/src/us/hcrealms/hcf/util/imagemessage/ImageMessage.java b/src/main/java/us/hcrealms/hcf/util/imagemessage/ImageMessage.java similarity index 100% rename from src/us/hcrealms/hcf/util/imagemessage/ImageMessage.java rename to src/main/java/us/hcrealms/hcf/util/imagemessage/ImageMessage.java diff --git a/src/us/hcrealms/hcf/util/itemdb/ItemData.java b/src/main/java/us/hcrealms/hcf/util/itemdb/ItemData.java similarity index 100% rename from src/us/hcrealms/hcf/util/itemdb/ItemData.java rename to src/main/java/us/hcrealms/hcf/util/itemdb/ItemData.java diff --git a/src/us/hcrealms/hcf/util/itemdb/ItemDb.java b/src/main/java/us/hcrealms/hcf/util/itemdb/ItemDb.java similarity index 100% rename from src/us/hcrealms/hcf/util/itemdb/ItemDb.java rename to src/main/java/us/hcrealms/hcf/util/itemdb/ItemDb.java diff --git a/src/us/hcrealms/hcf/util/itemdb/ManagedFile.java b/src/main/java/us/hcrealms/hcf/util/itemdb/ManagedFile.java similarity index 100% rename from src/us/hcrealms/hcf/util/itemdb/ManagedFile.java rename to src/main/java/us/hcrealms/hcf/util/itemdb/ManagedFile.java diff --git a/src/us/hcrealms/hcf/util/itemdb/SimpleItemDb.java b/src/main/java/us/hcrealms/hcf/util/itemdb/SimpleItemDb.java similarity index 100% rename from src/us/hcrealms/hcf/util/itemdb/SimpleItemDb.java rename to src/main/java/us/hcrealms/hcf/util/itemdb/SimpleItemDb.java diff --git a/src/us/hcrealms/hcf/visualise/BlockFiller.java b/src/main/java/us/hcrealms/hcf/visualise/BlockFiller.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/BlockFiller.java rename to src/main/java/us/hcrealms/hcf/visualise/BlockFiller.java diff --git a/src/us/hcrealms/hcf/visualise/ProtocolLibHook.java b/src/main/java/us/hcrealms/hcf/visualise/ProtocolLibHook.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/ProtocolLibHook.java rename to src/main/java/us/hcrealms/hcf/visualise/ProtocolLibHook.java diff --git a/src/us/hcrealms/hcf/visualise/VisualBlock.java b/src/main/java/us/hcrealms/hcf/visualise/VisualBlock.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/VisualBlock.java rename to src/main/java/us/hcrealms/hcf/visualise/VisualBlock.java diff --git a/src/us/hcrealms/hcf/visualise/VisualBlockData.java b/src/main/java/us/hcrealms/hcf/visualise/VisualBlockData.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/VisualBlockData.java rename to src/main/java/us/hcrealms/hcf/visualise/VisualBlockData.java diff --git a/src/us/hcrealms/hcf/visualise/VisualType.java b/src/main/java/us/hcrealms/hcf/visualise/VisualType.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/VisualType.java rename to src/main/java/us/hcrealms/hcf/visualise/VisualType.java diff --git a/src/us/hcrealms/hcf/visualise/VisualiseHandler.java b/src/main/java/us/hcrealms/hcf/visualise/VisualiseHandler.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/VisualiseHandler.java rename to src/main/java/us/hcrealms/hcf/visualise/VisualiseHandler.java diff --git a/src/us/hcrealms/hcf/visualise/WallBorderListener.java b/src/main/java/us/hcrealms/hcf/visualise/WallBorderListener.java similarity index 100% rename from src/us/hcrealms/hcf/visualise/WallBorderListener.java rename to src/main/java/us/hcrealms/hcf/visualise/WallBorderListener.java diff --git a/src/config.yml b/src/main/resources/config.yml similarity index 100% rename from src/config.yml rename to src/main/resources/config.yml diff --git a/src/items.csv b/src/main/resources/items.csv similarity index 100% rename from src/items.csv rename to src/main/resources/items.csv diff --git a/src/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from src/plugin.yml rename to src/main/resources/plugin.yml diff --git a/src/world-config.yml b/src/main/resources/world-config.yml similarity index 100% rename from src/world-config.yml rename to src/main/resources/world-config.yml diff --git a/src/us/hcrealms/hcf/commands/MiscCommands.java b/src/us/hcrealms/hcf/commands/MiscCommands.java deleted file mode 100644 index 1f7e0ad..0000000 --- a/src/us/hcrealms/hcf/commands/MiscCommands.java +++ /dev/null @@ -1,177 +0,0 @@ -package us.hcrealms.hcf.commands; - -import java.util.HashMap; - -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import net.md_5.bungee.api.ChatColor; - -public class MiscCommands implements CommandExecutor { - public boolean onCommand (final CommandSender sender, final Command cmd, final String commandLabel, final String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage(ChatColor.RED + "You cannot do this in console"); - return true; - } - final Player p = (Player)sender; - p.getLocation(); - p.getInventory(); - String perm = ChatColor.translateAlternateColorCodes('&', "&cNo."); - perm = perm.replaceAll("&", "§"); - if (cmd.getName().equalsIgnoreCase("drop")) { - if (!p.hasPermission("drop.yes")) { - p.sendMessage(perm); - return true; - } - if (args.length == 0) { - p.sendMessage(ChatColor.GRAY + "/drop "); - return true; - } - if (args[0].equalsIgnoreCase("help") | args[0].equalsIgnoreCase("helpme") | args[0].equalsIgnoreCase("help")) { - p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " Help Menu " + ChatColor.RED + " \u2727"); - p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " /drop is a command that allows the user to remotely drop a target for a minecraft error message."); - p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " There are many diffrent options to choose from."); - p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To drop a player do §7/drop §9<§7player§9> <§7error§9>"); - p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To list the types of error's do §7/drop type"); - p.sendMessage(ChatColor.GRAY + "- " + ChatColor.BLUE + "To get a list of error's and the number do §7/drop list"); - return true; - } - if (args[0].equalsIgnoreCase("types") | args[0].equalsIgnoreCase("type") | args[0].equalsIgnoreCase("t")) { - p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " All Types Of Errors " + ChatColor.RED + " \u2727"); - p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " - "); - p.sendMessage(" §c\u25cf §9Stream §7- §3End of stream"); - p.sendMessage(" §c\u25cf §9Hacked §7- §3You logged in from another location"); - p.sendMessage(" §c\u25cf §9Error §7- §3Java error message"); - p.sendMessage(" §c\u25cf §9Login §7- §3Failed to login: Invalid session"); - p.sendMessage(" §c\u25cf §9Drop §7- §3Long java error message"); - return true; - } - if (args[0].equalsIgnoreCase("list") | args[0].equalsIgnoreCase("all") | args[0].equalsIgnoreCase("number")) { - p.sendMessage(ChatColor.RED + "\u2727 " + ChatColor.BLUE + ChatColor.BOLD + " Lists Of Errors " + ChatColor.RED + " \u2727"); - p.sendMessage(ChatColor.RED + "[" + ChatColor.GRAY + "+" + ChatColor.RED + "]" + ChatColor.GRAY + " /drop "); - p.sendMessage("§01.) §7End of stream"); - p.sendMessage("§02.) §7You logged in from another location"); - p.sendMessage("§03.) §7Java error message"); - p.sendMessage("§04.) §7Failed to login: Invalid session"); - p.sendMessage("§05.) §7Long java error message"); - return true; - } - final Player target3 = Bukkit.getServer().getPlayer(args[0]); - if (target3 == null) { - sender.sendMessage(ChatColor.RED + "Could not find player " + args[0] + "."); - return true; - } - if (args.length == 2) { - if (args[1].equalsIgnoreCase("stream") | args[1].equalsIgnoreCase("eos") | args[1].equalsIgnoreCase("logout") | args[1].equalsIgnoreCase("1")) { - target3.kickPlayer("End of stream"); - p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for End of stream"); - return true; - } - if (args[1].equalsIgnoreCase("hacked") | args[1].equalsIgnoreCase("location") | args[1].equalsIgnoreCase("dl") | args[1].equalsIgnoreCase("2")) { - target3.kickPlayer("You logged in from another location"); - p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for location log in"); - return true; - } - if (args[1].equalsIgnoreCase("error") | args[1].equalsIgnoreCase("javaerror") | args[1].equalsIgnoreCase("503") | args[1].equalsIgnoreCase("3")) { - target3.kickPlayer("java.io.IOException: Server returned HTTP response code: 503"); - p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Java Error"); - return true; - } - if (args[1].equalsIgnoreCase("login") | args[1].equalsIgnoreCase("fl") | args[1].equalsIgnoreCase("faildlogin") | args[1].equalsIgnoreCase("4")) { - target3.kickPlayer("Failed to login: Invalid session (Try restarting your game)"); - p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Failed to login"); - return true; - } - if (args[1].equalsIgnoreCase("drop") | args[1].equalsIgnoreCase("default") | args[1].equalsIgnoreCase("bye") | args[1].equalsIgnoreCase("5")) { - target3.kickPlayer("Java Exception: Socket reset | End of Stream | in com.bukkit.minecraftServer.Connection ln 3712 at Java.Sockets.Connection.TCP Unhandled exception: Java.Exception.Streams.EndOFStream"); - p.sendMessage(ChatColor.GRAY + "You have droped " + ChatColor.RED + args[0] + ChatColor.GRAY + " for Long Error"); - return true; - } - } - else { - p.sendMessage(ChatColor.GRAY + "/drop "); - } - } - if (cmd.getName().equalsIgnoreCase("copyinv")) { - if (!p.hasPermission("copyinv.yes")) { - p.sendMessage(perm); - return true; - } - if (args.length == 0) { - p.sendMessage(ChatColor.GRAY + "/copyinv "); - } - if (args.length == 1) { - final Player all2 = Bukkit.getPlayer(args[0]); - if (all2 == null) { - p.sendMessage(ChatColor.RED + "That player does not exist!"); - } - else { - final ItemStack[] armor = all2.getInventory().getArmorContents(); - p.getInventory().clear(); - p.getInventory().setArmorContents((ItemStack[])null); - p.getInventory().setArmorContents(armor); - final ItemStack[] inv = all2.getInventory().getContents(); - final HashMap itemhash = new HashMap(); - itemhash.put(p, inv); - final ItemStack[] items = itemhash.get(p); - p.getInventory().setContents(items); - p.sendMessage(ChatColor.GRAY + "Copying " + ChatColor.RED + args[0] + ChatColor.GRAY + " Inventory"); - } - } - } - if (cmd.getName().equalsIgnoreCase("fsay")) { - if (!p.hasPermission("fsay.yes")) { - p.sendMessage(perm); - return true; - } - if (args.length == 0) { - sender.sendMessage(ChatColor.GRAY + "/fsay "); - return true; - } - if (args.length == 1) { - sender.sendMessage(ChatColor.GRAY + "/fsay "); - } - else if (args.length >= 2) { - final Player user = Bukkit.getServer().getPlayer(args[0]); - if (user == null) { - final StringBuilder message = new StringBuilder(args[1]); - for (int arg2 = 2; arg2 < args.length; ++arg2) { - message.append(" ").append(args[arg2]); - } - return true; - } - final StringBuilder message = new StringBuilder(args[1]); - for (int arg2 = 2; arg2 < args.length; ++arg2) { - message.append(" ").append(args[arg2]); - } - user.chat(message.toString()); - } - } - - if (!cmd.getName().equalsIgnoreCase("slowstop")) { - return false; - } - if (!p.hasPermission("core.slowstop")) { - p.sendMessage(perm); - return true; - } - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588" + " " + ChatColor.RED + "Server Restarting."); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588" + ChatColor.GOLD + "\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588" + ChatColor.DARK_RED + "\u2588\u2588\u2588\u2588\u2588" + ChatColor.GOLD + "\u2588\u2588\u2588"); - Bukkit.broadcastMessage(ChatColor.GOLD + "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588"); - Bukkit.getServer().dispatchCommand((CommandSender)Bukkit.getConsoleSender(), "restart"); - - return true; - } - } diff --git a/src/us/hcrealms/hcf/commands/ResetCommand.java b/src/us/hcrealms/hcf/commands/ResetCommand.java deleted file mode 100644 index 06aec08..0000000 --- a/src/us/hcrealms/hcf/commands/ResetCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -package us.hcrealms.hcf.commands; - -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Statistic; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class ResetCommand implements CommandExecutor{ - - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) - { - Player player = (Player)sender; - if ((command.getName().equalsIgnoreCase("reset")) && ((sender instanceof Player)) && - (args.length > 1)) - { - sender.sendMessage("§cUsage: /Reset "); - return true; - } - if (args.length == 0) - { - sender.sendMessage("§cUsage: /Reset "); - return true; - } - Player target = Bukkit.getServer().getPlayer(args[0]); - if ((args.length == 1) && - (target == null)) - { - player.sendMessage("§cPlayer not found"); - return true; - } - target.setStatistic(Statistic.DEATHS, 0); - target.setStatistic(Statistic.PLAYER_KILLS, 0); - - sender.sendMessage(ChatColor.RED + "You have reset " + target.getPlayer().getName() + " 's stats!"); - for (Player s : Bukkit.getOnlinePlayers()) { - if (s.hasPermission("command.reset")) { - s.sendMessage(ChatColor.translateAlternateColorCodes('&', "&b" + sender.getName() + " &7has reset the &3&lStatistics &7of &b" + target.getName())); - return false; - } - - } - return false; - } -} diff --git a/src/us/hcrealms/hcf/listener/ChatListener.java b/src/us/hcrealms/hcf/listener/ChatListener.java deleted file mode 100644 index b718880..0000000 --- a/src/us/hcrealms/hcf/listener/ChatListener.java +++ /dev/null @@ -1,136 +0,0 @@ -package us.hcrealms.hcf.listener; - -import java.util.Collection; -import java.util.Set; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; - -import com.google.common.collect.ImmutableSet; - -import java.util.*; - -import ru.tehkode.permissions.bukkit.PermissionsEx; -import us.hcrealms.hcf.Base; -import us.hcrealms.hcf.faction.event.FactionChatEvent; -import us.hcrealms.hcf.faction.struct.ChatChannel; -import us.hcrealms.hcf.faction.type.PlayerFaction; - -public class ChatListener implements Listener - { - public static final List blocked; - public ChatListener(Base plugin) - { - this.plugin = plugin; - } - - @SuppressWarnings({ "deprecation", "unchecked" }) -@EventHandler(ignoreCancelled=true, priority=EventPriority.HIGHEST) - public void onPlayerChat(AsyncPlayerChatEvent event) - { - String message = event.getMessage(); - Player player = event.getPlayer(); - PlayerFaction playerFaction = this.plugin.getFactionManager().getPlayerFaction(player); - ChatChannel chatChannel = playerFaction == null ? ChatChannel.PUBLIC : playerFaction.getMember(player).getChatChannel(); - Set recipients = event.getRecipients(); - - if ((chatChannel == ChatChannel.FACTION) || (chatChannel == ChatChannel.ALLIANCE)) - { - if (!isGlobalChannel(message)) - { - Collection online = playerFaction.getOnlinePlayers(); - if (chatChannel == ChatChannel.ALLIANCE) - { - Collection allies = playerFaction.getAlliedFactions(); - for (PlayerFaction ally : allies) { - online.addAll(ally.getOnlinePlayers()); - } - } - recipients.retainAll(online); - event.setFormat(chatChannel.getRawFormat(player)); - Bukkit.getPluginManager().callEvent(new FactionChatEvent(true, playerFaction, player, chatChannel, recipients, event.getMessage())); - return; - } - message = message.substring(1, message.length()).trim(); - event.setMessage(message); - } - event.setCancelled(true); - Boolean.valueOf(true); - if (player.hasPermission("faction.removetag")) { - Boolean.valueOf(true); - } - String rank = ChatColor.translateAlternateColorCodes('&', "&f" + PermissionsEx.getUser(player).getPrefix()).replace("_", " "); - String displayName = player.getDisplayName(); - displayName = rank + displayName; - ConsoleCommandSender console = Bukkit.getConsoleSender(); - for (final String word : blocked) { - if ((message.toLowerCase().contains(word))) - { - Bukkit.dispatchCommand(console, "tempmute " + player.getName() + " 5m Blocked Word -s"); - Player[] arrayOfPlayer; - int j = (arrayOfPlayer = Bukkit.getOnlinePlayers()).length; - for (int i = 0; i < j; i++) - { - Player on = arrayOfPlayer[i]; - if (on.hasPermission("command.mod")) { - on.sendMessage(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_RED.toString() + ChatColor.BOLD + "BLOCKED" + ChatColor.DARK_GRAY + "] " + ChatColor.RED + player.getDisplayName() + ChatColor.GRAY + " attempted to say " + ChatColor.RED + message); - } - } - event.setCancelled(true); - return; - } - } - String tag = playerFaction == null ? ChatColor.DARK_RED + "-" : playerFaction.getDisplayName(console); - console.sendMessage(ChatColor.GOLD + "[" + tag + ChatColor.GOLD + "] " + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); - for (Player recipient : event.getRecipients()) - { - if (playerFaction != null) - { - tag = playerFaction == null ? ChatColor.RED + "*" : playerFaction.getDisplayName(recipient); - recipient.sendMessage(ChatColor.GOLD + "[" + tag + ChatColor.GOLD + "] " + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); - } - else - { - recipient.sendMessage(ChatColor.GOLD + "[§c*§6] §r" + displayName + ChatColor.WHITE + ": " + ChatColor.WHITE + message); - } - } - } - - private boolean isGlobalChannel(String input) - { - int length = input.length(); - if ((length <= 1) || (!input.startsWith("!"))) { - return false; - } - int i = 1; - while (i < length) - { - char character = input.charAt(i); - if (character == ' ') - { - i++; - } - else - { - if (character != '/') { - break; - } - return false; - } - } - return true; - } - - static - { - blocked = Arrays.asList("hitler", "kys", "nigga", "kill yourself", "nigger", "rip off", "shit staff", "shit server", "gay server", "kys", "leaked", "ddos", "kill yourself", "shit owner", "join my server", "new hcf server", "server is shit", "server is crap", "bad server", "kult", "this is shit", "customkkk", "niggerfaggot", "faggot", "heil"); - ImmutableSet.builder(); - } - - private final Base plugin; -} diff --git a/src/us/hcrealms/hcf/timer/TimerExecutor.java b/src/us/hcrealms/hcf/timer/TimerExecutor.java deleted file mode 100644 index abefb77..0000000 --- a/src/us/hcrealms/hcf/timer/TimerExecutor.java +++ /dev/null @@ -1,50 +0,0 @@ -package us.hcrealms.hcf.timer; - -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; - -import us.hcrealms.hcf.Base; -import us.hcrealms.hcf.timer.argument.TimerCheckArgument; -import us.hcrealms.hcf.timer.argument.TimerSetArgument; -import us.hcrealms.hcf.util.BukkitUtils; -import us.hcrealms.hcf.util.command.ArgumentExecutor; -import us.hcrealms.hcf.util.command.CommandArgument; - -/** - * Handles the execution and tab completion of the timer command. - */ -public class TimerExecutor extends ArgumentExecutor { - - public TimerExecutor(Base plugin) { - super("timer"); - - addArgument(new TimerCheckArgument(plugin)); - addArgument(new TimerSetArgument(plugin)); - } - - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) - { - if (args.length < 1) - { - if (sender.hasPermission("timer.admin")) - { - sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); - sender.sendMessage(ChatColor.GOLD + "Timer Help"); - sender.sendMessage(ChatColor.YELLOW + " /timer set" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Set remaining timer time."); - sender.sendMessage(ChatColor.YELLOW + " /timer check" + ChatColor.GOLD +" » " + ChatColor.GRAY + "Check remaining timer time."); - sender.sendMessage(ChatColor.DARK_GRAY + BukkitUtils.STRAIGHT_LINE_DEFAULT); - } - return true; - } - CommandArgument argument2 = getArgument(args[0]); - String permission2 = argument2 == null ? null : argument2.getPermission(); - if ((argument2 == null) || ((permission2 != null) && (!sender.hasPermission(permission2)))) - { - sender.sendMessage(ChatColor.RED + "Command not found"); - return true; - } - argument2.onCommand(sender, command, label, args); - return true; - } -} \ No newline at end of file