diff --git a/lib/Vault-1.5.2.jar b/lib/Vault-1.5.2.jar new file mode 100644 index 00000000..85adf982 Binary files /dev/null and b/lib/Vault-1.5.2.jar differ diff --git a/src/main/resources/plugin.yml b/plugin.yml similarity index 99% rename from src/main/resources/plugin.yml rename to plugin.yml index d660755d..3f97d410 100644 --- a/src/main/resources/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ main: com.massivecraft.factions.Factions name: Factions -version: ${project.version} +version: 2.7.5 website: http://massivecraft.com/factions authors: [Cayorion, Brettflan] description: §eFactions allows the players to team up and claim land as their own and start wars with other factions. This way we hope to inspire politics, intrigue, and team spirit. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead Factions programmer. Feel free to visit us at §bhttp://massivecraft.com diff --git a/pom.xml b/pom.xml deleted file mode 100644 index d54d6c18..00000000 --- a/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - 4.0.0 - - Factions - http://www.massivecraft.com/factions - - com.massivecraft - Factions - 2.7.5 - - - UTF-8 - - - - install - Factions - ${basedir}/src/main/java/ - - - . - ${basedir}/src/main/resources/ - true - - *.yml - *.md - *.txt - - - - - - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - - - - - com.massivecraft - MassiveCore - LATEST - - - org.dthielke - HeroChat - 5.6.7 - system - ${project.basedir}/lib/HeroChat-5.6.7.jar - - - com.griefcraft - LWC - 4.4.0 - system - ${project.basedir}/lib/LWC-4.4.0.jar - - - - diff --git a/src/main/java/com/massivecraft/factions/Const.java b/src/com/massivecraft/factions/Const.java similarity index 100% rename from src/main/java/com/massivecraft/factions/Const.java rename to src/com/massivecraft/factions/Const.java diff --git a/src/main/java/com/massivecraft/factions/EconomyParticipator.java b/src/com/massivecraft/factions/EconomyParticipator.java similarity index 100% rename from src/main/java/com/massivecraft/factions/EconomyParticipator.java rename to src/com/massivecraft/factions/EconomyParticipator.java diff --git a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/com/massivecraft/factions/ExtractorFactionAccountId.java similarity index 100% rename from src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java rename to src/com/massivecraft/factions/ExtractorFactionAccountId.java diff --git a/src/main/java/com/massivecraft/factions/FactionEqualsPredictate.java b/src/com/massivecraft/factions/FactionEqualsPredictate.java similarity index 100% rename from src/main/java/com/massivecraft/factions/FactionEqualsPredictate.java rename to src/com/massivecraft/factions/FactionEqualsPredictate.java diff --git a/src/main/java/com/massivecraft/factions/FactionListComparator.java b/src/com/massivecraft/factions/FactionListComparator.java similarity index 100% rename from src/main/java/com/massivecraft/factions/FactionListComparator.java rename to src/com/massivecraft/factions/FactionListComparator.java diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java similarity index 97% rename from src/main/java/com/massivecraft/factions/Factions.java rename to src/com/massivecraft/factions/Factions.java index bd0378da..ea22eb6b 100644 --- a/src/main/java/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -163,10 +163,10 @@ public class Factions extends MassivePlugin SpigotFeatures.activate(); // Modulo Repeat Tasks - TaskPlayerPowerUpdate.get().activate(this); - TaskPlayerDataRemove.get().activate(this); - TaskEconLandReward.get().activate(this); - TaskFlagPermCreate.get().activate(this); + TaskPlayerPowerUpdate.get().activate(); + TaskPlayerDataRemove.get().activate(); + TaskEconLandReward.get().activate(); + TaskFlagPermCreate.get().activate(); // Register built in chat modifiers ChatModifierLc.get().register(); diff --git a/src/main/java/com/massivecraft/factions/Lang.java b/src/com/massivecraft/factions/Lang.java similarity index 100% rename from src/main/java/com/massivecraft/factions/Lang.java rename to src/com/massivecraft/factions/Lang.java diff --git a/src/main/java/com/massivecraft/factions/Perm.java b/src/com/massivecraft/factions/Perm.java similarity index 100% rename from src/main/java/com/massivecraft/factions/Perm.java rename to src/com/massivecraft/factions/Perm.java diff --git a/src/main/java/com/massivecraft/factions/PlayerRoleComparator.java b/src/com/massivecraft/factions/PlayerRoleComparator.java similarity index 100% rename from src/main/java/com/massivecraft/factions/PlayerRoleComparator.java rename to src/com/massivecraft/factions/PlayerRoleComparator.java diff --git a/src/main/java/com/massivecraft/factions/Rel.java b/src/com/massivecraft/factions/Rel.java similarity index 100% rename from src/main/java/com/massivecraft/factions/Rel.java rename to src/com/massivecraft/factions/Rel.java diff --git a/src/main/java/com/massivecraft/factions/RelationParticipator.java b/src/com/massivecraft/factions/RelationParticipator.java similarity index 100% rename from src/main/java/com/massivecraft/factions/RelationParticipator.java rename to src/com/massivecraft/factions/RelationParticipator.java diff --git a/src/main/java/com/massivecraft/factions/TerritoryAccess.java b/src/com/massivecraft/factions/TerritoryAccess.java similarity index 100% rename from src/main/java/com/massivecraft/factions/TerritoryAccess.java rename to src/com/massivecraft/factions/TerritoryAccess.java diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java b/src/com/massivecraft/factions/adapter/BoardAdapter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java rename to src/com/massivecraft/factions/adapter/BoardAdapter.java diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java rename to src/com/massivecraft/factions/adapter/BoardMapAdapter.java diff --git a/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java b/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java rename to src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java diff --git a/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java b/src/com/massivecraft/factions/adapter/RelAdapter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/adapter/RelAdapter.java rename to src/com/massivecraft/factions/adapter/RelAdapter.java diff --git a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java rename to src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java diff --git a/src/main/java/com/massivecraft/factions/chat/ChatFormatter.java b/src/com/massivecraft/factions/chat/ChatFormatter.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/ChatFormatter.java rename to src/com/massivecraft/factions/chat/ChatFormatter.java diff --git a/src/main/java/com/massivecraft/factions/chat/ChatModifier.java b/src/com/massivecraft/factions/chat/ChatModifier.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/ChatModifier.java rename to src/com/massivecraft/factions/chat/ChatModifier.java diff --git a/src/main/java/com/massivecraft/factions/chat/ChatModifierAbstract.java b/src/com/massivecraft/factions/chat/ChatModifierAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/ChatModifierAbstract.java rename to src/com/massivecraft/factions/chat/ChatModifierAbstract.java diff --git a/src/main/java/com/massivecraft/factions/chat/ChatTag.java b/src/com/massivecraft/factions/chat/ChatTag.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/ChatTag.java rename to src/com/massivecraft/factions/chat/ChatTag.java diff --git a/src/main/java/com/massivecraft/factions/chat/ChatTagAbstract.java b/src/com/massivecraft/factions/chat/ChatTagAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/ChatTagAbstract.java rename to src/com/massivecraft/factions/chat/ChatTagAbstract.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java rename to src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/com/massivecraft/factions/chat/tag/ChatTagName.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java rename to src/com/massivecraft/factions/chat/tag/ChatTagName.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java rename to src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java rename to src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java rename to src/com/massivecraft/factions/chat/tag/ChatTagRole.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java rename to src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java rename to src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java similarity index 100% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java rename to src/com/massivecraft/factions/chat/tag/ChatTagTitle.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java b/src/com/massivecraft/factions/cmd/CmdFactions.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactions.java rename to src/com/massivecraft/factions/cmd/CmdFactions.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccess.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAdmin.java b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAdmin.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java rename to src/com/massivecraft/factions/cmd/CmdFactionsClaim.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCreate.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java b/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDescription.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDisband.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsExpansions.java b/src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsExpansions.java rename to src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java rename to src/com/massivecraft/factions/cmd/CmdFactionsFaction.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java rename to src/com/massivecraft/factions/cmd/CmdFactionsFlag.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java rename to src/com/massivecraft/factions/cmd/CmdFactionsHome.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java rename to src/com/massivecraft/factions/cmd/CmdFactionsInvite.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java rename to src/com/massivecraft/factions/cmd/CmdFactionsJoin.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java rename to src/com/massivecraft/factions/cmd/CmdFactionsKick.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java rename to src/com/massivecraft/factions/cmd/CmdFactionsLeave.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java rename to src/com/massivecraft/factions/cmd/CmdFactionsList.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMap.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoney.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java b/src/com/massivecraft/factions/cmd/CmdFactionsMotd.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMotd.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/com/massivecraft/factions/cmd/CmdFactionsName.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java rename to src/com/massivecraft/factions/cmd/CmdFactionsName.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPerm.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRank.java b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRank.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRank.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankOld.java b/src/com/massivecraft/factions/cmd/CmdFactionsRankOld.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankOld.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRankOld.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOne.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOne.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetX.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetX.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetX.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSethome.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java rename to src/com/massivecraft/factions/cmd/CmdFactionsTitle.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java rename to src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java rename to src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsXDeprecated.java b/src/com/massivecraft/factions/cmd/CmdFactionsXDeprecated.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsXDeprecated.java rename to src/com/massivecraft/factions/cmd/CmdFactionsXDeprecated.java diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsXPlaceholder.java b/src/com/massivecraft/factions/cmd/CmdFactionsXPlaceholder.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsXPlaceholder.java rename to src/com/massivecraft/factions/cmd/CmdFactionsXPlaceholder.java diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommand.java b/src/com/massivecraft/factions/cmd/FactionsCommand.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/FactionsCommand.java rename to src/com/massivecraft/factions/cmd/FactionsCommand.java diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandHome.java b/src/com/massivecraft/factions/cmd/FactionsCommandHome.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/FactionsCommandHome.java rename to src/com/massivecraft/factions/cmd/FactionsCommandHome.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/com/massivecraft/factions/cmd/arg/ARFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARFaction.java rename to src/com/massivecraft/factions/cmd/arg/ARFaction.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARMFlag.java b/src/com/massivecraft/factions/cmd/arg/ARMFlag.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARMFlag.java rename to src/com/massivecraft/factions/cmd/arg/ARMFlag.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARMPerm.java b/src/com/massivecraft/factions/cmd/arg/ARMPerm.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARMPerm.java rename to src/com/massivecraft/factions/cmd/arg/ARMPerm.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARMPlayer.java b/src/com/massivecraft/factions/cmd/arg/ARMPlayer.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARMPlayer.java rename to src/com/massivecraft/factions/cmd/arg/ARMPlayer.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARRank.java b/src/com/massivecraft/factions/cmd/arg/ARRank.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARRank.java rename to src/com/massivecraft/factions/cmd/arg/ARRank.java diff --git a/src/main/java/com/massivecraft/factions/cmd/arg/ARRel.java b/src/com/massivecraft/factions/cmd/arg/ARRel.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/arg/ARRel.java rename to src/com/massivecraft/factions/cmd/arg/ARRel.java diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java rename to src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java rename to src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java rename to src/com/massivecraft/factions/cmd/req/ReqHasFaction.java diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java rename to src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java similarity index 100% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java rename to src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChat.java b/src/com/massivecraft/factions/engine/EngineChat.java similarity index 100% rename from src/main/java/com/massivecraft/factions/engine/EngineChat.java rename to src/com/massivecraft/factions/engine/EngineChat.java diff --git a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java b/src/com/massivecraft/factions/engine/EngineEcon.java similarity index 100% rename from src/main/java/com/massivecraft/factions/engine/EngineEcon.java rename to src/com/massivecraft/factions/engine/EngineEcon.java diff --git a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java b/src/com/massivecraft/factions/engine/EngineExploit.java similarity index 100% rename from src/main/java/com/massivecraft/factions/engine/EngineExploit.java rename to src/com/massivecraft/factions/engine/EngineExploit.java diff --git a/src/main/java/com/massivecraft/factions/engine/EngineIdUpdate.java b/src/com/massivecraft/factions/engine/EngineIdUpdate.java similarity index 100% rename from src/main/java/com/massivecraft/factions/engine/EngineIdUpdate.java rename to src/com/massivecraft/factions/engine/EngineIdUpdate.java diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMain.java b/src/com/massivecraft/factions/engine/EngineMain.java similarity index 97% rename from src/main/java/com/massivecraft/factions/engine/EngineMain.java rename to src/com/massivecraft/factions/engine/EngineMain.java index 0c075b13..6ebe0379 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineMain.java +++ b/src/com/massivecraft/factions/engine/EngineMain.java @@ -799,6 +799,7 @@ public class EngineMain extends EngineAbstract } // mainly for flaming arrows; don't want allies or people in safe zones to be ignited even after damage event is cancelled + @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void canCombatDamageHappen(EntityCombustByEntityEvent event) { @@ -807,6 +808,7 @@ public class EngineMain extends EngineAbstract event.setCancelled(true); } + @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void canCombatDamageHappen(PotionSplashEvent event) { diff --git a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java b/src/com/massivecraft/factions/engine/EngineSeeChunk.java similarity index 100% rename from src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java rename to src/com/massivecraft/factions/engine/EngineSeeChunk.java diff --git a/src/main/java/com/massivecraft/factions/entity/Board.java b/src/com/massivecraft/factions/entity/Board.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/Board.java rename to src/com/massivecraft/factions/entity/Board.java diff --git a/src/main/java/com/massivecraft/factions/entity/BoardColl.java b/src/com/massivecraft/factions/entity/BoardColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/BoardColl.java rename to src/com/massivecraft/factions/entity/BoardColl.java diff --git a/src/main/java/com/massivecraft/factions/entity/BoardInterface.java b/src/com/massivecraft/factions/entity/BoardInterface.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/BoardInterface.java rename to src/com/massivecraft/factions/entity/BoardInterface.java diff --git a/src/main/java/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/Faction.java rename to src/com/massivecraft/factions/entity/Faction.java diff --git a/src/main/java/com/massivecraft/factions/entity/FactionColl.java b/src/com/massivecraft/factions/entity/FactionColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/FactionColl.java rename to src/com/massivecraft/factions/entity/FactionColl.java diff --git a/src/main/java/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MConf.java rename to src/com/massivecraft/factions/entity/MConf.java diff --git a/src/main/java/com/massivecraft/factions/entity/MConfColl.java b/src/com/massivecraft/factions/entity/MConfColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MConfColl.java rename to src/com/massivecraft/factions/entity/MConfColl.java diff --git a/src/main/java/com/massivecraft/factions/entity/MFlag.java b/src/com/massivecraft/factions/entity/MFlag.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MFlag.java rename to src/com/massivecraft/factions/entity/MFlag.java diff --git a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java b/src/com/massivecraft/factions/entity/MFlagColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MFlagColl.java rename to src/com/massivecraft/factions/entity/MFlagColl.java diff --git a/src/main/java/com/massivecraft/factions/entity/MPerm.java b/src/com/massivecraft/factions/entity/MPerm.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MPerm.java rename to src/com/massivecraft/factions/entity/MPerm.java diff --git a/src/main/java/com/massivecraft/factions/entity/MPermColl.java b/src/com/massivecraft/factions/entity/MPermColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MPermColl.java rename to src/com/massivecraft/factions/entity/MPermColl.java diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayer.java b/src/com/massivecraft/factions/entity/MPlayer.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MPlayer.java rename to src/com/massivecraft/factions/entity/MPlayer.java diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/com/massivecraft/factions/entity/MPlayerColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/entity/MPlayerColl.java rename to src/com/massivecraft/factions/entity/MPlayerColl.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java b/src/com/massivecraft/factions/event/EventFactionsAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java rename to src/com/massivecraft/factions/event/EventFactionsAbstract.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java b/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java rename to src/com/massivecraft/factions/event/EventFactionsAbstractSender.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java b/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java rename to src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsChunksChange.java b/src/com/massivecraft/factions/event/EventFactionsChunksChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsChunksChange.java rename to src/com/massivecraft/factions/event/EventFactionsChunksChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java b/src/com/massivecraft/factions/event/EventFactionsCreate.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java rename to src/com/massivecraft/factions/event/EventFactionsCreate.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreateFlags.java b/src/com/massivecraft/factions/event/EventFactionsCreateFlags.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreateFlags.java rename to src/com/massivecraft/factions/event/EventFactionsCreateFlags.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreatePerms.java b/src/com/massivecraft/factions/event/EventFactionsCreatePerms.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreatePerms.java rename to src/com/massivecraft/factions/event/EventFactionsCreatePerms.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java b/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java rename to src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java b/src/com/massivecraft/factions/event/EventFactionsDisband.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java rename to src/com/massivecraft/factions/event/EventFactionsDisband.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsExpansions.java b/src/com/massivecraft/factions/event/EventFactionsExpansions.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsExpansions.java rename to src/com/massivecraft/factions/event/EventFactionsExpansions.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java b/src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java rename to src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsFlagChange.java b/src/com/massivecraft/factions/event/EventFactionsFlagChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsFlagChange.java rename to src/com/massivecraft/factions/event/EventFactionsFlagChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsHomeChange.java b/src/com/massivecraft/factions/event/EventFactionsHomeChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsHomeChange.java rename to src/com/massivecraft/factions/event/EventFactionsHomeChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsHomeTeleport.java b/src/com/massivecraft/factions/event/EventFactionsHomeTeleport.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsHomeTeleport.java rename to src/com/massivecraft/factions/event/EventFactionsHomeTeleport.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java b/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java rename to src/com/massivecraft/factions/event/EventFactionsInvitedChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java b/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java rename to src/com/massivecraft/factions/event/EventFactionsMembershipChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsMotdChange.java b/src/com/massivecraft/factions/event/EventFactionsMotdChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsMotdChange.java rename to src/com/massivecraft/factions/event/EventFactionsMotdChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java b/src/com/massivecraft/factions/event/EventFactionsNameChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java rename to src/com/massivecraft/factions/event/EventFactionsNameChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java b/src/com/massivecraft/factions/event/EventFactionsPowerChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java rename to src/com/massivecraft/factions/event/EventFactionsPowerChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java b/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java rename to src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsRankChange.java b/src/com/massivecraft/factions/event/EventFactionsRankChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsRankChange.java rename to src/com/massivecraft/factions/event/EventFactionsRankChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java b/src/com/massivecraft/factions/event/EventFactionsRelationChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java rename to src/com/massivecraft/factions/event/EventFactionsRelationChange.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java b/src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java rename to src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java b/src/com/massivecraft/factions/event/EventFactionsTitleChange.java similarity index 100% rename from src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java rename to src/com/massivecraft/factions/event/EventFactionsTitleChange.java diff --git a/src/main/java/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/Econ.java rename to src/com/massivecraft/factions/integration/Econ.java diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/EngineHerochat.java b/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/herochat/EngineHerochat.java rename to src/com/massivecraft/factions/integration/herochat/EngineHerochat.java diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java b/src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java rename to src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/com/massivecraft/factions/integration/lwc/EngineLwc.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java rename to src/com/massivecraft/factions/integration/lwc/EngineLwc.java diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java b/src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java rename to src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java b/src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java similarity index 100% rename from src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java rename to src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java diff --git a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java b/src/com/massivecraft/factions/mixin/PowerMixin.java similarity index 100% rename from src/main/java/com/massivecraft/factions/mixin/PowerMixin.java rename to src/com/massivecraft/factions/mixin/PowerMixin.java diff --git a/src/main/java/com/massivecraft/factions/mixin/PowerMixinDefault.java b/src/com/massivecraft/factions/mixin/PowerMixinDefault.java similarity index 100% rename from src/main/java/com/massivecraft/factions/mixin/PowerMixinDefault.java rename to src/com/massivecraft/factions/mixin/PowerMixinDefault.java diff --git a/src/main/java/com/massivecraft/factions/spigot/EngineSpigot.java b/src/com/massivecraft/factions/spigot/EngineSpigot.java similarity index 100% rename from src/main/java/com/massivecraft/factions/spigot/EngineSpigot.java rename to src/com/massivecraft/factions/spigot/EngineSpigot.java diff --git a/src/main/java/com/massivecraft/factions/spigot/SpigotFeatures.java b/src/com/massivecraft/factions/spigot/SpigotFeatures.java similarity index 100% rename from src/main/java/com/massivecraft/factions/spigot/SpigotFeatures.java rename to src/com/massivecraft/factions/spigot/SpigotFeatures.java diff --git a/src/main/java/com/massivecraft/factions/task/TaskEconLandReward.java b/src/com/massivecraft/factions/task/TaskEconLandReward.java similarity index 88% rename from src/main/java/com/massivecraft/factions/task/TaskEconLandReward.java rename to src/com/massivecraft/factions/task/TaskEconLandReward.java index 75ba09ca..7960edd6 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskEconLandReward.java +++ b/src/com/massivecraft/factions/task/TaskEconLandReward.java @@ -1,5 +1,8 @@ package com.massivecraft.factions.task; +import org.bukkit.plugin.Plugin; + +import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MConf; import com.massivecraft.massivecore.ModuloRepeatTask; @@ -18,6 +21,12 @@ public class TaskEconLandReward extends ModuloRepeatTask // OVERRIDE: MODULO REPEAT TASK // -------------------------------------------- // + @Override + public Plugin getPlugin() + { + return Factions.get(); + } + @Override public long getDelayMillis() { diff --git a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java b/src/com/massivecraft/factions/task/TaskFlagPermCreate.java similarity index 86% rename from src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java rename to src/com/massivecraft/factions/task/TaskFlagPermCreate.java index 3db342ba..591e370f 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java +++ b/src/com/massivecraft/factions/task/TaskFlagPermCreate.java @@ -1,5 +1,8 @@ package com.massivecraft.factions.task; +import org.bukkit.plugin.Plugin; + +import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.massivecore.ModuloRepeatTask; @@ -18,6 +21,12 @@ public class TaskFlagPermCreate extends ModuloRepeatTask // OVERRIDE: MODULO REPEAT TASK // -------------------------------------------- // + @Override + public Plugin getPlugin() + { + return Factions.get(); + } + @Override public long getDelayMillis() { diff --git a/src/main/java/com/massivecraft/factions/task/TaskPlayerDataRemove.java b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java similarity index 88% rename from src/main/java/com/massivecraft/factions/task/TaskPlayerDataRemove.java rename to src/com/massivecraft/factions/task/TaskPlayerDataRemove.java index a6e6d89d..096877b8 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskPlayerDataRemove.java +++ b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java @@ -1,5 +1,8 @@ package com.massivecraft.factions.task; +import org.bukkit.plugin.Plugin; + +import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.ModuloRepeatTask; @@ -18,6 +21,12 @@ public class TaskPlayerDataRemove extends ModuloRepeatTask // OVERRIDE: MODULO REPEAT TASK // -------------------------------------------- // + @Override + public Plugin getPlugin() + { + return Factions.get(); + } + @Override public long getDelayMillis() { diff --git a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java similarity index 92% rename from src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java rename to src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java index 4e65ed81..940fc6b0 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java +++ b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java @@ -1,7 +1,9 @@ package com.massivecraft.factions.task; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsPowerChange; @@ -23,6 +25,12 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask // OVERRIDE: MODULO REPEAT TASK // -------------------------------------------- // + @Override + public Plugin getPlugin() + { + return Factions.get(); + } + @Override public long getDelayMillis() { diff --git a/src/main/java/com/massivecraft/factions/update/OldConf.java b/src/com/massivecraft/factions/update/OldConf.java similarity index 100% rename from src/main/java/com/massivecraft/factions/update/OldConf.java rename to src/com/massivecraft/factions/update/OldConf.java diff --git a/src/main/java/com/massivecraft/factions/update/OldConfColl.java b/src/com/massivecraft/factions/update/OldConfColl.java similarity index 100% rename from src/main/java/com/massivecraft/factions/update/OldConfColl.java rename to src/com/massivecraft/factions/update/OldConfColl.java diff --git a/src/main/java/com/massivecraft/factions/update/OldConfColls.java b/src/com/massivecraft/factions/update/OldConfColls.java similarity index 100% rename from src/main/java/com/massivecraft/factions/update/OldConfColls.java rename to src/com/massivecraft/factions/update/OldConfColls.java diff --git a/src/main/java/com/massivecraft/factions/update/UpdateUtil.java b/src/com/massivecraft/factions/update/UpdateUtil.java similarity index 100% rename from src/main/java/com/massivecraft/factions/update/UpdateUtil.java rename to src/com/massivecraft/factions/update/UpdateUtil.java diff --git a/src/main/java/com/massivecraft/factions/util/AsciiCompass.java b/src/com/massivecraft/factions/util/AsciiCompass.java similarity index 100% rename from src/main/java/com/massivecraft/factions/util/AsciiCompass.java rename to src/com/massivecraft/factions/util/AsciiCompass.java diff --git a/src/main/java/com/massivecraft/factions/util/MiscUtil.java b/src/com/massivecraft/factions/util/MiscUtil.java similarity index 100% rename from src/main/java/com/massivecraft/factions/util/MiscUtil.java rename to src/com/massivecraft/factions/util/MiscUtil.java diff --git a/src/main/java/com/massivecraft/factions/util/RelationUtil.java b/src/com/massivecraft/factions/util/RelationUtil.java similarity index 100% rename from src/main/java/com/massivecraft/factions/util/RelationUtil.java rename to src/com/massivecraft/factions/util/RelationUtil.java diff --git a/src/main/java/com/massivecraft/factions/util/VisualizeUtil.java b/src/com/massivecraft/factions/util/VisualizeUtil.java similarity index 100% rename from src/main/java/com/massivecraft/factions/util/VisualizeUtil.java rename to src/com/massivecraft/factions/util/VisualizeUtil.java