diff --git a/.gitignore b/.gitignore index 6035880a..e452708f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,27 @@ +# TFM excludes +/lib + # Netbeans excludes -nbproject/private/ -dist/ -build/ +/nbproject/private +/dist +/build manifest.mf +nb-configuration.xml # Eclipse excludes .project .classpath -bin/ -.settings/ +/bin +/.settings + +# IntelliJ excludes +*.iml +*.ipr +*.iws +/.idea + +# Maven excludes +/target # OS generated files .DS_Store @@ -17,6 +30,3 @@ bin/ .Trashes ehthumbs.db Thumbs.db - -# TFM files -build.properties diff --git a/build.properties b/build.properties new file mode 100644 index 00000000..3c406de7 --- /dev/null +++ b/build.properties @@ -0,0 +1,4 @@ +#maven.buildNumber.plugin properties file +#Wed Nov 18 21:37:05 CET 2015 +buildAuthor=ProzzaGuy +buildNumber=13 diff --git a/build.xml b/build.xml deleted file mode 100644 index 9ba4a5e0..00000000 --- a/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - Builds, tests, and runs the project TotalFreedomMod. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index e6d516f8..00000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1381 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 947ef47f..00000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=7bf70ec5 -build.xml.script.CRC32=b1031e10 -build.xml.stylesheet.CRC32=28e38971@1.44.1.45 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=7bf70ec5 -nbproject/build-impl.xml.script.CRC32=8511de95 -nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index d0203a4e..00000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=TotalFreedomMod -application.vendor=TotalFreedom -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=0 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.enableCommentFormatting=false -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true -auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/TotalFreedomMod.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${libs.SpigotServer.classpath}:\ - ${libs.TF-Essentials.classpath}:\ - ${libs.TF-WorldEdit.classpath}:\ - ${libs.BukkitTelnet.classpath}:\ - ${libs.Aero.classpath}:\ - ${libs.Lombok.classpath} -# Space-separated list of extra javac options -javac.compilerargs=-Xlint:unchecked -Xlint:deprecation -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=no.codebase -jnlp.descriptor=application -jnlp.enabled=false -jnlp.mixed.code=default -jnlp.offline-allowed=false -jnlp.signed=false -jnlp.signing= -jnlp.signing.alias= -jnlp.signing.keystore= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=true -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index b1406fe3..00000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - TotalFreedomMod - - - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c5ea6980 --- /dev/null +++ b/pom.xml @@ -0,0 +1,221 @@ + + + 4.0.0 + + me.totalfreedom + TotalFreedomModMaven + 5.0 + jar + + + UTF-8 + ${project.version} + ${maven.buildnumber} + ${maven.build.timestamp} + ${buildAuthor} + dd/MM/yyyy hh:mm aa + + + TotalFreedomMod + Server modification for the TotalFreedom server + https://github.com/TotalFreedom/TotalFreedomMod + + + + TotalFreedom General License + https://github.com/TotalFreedom/License/blob/master/LICENSE.md + + + + + Total Freedom MC + https://totalfreedom.me + + + + scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git + scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git + git@github.com:TotalFreedom/TotalFreedomMod.git + + + + + spigot + https://hub.spigotmc.org/nexus/content/groups/public/ + + + + + + net.pravian + Aero + 2.0 + compile + + + + org.projectlombok + lombok + 1.16.6 + provided + + + + org.spigotmc + spigot + 1.8.7-R0.1-SNAPSHOT + system + ${project.basedir}/lib/Spigot-1.8.7.jar + + + + net.totalfreedom + bukkittelnet + 4.2 + system + ${project.basedir}/lib/BukkitTelnet-4.2.jar + + + + net.totalfreedom + tf-worldedit + 6.1.0-TF + system + ${project.basedir}/lib/TF-WorldEdit-6.1.0.jar + + + + net.totalfreedom + tf-essentials + 2.0-TF + system + ${project.basedir}/lib/TF-Essentials-2.0.jar + + + + + + + + src/main/resources + true + + + + + + + + maven-antrun-plugin + 1.8 + + + initialize + + + + + + + + + run + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/build.properties + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.6 + 1.7 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + false + + + + + + + com.lukegb.mojo + gitdescribe-maven-plugin + 3.0 + + + git-describe + initialize + + gitdescribe + + + + --tags + --always + HEAD + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + generate-resources + + create + + + + + + maven.buildnumber + ${basedir}/build.properties + {0,number} + + buildNumber + + + + + + + \ No newline at end of file diff --git a/src/bans.yml b/src/main/java/bans.yml similarity index 100% rename from src/bans.yml rename to src/main/java/bans.yml diff --git a/src/config.yml b/src/main/java/config.yml similarity index 100% rename from src/config.yml rename to src/main/java/config.yml diff --git a/src/me/totalfreedom/totalfreedommod/Announcer.java b/src/main/java/me/totalfreedom/totalfreedommod/Announcer.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/Announcer.java rename to src/main/java/me/totalfreedom/totalfreedommod/Announcer.java diff --git a/src/me/totalfreedom/totalfreedommod/AntiNuke.java b/src/main/java/me/totalfreedom/totalfreedommod/AntiNuke.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/AntiNuke.java rename to src/main/java/me/totalfreedom/totalfreedommod/AntiNuke.java diff --git a/src/me/totalfreedom/totalfreedommod/AntiSpam.java b/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/AntiSpam.java rename to src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java diff --git a/src/me/totalfreedom/totalfreedommod/AutoKick.java b/src/main/java/me/totalfreedom/totalfreedommod/AutoKick.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/AutoKick.java rename to src/main/java/me/totalfreedom/totalfreedommod/AutoKick.java diff --git a/src/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ChatManager.java rename to src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java diff --git a/src/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/CommandSpy.java rename to src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java diff --git a/src/me/totalfreedom/totalfreedommod/ConsoleLogger.java b/src/main/java/me/totalfreedom/totalfreedommod/ConsoleLogger.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ConsoleLogger.java rename to src/main/java/me/totalfreedom/totalfreedommod/ConsoleLogger.java diff --git a/src/me/totalfreedom/totalfreedommod/EntityWiper.java b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/EntityWiper.java rename to src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java diff --git a/src/me/totalfreedom/totalfreedommod/FrontDoor.java b/src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/FrontDoor.java rename to src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java diff --git a/src/me/totalfreedom/totalfreedommod/Fuckoff.java b/src/main/java/me/totalfreedom/totalfreedommod/Fuckoff.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/Fuckoff.java rename to src/main/java/me/totalfreedom/totalfreedommod/Fuckoff.java diff --git a/src/me/totalfreedom/totalfreedommod/GameRuleHandler.java b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/GameRuleHandler.java rename to src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java diff --git a/src/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/LoginProcess.java rename to src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java diff --git a/src/me/totalfreedom/totalfreedommod/MovementValidator.java b/src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/MovementValidator.java rename to src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java diff --git a/src/me/totalfreedom/totalfreedommod/Muter.java b/src/main/java/me/totalfreedom/totalfreedommod/Muter.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/Muter.java rename to src/main/java/me/totalfreedom/totalfreedommod/Muter.java diff --git a/src/me/totalfreedom/totalfreedommod/Orbiter.java b/src/main/java/me/totalfreedom/totalfreedommod/Orbiter.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/Orbiter.java rename to src/main/java/me/totalfreedom/totalfreedommod/Orbiter.java diff --git a/src/me/totalfreedom/totalfreedommod/ProtectArea.java b/src/main/java/me/totalfreedom/totalfreedommod/ProtectArea.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ProtectArea.java rename to src/main/java/me/totalfreedom/totalfreedommod/ProtectArea.java diff --git a/src/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ServerInterface.java rename to src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java diff --git a/src/me/totalfreedom/totalfreedommod/ServerPing.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ServerPing.java rename to src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java diff --git a/src/me/totalfreedom/totalfreedommod/ServiceChecker.java b/src/main/java/me/totalfreedom/totalfreedommod/ServiceChecker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/ServiceChecker.java rename to src/main/java/me/totalfreedom/totalfreedommod/ServiceChecker.java diff --git a/src/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/TotalFreedomMod.java rename to src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java diff --git a/src/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/admin/Admin.java rename to src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java diff --git a/src/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/admin/AdminList.java rename to src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java diff --git a/src/me/totalfreedom/totalfreedommod/banning/Ban.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/banning/Ban.java rename to src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java diff --git a/src/me/totalfreedom/totalfreedommod/banning/BanManager.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/banning/BanManager.java rename to src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java diff --git a/src/me/totalfreedom/totalfreedommod/banning/PermbanList.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/PermbanList.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/banning/PermbanList.java rename to src/main/java/me/totalfreedom/totalfreedommod/banning/PermbanList.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java diff --git a/src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java rename to src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java diff --git a/src/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java rename to src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java diff --git a/src/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java rename to src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java diff --git a/src/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java rename to src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java diff --git a/src/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java rename to src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java diff --git a/src/me/totalfreedom/totalfreedommod/caging/CageData.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/caging/CageData.java rename to src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java diff --git a/src/me/totalfreedom/totalfreedommod/caging/Cager.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/caging/Cager.java rename to src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/CommandLoader.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/CommandLoader.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/CommandLoader.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/CommandLoader.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/CommandParameters.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/CommandParameters.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/CommandParameters.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/CommandParameters.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/CommandPermissions.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/CommandPermissions.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/CommandPermissions.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/CommandPermissions.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_adminmode.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminmode.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_adminmode.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminmode.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_adminworld.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminworld.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_adminworld.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminworld.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_blockcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_blockcmd.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_blockcmd.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_blockcmd.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_cage.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cage.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_cage.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cage.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_cake.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cake.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_cake.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cake.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_cartsit.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cartsit.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_cartsit.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cartsit.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_cbtool.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cbtool.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_cbtool.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cbtool.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cmdspy.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_cmdspy.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cmdspy.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_colorme.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_colorme.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_colorme.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_colorme.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_commandlist.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_commandlist.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_commandlist.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_commandlist.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_creative.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_creative.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_creative.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_creative.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_csay.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_csay.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_deafen.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deafen.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_deafen.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deafen.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_debug.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_debug.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_debug.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_debug.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_denick.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_denick.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_denick.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_denick.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_deop.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deop.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_deop.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deop.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_deopall.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deopall.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_deopall.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deopall.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_dispfill.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_dispfill.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_dispfill.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_dispfill.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_doom.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_doom.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_doom.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_doom.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_enchant.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_enchant.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_enchant.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_enchant.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_ender.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ender.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_ender.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ender.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_expel.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_expel.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_expel.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_expel.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_findip.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_findip.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_findip.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_findip.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_flatlands.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_flatlands.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_flatlands.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_flatlands.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_fr.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_fr.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_fuckoff.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fuckoff.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_fuckoff.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fuckoff.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_gadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gadmin.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_gadmin.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gadmin.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_gcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gcmd.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_gcmd.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gcmd.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_glist.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_glist.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_glist.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_glist.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_gtfo.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gtfo.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_gtfo.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gtfo.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_health.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_health.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_health.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_health.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_invis.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_invis.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_invis.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_invis.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_jumppads.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_jumppads.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_jumppads.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_jumppads.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_kicknoob.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_kicknoob.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_kicknoob.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_kicknoob.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_landmine.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_landmine.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_landmine.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_landmine.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_lastcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lastcmd.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_lastcmd.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lastcmd.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_list.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_list.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_list.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_list.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_localspawn.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_localspawn.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_localspawn.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_localspawn.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_lockup.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lockup.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_lockup.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lockup.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_logs.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_logs.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_logs.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_logs.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_moblimiter.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_moblimiter.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_moblimiter.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_moblimiter.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_mobpurge.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mobpurge.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_mobpurge.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mobpurge.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_mp44.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mp44.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_mp44.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mp44.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_nether.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nether.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_nether.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nether.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_nickclean.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickclean.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_nickclean.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickclean.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_nickfilter.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickfilter.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_nickfilter.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickfilter.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_nicknyan.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nicknyan.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_nicknyan.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nicknyan.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_o.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_o.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_onlinemode.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_onlinemode.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_onlinemode.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_onlinemode.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_op.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_op.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_op.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_op.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_opall.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opall.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_opall.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opall.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_opme.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opme.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_opme.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opme.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_ops.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ops.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_ops.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ops.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_orbit.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_orbit.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_orbit.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_orbit.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_overlord.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_overlord.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_overlord.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_overlord.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_permban.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_permban.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_permban.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_permban.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_plugincontrol.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_plugincontrol.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_plugincontrol.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_plugincontrol.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_potion.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_potion.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_potion.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_potion.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_premium.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_premium.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_premium.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_premium.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_protectarea.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_protectarea.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_protectarea.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_protectarea.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_purgeall.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_purgeall.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_purgeall.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_purgeall.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_qdeop.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qdeop.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_qdeop.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qdeop.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_qop.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qop.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_qop.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qop.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_radar.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_radar.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_radar.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_radar.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_rank.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_rank.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rank.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_rawsay.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rawsay.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_rawsay.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rawsay.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_rd.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_rd.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_report.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_report.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_report.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_report.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_ro.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ro.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_ro.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ro.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_rollback.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rollback.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_rollback.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rollback.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_saconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_saconfig.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_saconfig.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_saconfig.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_say.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_say.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_say.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_say.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_services.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_services.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_services.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_services.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_setl.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setl.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_setl.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setl.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_setlevel.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setlevel.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_setlevel.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setlevel.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_setlever.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setlever.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_setlever.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setlever.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_setspawnworld.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setspawnworld.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_setspawnworld.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_setspawnworld.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_smite.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_smite.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_smite.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_smite.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_status.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_status.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_status.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_status.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_stfu.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_stfu.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_stfu.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_stfu.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_stop.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_stop.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_stop.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_stop.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_survival.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_survival.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_survival.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_survival.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tag.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tag.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tag.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tag.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tagnyan.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tagnyan.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tagnyan.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tagnyan.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tban.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tban.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tban.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tban.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tempban.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tempban.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tempban.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tempban.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tfbanlist.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfbanlist.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tfbanlist.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfbanlist.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tfipbanlist.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfipbanlist.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tfipbanlist.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfipbanlist.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tfm.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfm.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tfm.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfm.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tfupdate.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfupdate.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tfupdate.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tfupdate.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_toggle.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_toggle.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_toggle.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_toggle.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_tossmob.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tossmob.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_tossmob.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_tossmob.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_trail.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_trail.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_trail.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_trail.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_warn.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_warn.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_warn.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_warn.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_whitelist.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_whitelist.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_whitelist.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_whitelist.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_whohas.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_whohas.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_whohas.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_whohas.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_wildcard.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wildcard.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_wildcard.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wildcard.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_wipeflatlands.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wipeflatlands.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_wipeflatlands.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wipeflatlands.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/Command_wipeuserdata.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wipeuserdata.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/Command_wipeuserdata.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_wipeuserdata.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/FreedomCommand.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/FreedomCommand.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/FreedomCommand.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/FreedomCommand.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/FreedomCommandExecutor.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/FreedomCommandExecutor.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/FreedomCommandExecutor.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/FreedomCommandExecutor.java diff --git a/src/me/totalfreedom/totalfreedommod/commands/SourceType.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/SourceType.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/commands/SourceType.java rename to src/main/java/me/totalfreedom/totalfreedommod/commands/SourceType.java diff --git a/src/me/totalfreedom/totalfreedommod/config/ConfigConverter.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigConverter.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/config/ConfigConverter.java rename to src/main/java/me/totalfreedom/totalfreedommod/config/ConfigConverter.java diff --git a/src/me/totalfreedom/totalfreedommod/config/ConfigEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/config/ConfigEntry.java rename to src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java diff --git a/src/me/totalfreedom/totalfreedommod/config/FConfig.java b/src/main/java/me/totalfreedom/totalfreedommod/config/FConfig.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/config/FConfig.java rename to src/main/java/me/totalfreedom/totalfreedommod/config/FConfig.java diff --git a/src/me/totalfreedom/totalfreedommod/config/MainConfig.java b/src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/config/MainConfig.java rename to src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java diff --git a/src/me/totalfreedom/totalfreedommod/freeze/FreezeData.java b/src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/freeze/FreezeData.java rename to src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java diff --git a/src/me/totalfreedom/totalfreedommod/freeze/Freezer.java b/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/freeze/Freezer.java rename to src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java diff --git a/src/me/totalfreedom/totalfreedommod/fun/ItemFun.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/fun/ItemFun.java rename to src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java diff --git a/src/me/totalfreedom/totalfreedommod/fun/Jumppads.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/fun/Jumppads.java rename to src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java diff --git a/src/me/totalfreedom/totalfreedommod/fun/Landminer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/fun/Landminer.java rename to src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java diff --git a/src/me/totalfreedom/totalfreedommod/fun/MP44.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/fun/MP44.java rename to src/main/java/me/totalfreedom/totalfreedommod/fun/MP44.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/HTMLGenerationTools.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTMLGenerationTools.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/HTMLGenerationTools.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/HTMLGenerationTools.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/HTTPDModule.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDModule.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/HTTPDModule.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDModule.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/HTTPDPageBuilder.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDPageBuilder.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/HTTPDPageBuilder.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDPageBuilder.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_dump.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_dump.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_dump.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_dump.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_file.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_file.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_file.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_file.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_help.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_help.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_help.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_help.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_list.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_list.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_list.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_list.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_logs.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_logs.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_logs.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_logs.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_permbans.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_permbans.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_permbans.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_permbans.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_players.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_players.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_players.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_players.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/Module_schematic.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_schematic.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/Module_schematic.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/Module_schematic.java diff --git a/src/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java rename to src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java diff --git a/src/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/player/FPlayer.java rename to src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java diff --git a/src/me/totalfreedom/totalfreedommod/player/PlayerData.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/player/PlayerData.java rename to src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java diff --git a/src/me/totalfreedom/totalfreedommod/player/PlayerList.java b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/player/PlayerList.java rename to src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/ConsoleRank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/ConsoleRank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/ConsoleRank.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/ConsoleRank.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/CustomLoginRank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/CustomLoginRank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/CustomLoginRank.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/CustomLoginRank.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/PlayerRank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/PlayerRank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/PlayerRank.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/PlayerRank.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/Rank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/Rank.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/RankManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/RankManager.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/RankProxy.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankProxy.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/RankProxy.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/RankProxy.java diff --git a/src/me/totalfreedom/totalfreedommod/rank/TitleRank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/TitleRank.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rank/TitleRank.java rename to src/main/java/me/totalfreedom/totalfreedommod/rank/TitleRank.java diff --git a/src/me/totalfreedom/totalfreedommod/rollback/EntryType.java b/src/main/java/me/totalfreedom/totalfreedommod/rollback/EntryType.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rollback/EntryType.java rename to src/main/java/me/totalfreedom/totalfreedommod/rollback/EntryType.java diff --git a/src/me/totalfreedom/totalfreedommod/rollback/RollbackEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/rollback/RollbackEntry.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rollback/RollbackEntry.java rename to src/main/java/me/totalfreedom/totalfreedommod/rollback/RollbackEntry.java diff --git a/src/me/totalfreedom/totalfreedommod/rollback/RollbackManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rollback/RollbackManager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/rollback/RollbackManager.java rename to src/main/java/me/totalfreedom/totalfreedommod/rollback/RollbackManager.java diff --git a/src/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java b/src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java rename to src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java diff --git a/src/me/totalfreedom/totalfreedommod/util/FLog.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FLog.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/util/FLog.java rename to src/main/java/me/totalfreedom/totalfreedommod/util/FLog.java diff --git a/src/me/totalfreedom/totalfreedommod/util/FSync.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/util/FSync.java rename to src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java diff --git a/src/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/util/FUtil.java rename to src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java diff --git a/src/me/totalfreedom/totalfreedommod/world/AdminWorld.java b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/AdminWorld.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java diff --git a/src/me/totalfreedom/totalfreedommod/world/CleanroomBlockPopulator.java b/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomBlockPopulator.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/CleanroomBlockPopulator.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomBlockPopulator.java diff --git a/src/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java b/src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java diff --git a/src/me/totalfreedom/totalfreedommod/world/CustomWorld.java b/src/main/java/me/totalfreedom/totalfreedommod/world/CustomWorld.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/CustomWorld.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/CustomWorld.java diff --git a/src/me/totalfreedom/totalfreedommod/world/Flatlands.java b/src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/Flatlands.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java diff --git a/src/me/totalfreedom/totalfreedommod/world/WorldManager.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/WorldManager.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java diff --git a/src/me/totalfreedom/totalfreedommod/world/WorldTime.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldTime.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/WorldTime.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/WorldTime.java diff --git a/src/me/totalfreedom/totalfreedommod/world/WorldWeather.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java similarity index 100% rename from src/me/totalfreedom/totalfreedommod/world/WorldWeather.java rename to src/main/java/me/totalfreedom/totalfreedommod/world/WorldWeather.java diff --git a/src/org/mcstats/Metrics.java b/src/main/java/org/mcstats/Metrics.java similarity index 100% rename from src/org/mcstats/Metrics.java rename to src/main/java/org/mcstats/Metrics.java diff --git a/src/permban.yml b/src/main/java/permban.yml similarity index 100% rename from src/permban.yml rename to src/main/java/permban.yml diff --git a/src/plugin.yml b/src/main/java/plugin.yml similarity index 100% rename from src/plugin.yml rename to src/main/java/plugin.yml diff --git a/src/superadmin.yml b/src/main/java/superadmin.yml similarity index 100% rename from src/superadmin.yml rename to src/main/java/superadmin.yml diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties new file mode 100644 index 00000000..be700c5e --- /dev/null +++ b/src/main/resources/build.properties @@ -0,0 +1,4 @@ +program.build.author=${tfm.build.author} +program.build.version=${tfm.build.version} +program.build.number=${tfm.build.number} +program.build.date=${tfm.build.date}