diff --git a/.gitignore b/.gitignore index 99412a2a..29edf1d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,15 @@ /.project /.settings -# NetBeans +# netbeans /nbproject + +# we use maven! /build.xml +# maven +/target + # vim .*.sw[a-p] @@ -14,7 +19,15 @@ /build /bin /dist -/*.jardesc +/manifest.mf + +/world # Mac filesystem dust -.DS_Store \ No newline at end of file +/.DS_Store + +# intellij +*.iml +*.ipr +*.iws +.idea/ diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..3572571a --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml new file mode 100644 index 00000000..5c896b86 --- /dev/null +++ b/.idea/libraries/lib.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/capes/ally.png b/capes/ally.png deleted file mode 100644 index 83deef32..00000000 Binary files a/capes/ally.png and /dev/null differ diff --git a/capes/capes.psd b/capes/capes.psd deleted file mode 100644 index 7739624e..00000000 Binary files a/capes/capes.psd and /dev/null differ diff --git a/capes/enemy.png b/capes/enemy.png deleted file mode 100644 index 0e779b36..00000000 Binary files a/capes/enemy.png and /dev/null differ diff --git a/capes/member.png b/capes/member.png deleted file mode 100644 index 9b27e576..00000000 Binary files a/capes/member.png and /dev/null differ diff --git a/capes/neutral.png b/capes/neutral.png deleted file mode 100644 index 949df649..00000000 Binary files a/capes/neutral.png and /dev/null differ diff --git a/capes/peaceful.png b/capes/peaceful.png deleted file mode 100644 index b1788133..00000000 Binary files a/capes/peaceful.png and /dev/null differ diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar deleted file mode 100644 index 4a599645..00000000 Binary files a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar and /dev/null differ diff --git a/lib/Essentials.jar b/lib/Essentials.jar deleted file mode 100644 index e5eb8479..00000000 Binary files a/lib/Essentials.jar and /dev/null differ diff --git a/lib/EssentialsChat_2.x.jar b/lib/EssentialsChat_2.x.jar deleted file mode 100644 index f4b54b72..00000000 Binary files a/lib/EssentialsChat_2.x.jar and /dev/null differ diff --git a/lib/EssentialsChat_3_dev.jar b/lib/EssentialsChat_3_dev.jar deleted file mode 100644 index ec0a3cfa..00000000 Binary files a/lib/EssentialsChat_3_dev.jar and /dev/null differ diff --git a/lib/LWC.jar b/lib/LWC.jar deleted file mode 100644 index 2cfd17c8..00000000 Binary files a/lib/LWC.jar and /dev/null differ diff --git a/lib/MCore.jar b/lib/MCore.jar deleted file mode 100644 index 4cc81d78..00000000 Binary files a/lib/MCore.jar and /dev/null differ diff --git a/lib/SpoutPlugin.jar b/lib/SpoutPlugin.jar deleted file mode 100644 index f7a8dfc0..00000000 Binary files a/lib/SpoutPlugin.jar and /dev/null differ diff --git a/lib/Vault.jar b/lib/Vault.jar deleted file mode 100644 index 4a452b0f..00000000 Binary files a/lib/Vault.jar and /dev/null differ diff --git a/lib/WorldEdit.jar b/lib/WorldEdit.jar deleted file mode 100644 index 7a976aae..00000000 Binary files a/lib/WorldEdit.jar and /dev/null differ diff --git a/lib/WorldGuard.jar b/lib/WorldGuard.jar deleted file mode 100644 index fb4bea33..00000000 Binary files a/lib/WorldGuard.jar and /dev/null differ diff --git a/lib/capi.jar b/lib/capi.jar deleted file mode 100644 index 7659562e..00000000 Binary files a/lib/capi.jar and /dev/null differ diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar deleted file mode 100644 index 4fa6effd..00000000 Binary files a/lib/craftbukkit.jar and /dev/null differ diff --git a/lib/junit/junit-3.8.2-api.zip b/lib/junit/junit-3.8.2-api.zip deleted file mode 100644 index 6d792fda..00000000 Binary files a/lib/junit/junit-3.8.2-api.zip and /dev/null differ diff --git a/lib/junit/junit-3.8.2.jar b/lib/junit/junit-3.8.2.jar deleted file mode 100644 index d8358726..00000000 Binary files a/lib/junit/junit-3.8.2.jar and /dev/null differ diff --git a/lib/junit_4/junit-4.5-api.zip b/lib/junit_4/junit-4.5-api.zip deleted file mode 100644 index 5748c444..00000000 Binary files a/lib/junit_4/junit-4.5-api.zip and /dev/null differ diff --git a/lib/junit_4/junit-4.5-src.jar b/lib/junit_4/junit-4.5-src.jar deleted file mode 100644 index 18774a57..00000000 Binary files a/lib/junit_4/junit-4.5-src.jar and /dev/null differ diff --git a/lib/junit_4/junit-4.5.jar b/lib/junit_4/junit-4.5.jar deleted file mode 100644 index 83f8bc79..00000000 Binary files a/lib/junit_4/junit-4.5.jar and /dev/null differ diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties deleted file mode 100644 index 9137b06b..00000000 --- a/lib/nblibraries.properties +++ /dev/null @@ -1,12 +0,0 @@ -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.junit.classpath=\ - ${base}/junit/junit-3.8.2.jar -libs.junit.javadoc=\ - ${base}/junit/junit-3.8.2-api.zip -libs.junit_4.classpath=\ - ${base}/junit_4/junit-4.5.jar -libs.junit_4.javadoc=\ - ${base}/junit_4/junit-4.5-api.zip -libs.junit_4.src=\ - ${base}/junit_4/junit-4.5-src.jar diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..11a83a20 --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + + com.minetime + Factions + 1.6.9.5-SNAPSHOT + jar + + Factions + http://maven.apache.org + + + UTF-8 + + + + clean package install + Factions + ${basedir}/src/main/java + + + . + true + ${basedir}/src/main/resources/ + + *.yml + + + + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + + + org.bukkit + bukkit + LATEST + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + + + diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 00000000..95fa38d7 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 00000000..fa4f419b Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/src/main/java/.DS_Store differ diff --git a/src/com/massivecraft/factions/Board.java b/src/main/java/com/massivecraft/factions/Board.java similarity index 100% rename from src/com/massivecraft/factions/Board.java rename to src/main/java/com/massivecraft/factions/Board.java diff --git a/src/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java similarity index 100% rename from src/com/massivecraft/factions/Conf.java rename to src/main/java/com/massivecraft/factions/Conf.java diff --git a/src/com/massivecraft/factions/FLocation.java b/src/main/java/com/massivecraft/factions/FLocation.java similarity index 100% rename from src/com/massivecraft/factions/FLocation.java rename to src/main/java/com/massivecraft/factions/FLocation.java diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/main/java/com/massivecraft/factions/FPlayer.java similarity index 100% rename from src/com/massivecraft/factions/FPlayer.java rename to src/main/java/com/massivecraft/factions/FPlayer.java diff --git a/src/com/massivecraft/factions/FPlayers.java b/src/main/java/com/massivecraft/factions/FPlayers.java similarity index 100% rename from src/com/massivecraft/factions/FPlayers.java rename to src/main/java/com/massivecraft/factions/FPlayers.java diff --git a/src/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java similarity index 100% rename from src/com/massivecraft/factions/Faction.java rename to src/main/java/com/massivecraft/factions/Faction.java diff --git a/src/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java similarity index 100% rename from src/com/massivecraft/factions/Factions.java rename to src/main/java/com/massivecraft/factions/Factions.java diff --git a/src/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java similarity index 100% rename from src/com/massivecraft/factions/P.java rename to src/main/java/com/massivecraft/factions/P.java diff --git a/src/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdAdmin.java rename to src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java diff --git a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdAutoClaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdAutoHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdAutoHelp.java rename to src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java diff --git a/src/com/massivecraft/factions/cmd/CmdBoom.java b/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdBoom.java rename to src/main/java/com/massivecraft/factions/cmd/CmdBoom.java diff --git a/src/com/massivecraft/factions/cmd/CmdBypass.java b/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdBypass.java rename to src/main/java/com/massivecraft/factions/cmd/CmdBypass.java diff --git a/src/com/massivecraft/factions/cmd/CmdChat.java b/src/main/java/com/massivecraft/factions/cmd/CmdChat.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdChat.java rename to src/main/java/com/massivecraft/factions/cmd/CmdChat.java diff --git a/src/com/massivecraft/factions/cmd/CmdChatSpy.java b/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdChatSpy.java rename to src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java diff --git a/src/com/massivecraft/factions/cmd/CmdClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdClaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdClaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdConfig.java b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdConfig.java rename to src/main/java/com/massivecraft/factions/cmd/CmdConfig.java diff --git a/src/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdCreate.java rename to src/main/java/com/massivecraft/factions/cmd/CmdCreate.java diff --git a/src/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdDeinvite.java rename to src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java diff --git a/src/com/massivecraft/factions/cmd/CmdDescription.java b/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdDescription.java rename to src/main/java/com/massivecraft/factions/cmd/CmdDescription.java diff --git a/src/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdDisband.java rename to src/main/java/com/massivecraft/factions/cmd/CmdDisband.java diff --git a/src/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdHelp.java rename to src/main/java/com/massivecraft/factions/cmd/CmdHelp.java diff --git a/src/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdHome.java rename to src/main/java/com/massivecraft/factions/cmd/CmdHome.java diff --git a/src/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdInvite.java rename to src/main/java/com/massivecraft/factions/cmd/CmdInvite.java diff --git a/src/com/massivecraft/factions/cmd/CmdJoin.java b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdJoin.java rename to src/main/java/com/massivecraft/factions/cmd/CmdJoin.java diff --git a/src/com/massivecraft/factions/cmd/CmdKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdKick.java rename to src/main/java/com/massivecraft/factions/cmd/CmdKick.java diff --git a/src/com/massivecraft/factions/cmd/CmdLeave.java b/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdLeave.java rename to src/main/java/com/massivecraft/factions/cmd/CmdLeave.java diff --git a/src/com/massivecraft/factions/cmd/CmdList.java b/src/main/java/com/massivecraft/factions/cmd/CmdList.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdList.java rename to src/main/java/com/massivecraft/factions/cmd/CmdList.java diff --git a/src/com/massivecraft/factions/cmd/CmdLock.java b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdLock.java rename to src/main/java/com/massivecraft/factions/cmd/CmdLock.java diff --git a/src/com/massivecraft/factions/cmd/CmdMap.java b/src/main/java/com/massivecraft/factions/cmd/CmdMap.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMap.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMap.java diff --git a/src/com/massivecraft/factions/cmd/CmdMod.java b/src/main/java/com/massivecraft/factions/cmd/CmdMod.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMod.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMod.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoney.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoney.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoney.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyBalance.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java rename to src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java diff --git a/src/com/massivecraft/factions/cmd/CmdOpen.java b/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdOpen.java rename to src/main/java/com/massivecraft/factions/cmd/CmdOpen.java diff --git a/src/com/massivecraft/factions/cmd/CmdOwner.java b/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdOwner.java rename to src/main/java/com/massivecraft/factions/cmd/CmdOwner.java diff --git a/src/com/massivecraft/factions/cmd/CmdOwnerList.java b/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdOwnerList.java rename to src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java diff --git a/src/com/massivecraft/factions/cmd/CmdPeaceful.java b/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdPeaceful.java rename to src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java diff --git a/src/com/massivecraft/factions/cmd/CmdPermanent.java b/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdPermanent.java rename to src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java diff --git a/src/com/massivecraft/factions/cmd/CmdPermanentPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdPermanentPower.java rename to src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java diff --git a/src/com/massivecraft/factions/cmd/CmdPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdPower.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdPower.java rename to src/main/java/com/massivecraft/factions/cmd/CmdPower.java diff --git a/src/com/massivecraft/factions/cmd/CmdPowerBoost.java b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdPowerBoost.java rename to src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java diff --git a/src/com/massivecraft/factions/cmd/CmdRelationAlly.java b/src/main/java/com/massivecraft/factions/cmd/CmdRelationAlly.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdRelationAlly.java rename to src/main/java/com/massivecraft/factions/cmd/CmdRelationAlly.java diff --git a/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java b/src/main/java/com/massivecraft/factions/cmd/CmdRelationEnemy.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdRelationEnemy.java rename to src/main/java/com/massivecraft/factions/cmd/CmdRelationEnemy.java diff --git a/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java b/src/main/java/com/massivecraft/factions/cmd/CmdRelationNeutral.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdRelationNeutral.java rename to src/main/java/com/massivecraft/factions/cmd/CmdRelationNeutral.java diff --git a/src/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdReload.java rename to src/main/java/com/massivecraft/factions/cmd/CmdReload.java diff --git a/src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java rename to src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java diff --git a/src/com/massivecraft/factions/cmd/CmdSaveAll.java b/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdSaveAll.java rename to src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java diff --git a/src/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdSethome.java rename to src/main/java/com/massivecraft/factions/cmd/CmdSethome.java diff --git a/src/com/massivecraft/factions/cmd/CmdShow.java b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdShow.java rename to src/main/java/com/massivecraft/factions/cmd/CmdShow.java diff --git a/src/com/massivecraft/factions/cmd/CmdTag.java b/src/main/java/com/massivecraft/factions/cmd/CmdTag.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdTag.java rename to src/main/java/com/massivecraft/factions/cmd/CmdTag.java diff --git a/src/com/massivecraft/factions/cmd/CmdTitle.java b/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdTitle.java rename to src/main/java/com/massivecraft/factions/cmd/CmdTitle.java diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdUnclaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdUnclaimall.java rename to src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java diff --git a/src/com/massivecraft/factions/cmd/CmdVersion.java b/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdVersion.java rename to src/main/java/com/massivecraft/factions/cmd/CmdVersion.java diff --git a/src/com/massivecraft/factions/cmd/CmdWarunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdWarunclaimall.java rename to src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java diff --git a/src/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java similarity index 100% rename from src/com/massivecraft/factions/cmd/FCmdRoot.java rename to src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java similarity index 100% rename from src/com/massivecraft/factions/cmd/FCommand.java rename to src/main/java/com/massivecraft/factions/cmd/FCommand.java diff --git a/src/com/massivecraft/factions/cmd/FRelationCommand.java b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java similarity index 100% rename from src/com/massivecraft/factions/cmd/FRelationCommand.java rename to src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java diff --git a/src/com/massivecraft/factions/event/FPlayerJoinEvent.java b/src/main/java/com/massivecraft/factions/event/FPlayerJoinEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FPlayerJoinEvent.java rename to src/main/java/com/massivecraft/factions/event/FPlayerJoinEvent.java diff --git a/src/com/massivecraft/factions/event/FPlayerLeaveEvent.java b/src/main/java/com/massivecraft/factions/event/FPlayerLeaveEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FPlayerLeaveEvent.java rename to src/main/java/com/massivecraft/factions/event/FPlayerLeaveEvent.java diff --git a/src/com/massivecraft/factions/event/FactionCreateEvent.java b/src/main/java/com/massivecraft/factions/event/FactionCreateEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FactionCreateEvent.java rename to src/main/java/com/massivecraft/factions/event/FactionCreateEvent.java diff --git a/src/com/massivecraft/factions/event/FactionDisbandEvent.java b/src/main/java/com/massivecraft/factions/event/FactionDisbandEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FactionDisbandEvent.java rename to src/main/java/com/massivecraft/factions/event/FactionDisbandEvent.java diff --git a/src/com/massivecraft/factions/event/FactionRelationEvent.java b/src/main/java/com/massivecraft/factions/event/FactionRelationEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FactionRelationEvent.java rename to src/main/java/com/massivecraft/factions/event/FactionRelationEvent.java diff --git a/src/com/massivecraft/factions/event/FactionRenameEvent.java b/src/main/java/com/massivecraft/factions/event/FactionRenameEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/FactionRenameEvent.java rename to src/main/java/com/massivecraft/factions/event/FactionRenameEvent.java diff --git a/src/com/massivecraft/factions/event/LandClaimEvent.java b/src/main/java/com/massivecraft/factions/event/LandClaimEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/LandClaimEvent.java rename to src/main/java/com/massivecraft/factions/event/LandClaimEvent.java diff --git a/src/com/massivecraft/factions/event/LandUnclaimAllEvent.java b/src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/LandUnclaimAllEvent.java rename to src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java diff --git a/src/com/massivecraft/factions/event/LandUnclaimEvent.java b/src/main/java/com/massivecraft/factions/event/LandUnclaimEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/LandUnclaimEvent.java rename to src/main/java/com/massivecraft/factions/event/LandUnclaimEvent.java diff --git a/src/com/massivecraft/factions/event/PowerLossEvent.java b/src/main/java/com/massivecraft/factions/event/PowerLossEvent.java similarity index 100% rename from src/com/massivecraft/factions/event/PowerLossEvent.java rename to src/main/java/com/massivecraft/factions/event/PowerLossEvent.java diff --git a/src/com/massivecraft/factions/iface/EconomyParticipator.java b/src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java similarity index 100% rename from src/com/massivecraft/factions/iface/EconomyParticipator.java rename to src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java diff --git a/src/com/massivecraft/factions/iface/RelationParticipator.java b/src/main/java/com/massivecraft/factions/iface/RelationParticipator.java similarity index 100% rename from src/com/massivecraft/factions/iface/RelationParticipator.java rename to src/main/java/com/massivecraft/factions/iface/RelationParticipator.java diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/main/java/com/massivecraft/factions/integration/Econ.java similarity index 100% rename from src/com/massivecraft/factions/integration/Econ.java rename to src/main/java/com/massivecraft/factions/integration/Econ.java diff --git a/src/com/massivecraft/factions/integration/EssentialsFeatures.java b/src/main/java/com/massivecraft/factions/integration/EssentialsFeatures.java similarity index 100% rename from src/com/massivecraft/factions/integration/EssentialsFeatures.java rename to src/main/java/com/massivecraft/factions/integration/EssentialsFeatures.java diff --git a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java b/src/main/java/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java similarity index 100% rename from src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java rename to src/main/java/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java diff --git a/src/com/massivecraft/factions/integration/LWCFeatures.java b/src/main/java/com/massivecraft/factions/integration/LWCFeatures.java similarity index 100% rename from src/com/massivecraft/factions/integration/LWCFeatures.java rename to src/main/java/com/massivecraft/factions/integration/LWCFeatures.java diff --git a/src/com/massivecraft/factions/integration/SpoutFeatures.java b/src/main/java/com/massivecraft/factions/integration/SpoutFeatures.java similarity index 100% rename from src/com/massivecraft/factions/integration/SpoutFeatures.java rename to src/main/java/com/massivecraft/factions/integration/SpoutFeatures.java diff --git a/src/com/massivecraft/factions/integration/SpoutMainListener.java b/src/main/java/com/massivecraft/factions/integration/SpoutMainListener.java similarity index 100% rename from src/com/massivecraft/factions/integration/SpoutMainListener.java rename to src/main/java/com/massivecraft/factions/integration/SpoutMainListener.java diff --git a/src/com/massivecraft/factions/integration/Worldguard.java b/src/main/java/com/massivecraft/factions/integration/Worldguard.java similarity index 100% rename from src/com/massivecraft/factions/integration/Worldguard.java rename to src/main/java/com/massivecraft/factions/integration/Worldguard.java diff --git a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java b/src/main/java/com/massivecraft/factions/integration/capi/CapiFeatures.java similarity index 100% rename from src/com/massivecraft/factions/integration/capi/CapiFeatures.java rename to src/main/java/com/massivecraft/factions/integration/capi/CapiFeatures.java diff --git a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java b/src/main/java/com/massivecraft/factions/integration/capi/PluginCapiListener.java similarity index 100% rename from src/com/massivecraft/factions/integration/capi/PluginCapiListener.java rename to src/main/java/com/massivecraft/factions/integration/capi/PluginCapiListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsBlockListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsChatListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsEntityListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsExploitListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsExploitListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsPlayerListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java diff --git a/src/com/massivecraft/factions/listeners/FactionsServerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsServerListener.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsServerListener.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsServerListener.java diff --git a/src/com/massivecraft/factions/struct/ChatMode.java b/src/main/java/com/massivecraft/factions/struct/ChatMode.java similarity index 100% rename from src/com/massivecraft/factions/struct/ChatMode.java rename to src/main/java/com/massivecraft/factions/struct/ChatMode.java diff --git a/src/com/massivecraft/factions/struct/Permission.java b/src/main/java/com/massivecraft/factions/struct/Permission.java similarity index 100% rename from src/com/massivecraft/factions/struct/Permission.java rename to src/main/java/com/massivecraft/factions/struct/Permission.java diff --git a/src/com/massivecraft/factions/struct/Relation.java b/src/main/java/com/massivecraft/factions/struct/Relation.java similarity index 100% rename from src/com/massivecraft/factions/struct/Relation.java rename to src/main/java/com/massivecraft/factions/struct/Relation.java diff --git a/src/com/massivecraft/factions/struct/Role.java b/src/main/java/com/massivecraft/factions/struct/Role.java similarity index 100% rename from src/com/massivecraft/factions/struct/Role.java rename to src/main/java/com/massivecraft/factions/struct/Role.java diff --git a/src/com/massivecraft/factions/util/AsciiCompass.java b/src/main/java/com/massivecraft/factions/util/AsciiCompass.java similarity index 100% rename from src/com/massivecraft/factions/util/AsciiCompass.java rename to src/main/java/com/massivecraft/factions/util/AsciiCompass.java diff --git a/src/com/massivecraft/factions/util/AutoLeaveProcessTask.java b/src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java similarity index 100% rename from src/com/massivecraft/factions/util/AutoLeaveProcessTask.java rename to src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java diff --git a/src/com/massivecraft/factions/util/AutoLeaveTask.java b/src/main/java/com/massivecraft/factions/util/AutoLeaveTask.java similarity index 100% rename from src/com/massivecraft/factions/util/AutoLeaveTask.java rename to src/main/java/com/massivecraft/factions/util/AutoLeaveTask.java diff --git a/src/com/massivecraft/factions/util/LazyLocation.java b/src/main/java/com/massivecraft/factions/util/LazyLocation.java similarity index 100% rename from src/com/massivecraft/factions/util/LazyLocation.java rename to src/main/java/com/massivecraft/factions/util/LazyLocation.java diff --git a/src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java b/src/main/java/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java similarity index 100% rename from src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java rename to src/main/java/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java diff --git a/src/com/massivecraft/factions/util/MiscUtil.java b/src/main/java/com/massivecraft/factions/util/MiscUtil.java similarity index 100% rename from src/com/massivecraft/factions/util/MiscUtil.java rename to src/main/java/com/massivecraft/factions/util/MiscUtil.java diff --git a/src/com/massivecraft/factions/util/MyLocationTypeAdapter.java b/src/main/java/com/massivecraft/factions/util/MyLocationTypeAdapter.java similarity index 100% rename from src/com/massivecraft/factions/util/MyLocationTypeAdapter.java rename to src/main/java/com/massivecraft/factions/util/MyLocationTypeAdapter.java diff --git a/src/com/massivecraft/factions/util/RelationUtil.java b/src/main/java/com/massivecraft/factions/util/RelationUtil.java similarity index 100% rename from src/com/massivecraft/factions/util/RelationUtil.java rename to src/main/java/com/massivecraft/factions/util/RelationUtil.java diff --git a/src/com/massivecraft/factions/util/SpiralTask.java b/src/main/java/com/massivecraft/factions/util/SpiralTask.java similarity index 100% rename from src/com/massivecraft/factions/util/SpiralTask.java rename to src/main/java/com/massivecraft/factions/util/SpiralTask.java diff --git a/src/com/massivecraft/factions/zcore/CommandVisibility.java b/src/main/java/com/massivecraft/factions/zcore/CommandVisibility.java similarity index 100% rename from src/com/massivecraft/factions/zcore/CommandVisibility.java rename to src/main/java/com/massivecraft/factions/zcore/CommandVisibility.java diff --git a/src/com/massivecraft/factions/zcore/Lang.java b/src/main/java/com/massivecraft/factions/zcore/Lang.java similarity index 100% rename from src/com/massivecraft/factions/zcore/Lang.java rename to src/main/java/com/massivecraft/factions/zcore/Lang.java diff --git a/src/com/massivecraft/factions/zcore/MCommand.java b/src/main/java/com/massivecraft/factions/zcore/MCommand.java similarity index 100% rename from src/com/massivecraft/factions/zcore/MCommand.java rename to src/main/java/com/massivecraft/factions/zcore/MCommand.java diff --git a/src/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java similarity index 100% rename from src/com/massivecraft/factions/zcore/MPlugin.java rename to src/main/java/com/massivecraft/factions/zcore/MPlugin.java diff --git a/src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java b/src/main/java/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java similarity index 100% rename from src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java rename to src/main/java/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java diff --git a/src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java b/src/main/java/com/massivecraft/factions/zcore/MPluginSecretServerListener.java similarity index 100% rename from src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java rename to src/main/java/com/massivecraft/factions/zcore/MPluginSecretServerListener.java diff --git a/src/com/massivecraft/factions/zcore/persist/EM.java b/src/main/java/com/massivecraft/factions/zcore/persist/EM.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/EM.java rename to src/main/java/com/massivecraft/factions/zcore/persist/EM.java diff --git a/src/com/massivecraft/factions/zcore/persist/Entity.java b/src/main/java/com/massivecraft/factions/zcore/persist/Entity.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/Entity.java rename to src/main/java/com/massivecraft/factions/zcore/persist/Entity.java diff --git a/src/com/massivecraft/factions/zcore/persist/EntityCollection.java b/src/main/java/com/massivecraft/factions/zcore/persist/EntityCollection.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/EntityCollection.java rename to src/main/java/com/massivecraft/factions/zcore/persist/EntityCollection.java diff --git a/src/com/massivecraft/factions/zcore/persist/PlayerEntity.java b/src/main/java/com/massivecraft/factions/zcore/persist/PlayerEntity.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/PlayerEntity.java rename to src/main/java/com/massivecraft/factions/zcore/persist/PlayerEntity.java diff --git a/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java b/src/main/java/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java rename to src/main/java/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java diff --git a/src/com/massivecraft/factions/zcore/persist/SaveTask.java b/src/main/java/com/massivecraft/factions/zcore/persist/SaveTask.java similarity index 100% rename from src/com/massivecraft/factions/zcore/persist/SaveTask.java rename to src/main/java/com/massivecraft/factions/zcore/persist/SaveTask.java diff --git a/src/com/massivecraft/factions/zcore/util/ClassLoadHack.java b/src/main/java/com/massivecraft/factions/zcore/util/ClassLoadHack.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/ClassLoadHack.java rename to src/main/java/com/massivecraft/factions/zcore/util/ClassLoadHack.java diff --git a/src/com/massivecraft/factions/zcore/util/DiscUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/DiscUtil.java rename to src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java diff --git a/src/com/massivecraft/factions/zcore/util/LibLoader.java b/src/main/java/com/massivecraft/factions/zcore/util/LibLoader.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/LibLoader.java rename to src/main/java/com/massivecraft/factions/zcore/util/LibLoader.java diff --git a/src/com/massivecraft/factions/zcore/util/PermUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/PermUtil.java rename to src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java diff --git a/src/com/massivecraft/factions/zcore/util/Persist.java b/src/main/java/com/massivecraft/factions/zcore/util/Persist.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/Persist.java rename to src/main/java/com/massivecraft/factions/zcore/util/Persist.java diff --git a/src/com/massivecraft/factions/zcore/util/SmokeUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/SmokeUtil.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/SmokeUtil.java rename to src/main/java/com/massivecraft/factions/zcore/util/SmokeUtil.java diff --git a/src/com/massivecraft/factions/zcore/util/TextUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/TextUtil.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/TextUtil.java rename to src/main/java/com/massivecraft/factions/zcore/util/TextUtil.java diff --git a/src/com/massivecraft/factions/zcore/util/WorldUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/WorldUtil.java similarity index 100% rename from src/com/massivecraft/factions/zcore/util/WorldUtil.java rename to src/main/java/com/massivecraft/factions/zcore/util/WorldUtil.java diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/src/main/resources/.DS_Store differ diff --git a/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from plugin.yml rename to src/main/resources/plugin.yml