diff --git a/.gitignore b/.gitignore index 99412a2a..6fa8deb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,31 @@ -# Eclipse stuff +# Eclipse /.classpath /.project /.settings +/*.jardesc + +# IntelliJ +*.iml +*.ipr +*.iws +.idea/ # NetBeans /nbproject -/build.xml # vim .*.sw[a-p] +# Maven +/build.xml +/target +/dependency-reduced-pom.xml + # various other potential build files /build /bin /dist -/*.jardesc +/manifest.mf # Mac filesystem dust -.DS_Store \ No newline at end of file +.DS_Store diff --git a/lib/Herochat.jar b/lib/HeroChat-5.6.7.jar similarity index 78% rename from lib/Herochat.jar rename to lib/HeroChat-5.6.7.jar index c7720326..eaf0abd1 100644 Binary files a/lib/Herochat.jar and b/lib/HeroChat-5.6.7.jar differ diff --git a/lib/LWC-4.4.0.jar b/lib/LWC-4.4.0.jar new file mode 100644 index 00000000..ada1677f Binary files /dev/null and b/lib/LWC-4.4.0.jar 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/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/media/Thumbs.db b/media/Thumbs.db new file mode 100644 index 00000000..7d9e784d Binary files /dev/null and b/media/Thumbs.db differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..86d7c5ed --- /dev/null +++ b/pom.xml @@ -0,0 +1,82 @@ + + 4.0.0 + + Factions + http://www.massivecraft.com/factions + + com.massivecraft + Factions + 2.6.1 + + + UTF-8 + + + + clean install + Factions + ${basedir}/src/main/java/ + + + . + ${basedir}/src/main/resources/ + true + + *.yml + *.md + *.txt + + + + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + + + com.massivecraft + MassiveCore + LATEST + + + us.dynmap + dynmap-api + 2.0.0-SNAPSHOT + + + us.dynmap + DynmapCore + 2.0.0-SNAPSHOT + + + 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 + + + + + + dynmap-repo + http://repo.mikeprimm.com/ + + + + diff --git a/src/com/massivecraft/factions/Const.java b/src/main/java/com/massivecraft/factions/Const.java similarity index 100% rename from src/com/massivecraft/factions/Const.java rename to src/main/java/com/massivecraft/factions/Const.java diff --git a/src/com/massivecraft/factions/EconomyParticipator.java b/src/main/java/com/massivecraft/factions/EconomyParticipator.java similarity index 100% rename from src/com/massivecraft/factions/EconomyParticipator.java rename to src/main/java/com/massivecraft/factions/EconomyParticipator.java diff --git a/src/com/massivecraft/factions/EngineIdUpdate.java b/src/main/java/com/massivecraft/factions/EngineIdUpdate.java similarity index 100% rename from src/com/massivecraft/factions/EngineIdUpdate.java rename to src/main/java/com/massivecraft/factions/EngineIdUpdate.java diff --git a/src/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java similarity index 100% rename from src/com/massivecraft/factions/ExtractorFactionAccountId.java rename to src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java diff --git a/src/com/massivecraft/factions/FFlag.java b/src/main/java/com/massivecraft/factions/FFlag.java similarity index 100% rename from src/com/massivecraft/factions/FFlag.java rename to src/main/java/com/massivecraft/factions/FFlag.java diff --git a/src/com/massivecraft/factions/FPerm.java b/src/main/java/com/massivecraft/factions/FPerm.java similarity index 100% rename from src/com/massivecraft/factions/FPerm.java rename to src/main/java/com/massivecraft/factions/FPerm.java diff --git a/src/com/massivecraft/factions/FactionEqualsPredictate.java b/src/main/java/com/massivecraft/factions/FactionEqualsPredictate.java similarity index 100% rename from src/com/massivecraft/factions/FactionEqualsPredictate.java rename to src/main/java/com/massivecraft/factions/FactionEqualsPredictate.java diff --git a/src/com/massivecraft/factions/FactionListComparator.java b/src/main/java/com/massivecraft/factions/FactionListComparator.java similarity index 100% rename from src/com/massivecraft/factions/FactionListComparator.java rename to src/main/java/com/massivecraft/factions/FactionListComparator.java diff --git a/src/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java similarity index 98% rename from src/com/massivecraft/factions/Factions.java rename to src/main/java/com/massivecraft/factions/Factions.java index 1220235c..848c27bc 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/main/java/com/massivecraft/factions/Factions.java @@ -47,8 +47,8 @@ import com.massivecraft.massivecore.AspectColl; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.GsonBuilder; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; public class Factions extends MassivePlugin diff --git a/src/com/massivecraft/factions/Lang.java b/src/main/java/com/massivecraft/factions/Lang.java similarity index 100% rename from src/com/massivecraft/factions/Lang.java rename to src/main/java/com/massivecraft/factions/Lang.java diff --git a/src/com/massivecraft/factions/Perm.java b/src/main/java/com/massivecraft/factions/Perm.java similarity index 100% rename from src/com/massivecraft/factions/Perm.java rename to src/main/java/com/massivecraft/factions/Perm.java diff --git a/src/com/massivecraft/factions/PlayerRoleComparator.java b/src/main/java/com/massivecraft/factions/PlayerRoleComparator.java similarity index 100% rename from src/com/massivecraft/factions/PlayerRoleComparator.java rename to src/main/java/com/massivecraft/factions/PlayerRoleComparator.java diff --git a/src/com/massivecraft/factions/Rel.java b/src/main/java/com/massivecraft/factions/Rel.java similarity index 100% rename from src/com/massivecraft/factions/Rel.java rename to src/main/java/com/massivecraft/factions/Rel.java diff --git a/src/com/massivecraft/factions/RelationParticipator.java b/src/main/java/com/massivecraft/factions/RelationParticipator.java similarity index 100% rename from src/com/massivecraft/factions/RelationParticipator.java rename to src/main/java/com/massivecraft/factions/RelationParticipator.java diff --git a/src/com/massivecraft/factions/TerritoryAccess.java b/src/main/java/com/massivecraft/factions/TerritoryAccess.java similarity index 100% rename from src/com/massivecraft/factions/TerritoryAccess.java rename to src/main/java/com/massivecraft/factions/TerritoryAccess.java diff --git a/src/com/massivecraft/factions/adapter/BoardAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java similarity index 73% rename from src/com/massivecraft/factions/adapter/BoardAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java index b2b060a3..ebbdd114 100644 --- a/src/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java @@ -4,12 +4,12 @@ import java.lang.reflect.Type; import java.util.Map; import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.entity.Board; diff --git a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java similarity index 81% rename from src/com/massivecraft/factions/adapter/BoardMapAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java index e724cc7b..8bc76952 100644 --- a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java @@ -6,13 +6,13 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.factions.TerritoryAccess; public class BoardMapAdapter implements JsonDeserializer>, JsonSerializer> diff --git a/src/com/massivecraft/factions/adapter/FFlagAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java similarity index 73% rename from src/com/massivecraft/factions/adapter/FFlagAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java index 55c7f9dc..44319b43 100644 --- a/src/com/massivecraft/factions/adapter/FFlagAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java @@ -3,10 +3,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import com.massivecraft.factions.FFlag; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; public class FFlagAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/factions/adapter/FPermAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java similarity index 73% rename from src/com/massivecraft/factions/adapter/FPermAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java index caef6d95..2bae7099 100644 --- a/src/com/massivecraft/factions/adapter/FPermAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java @@ -2,10 +2,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; import com.massivecraft.factions.FPerm; public class FPermAdapter implements JsonDeserializer diff --git a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java similarity index 81% rename from src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java index 09cab356..a47bccef 100644 --- a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java @@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; diff --git a/src/com/massivecraft/factions/adapter/RelAdapter.java b/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java similarity index 72% rename from src/com/massivecraft/factions/adapter/RelAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/RelAdapter.java index 22c15cad..e4297707 100644 --- a/src/com/massivecraft/factions/adapter/RelAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java @@ -2,10 +2,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; import com.massivecraft.factions.Rel; public class RelAdapter implements JsonDeserializer diff --git a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java similarity index 84% rename from src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java rename to src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java index 2cd9f81d..c8c6d9b8 100644 --- a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java @@ -3,15 +3,15 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Set; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.google.gson.reflect.TypeToken; import com.massivecraft.factions.TerritoryAccess; public class TerritoryAccessAdapter implements JsonDeserializer, JsonSerializer diff --git a/src/com/massivecraft/factions/chat/ChatFormatter.java b/src/main/java/com/massivecraft/factions/chat/ChatFormatter.java similarity index 100% rename from src/com/massivecraft/factions/chat/ChatFormatter.java rename to src/main/java/com/massivecraft/factions/chat/ChatFormatter.java diff --git a/src/com/massivecraft/factions/chat/ChatModifier.java b/src/main/java/com/massivecraft/factions/chat/ChatModifier.java similarity index 100% rename from src/com/massivecraft/factions/chat/ChatModifier.java rename to src/main/java/com/massivecraft/factions/chat/ChatModifier.java diff --git a/src/com/massivecraft/factions/chat/ChatModifierAbstract.java b/src/main/java/com/massivecraft/factions/chat/ChatModifierAbstract.java similarity index 100% rename from src/com/massivecraft/factions/chat/ChatModifierAbstract.java rename to src/main/java/com/massivecraft/factions/chat/ChatModifierAbstract.java diff --git a/src/com/massivecraft/factions/chat/ChatTag.java b/src/main/java/com/massivecraft/factions/chat/ChatTag.java similarity index 100% rename from src/com/massivecraft/factions/chat/ChatTag.java rename to src/main/java/com/massivecraft/factions/chat/ChatTag.java diff --git a/src/com/massivecraft/factions/chat/ChatTagAbstract.java b/src/main/java/com/massivecraft/factions/chat/ChatTagAbstract.java similarity index 100% rename from src/com/massivecraft/factions/chat/ChatTagAbstract.java rename to src/main/java/com/massivecraft/factions/chat/ChatTagAbstract.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java similarity index 100% rename from src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java rename to src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagName.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagRole.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java similarity index 100% rename from src/com/massivecraft/factions/chat/tag/ChatTagTitle.java rename to src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactions.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactions.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactions.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAccess.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAdmin.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAdmin.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsClaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsCreate.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDemote.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsDemote.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsDemote.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsDescription.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsDisband.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsFaction.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsFlag.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsHome.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsInvite.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsJoin.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsKick.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeader.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsLeader.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeader.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsLeave.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsList.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMap.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoney.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsName.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsOfficer.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsOfficer.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsOpen.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsOpen.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsOpen.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsPerm.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPromote.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsPromote.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsPromote.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsSethome.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsTitle.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java similarity index 100% rename from src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java rename to src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java similarity index 93% rename from src/com/massivecraft/factions/cmd/FCommand.java rename to src/main/java/com/massivecraft/factions/cmd/FCommand.java index 7fc9f571..9ccd4212 100644 --- a/src/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -37,6 +37,15 @@ public abstract class FCommand extends MassiveCommand this.usenderFaction = this.usender.getFaction(); } + + @Override + public void unsetSenderVars() + { + this.msender = null; + this.usender = null; + this.usenderFaction = null; + } + // -------------------------------------------- // // COMMONLY USED LOGIC // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/arg/ARFFlag.java b/src/main/java/com/massivecraft/factions/cmd/arg/ARFFlag.java similarity index 100% rename from src/com/massivecraft/factions/cmd/arg/ARFFlag.java rename to src/main/java/com/massivecraft/factions/cmd/arg/ARFFlag.java diff --git a/src/com/massivecraft/factions/cmd/arg/ARFPerm.java b/src/main/java/com/massivecraft/factions/cmd/arg/ARFPerm.java similarity index 100% rename from src/com/massivecraft/factions/cmd/arg/ARFPerm.java rename to src/main/java/com/massivecraft/factions/cmd/arg/ARFPerm.java diff --git a/src/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/main/java/com/massivecraft/factions/cmd/arg/ARFaction.java similarity index 100% rename from src/com/massivecraft/factions/cmd/arg/ARFaction.java rename to src/main/java/com/massivecraft/factions/cmd/arg/ARFaction.java diff --git a/src/com/massivecraft/factions/cmd/arg/ARRel.java b/src/main/java/com/massivecraft/factions/cmd/arg/ARRel.java similarity index 100% rename from src/com/massivecraft/factions/cmd/arg/ARRel.java rename to src/main/java/com/massivecraft/factions/cmd/arg/ARRel.java diff --git a/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java b/src/main/java/com/massivecraft/factions/cmd/arg/ARUPlayer.java similarity index 100% rename from src/com/massivecraft/factions/cmd/arg/ARUPlayer.java rename to src/main/java/com/massivecraft/factions/cmd/arg/ARUPlayer.java diff --git a/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java similarity index 100% rename from src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java rename to src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java diff --git a/src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java similarity index 100% rename from src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java rename to src/main/java/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java similarity index 100% rename from src/com/massivecraft/factions/cmd/req/ReqHasFaction.java rename to src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java similarity index 100% rename from src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java rename to src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java diff --git a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java similarity index 100% rename from src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java rename to src/main/java/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java diff --git a/src/com/massivecraft/factions/entity/Board.java b/src/main/java/com/massivecraft/factions/entity/Board.java similarity index 95% rename from src/com/massivecraft/factions/entity/Board.java rename to src/main/java/com/massivecraft/factions/entity/Board.java index 2cb85214..4ef51b63 100644 --- a/src/com/massivecraft/factions/entity/Board.java +++ b/src/main/java/com/massivecraft/factions/entity/Board.java @@ -20,7 +20,7 @@ import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.google.gson.reflect.TypeToken; public class Board extends Entity implements BoardInterface { diff --git a/src/com/massivecraft/factions/entity/BoardColl.java b/src/main/java/com/massivecraft/factions/entity/BoardColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/BoardColl.java rename to src/main/java/com/massivecraft/factions/entity/BoardColl.java diff --git a/src/com/massivecraft/factions/entity/BoardColls.java b/src/main/java/com/massivecraft/factions/entity/BoardColls.java similarity index 94% rename from src/com/massivecraft/factions/entity/BoardColls.java rename to src/main/java/com/massivecraft/factions/entity/BoardColls.java index 8bdaed73..38df05c7 100644 --- a/src/com/massivecraft/factions/entity/BoardColls.java +++ b/src/main/java/com/massivecraft/factions/entity/BoardColls.java @@ -16,7 +16,7 @@ import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSBuilder; import com.massivecraft.massivecore.util.DiscUtil; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.google.gson.reflect.TypeToken; public class BoardColls extends XColls implements BoardInterface { diff --git a/src/com/massivecraft/factions/entity/BoardInterface.java b/src/main/java/com/massivecraft/factions/entity/BoardInterface.java similarity index 100% rename from src/com/massivecraft/factions/entity/BoardInterface.java rename to src/main/java/com/massivecraft/factions/entity/BoardInterface.java diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/main/java/com/massivecraft/factions/entity/Faction.java similarity index 100% rename from src/com/massivecraft/factions/entity/Faction.java rename to src/main/java/com/massivecraft/factions/entity/Faction.java diff --git a/src/com/massivecraft/factions/entity/FactionColl.java b/src/main/java/com/massivecraft/factions/entity/FactionColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/FactionColl.java rename to src/main/java/com/massivecraft/factions/entity/FactionColl.java diff --git a/src/com/massivecraft/factions/entity/FactionColls.java b/src/main/java/com/massivecraft/factions/entity/FactionColls.java similarity index 93% rename from src/com/massivecraft/factions/entity/FactionColls.java rename to src/main/java/com/massivecraft/factions/entity/FactionColls.java index a9fcc152..dbe794f4 100644 --- a/src/com/massivecraft/factions/entity/FactionColls.java +++ b/src/main/java/com/massivecraft/factions/entity/FactionColls.java @@ -12,7 +12,7 @@ import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.util.DiscUtil; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.google.gson.reflect.TypeToken; public class FactionColls extends XColls { diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/main/java/com/massivecraft/factions/entity/MConf.java similarity index 100% rename from src/com/massivecraft/factions/entity/MConf.java rename to src/main/java/com/massivecraft/factions/entity/MConf.java diff --git a/src/com/massivecraft/factions/entity/MConfColl.java b/src/main/java/com/massivecraft/factions/entity/MConfColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/MConfColl.java rename to src/main/java/com/massivecraft/factions/entity/MConfColl.java diff --git a/src/com/massivecraft/factions/entity/MPlayer.java b/src/main/java/com/massivecraft/factions/entity/MPlayer.java similarity index 100% rename from src/com/massivecraft/factions/entity/MPlayer.java rename to src/main/java/com/massivecraft/factions/entity/MPlayer.java diff --git a/src/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/MPlayerColl.java rename to src/main/java/com/massivecraft/factions/entity/MPlayerColl.java diff --git a/src/com/massivecraft/factions/entity/UConf.java b/src/main/java/com/massivecraft/factions/entity/UConf.java similarity index 100% rename from src/com/massivecraft/factions/entity/UConf.java rename to src/main/java/com/massivecraft/factions/entity/UConf.java diff --git a/src/com/massivecraft/factions/entity/UConfColl.java b/src/main/java/com/massivecraft/factions/entity/UConfColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/UConfColl.java rename to src/main/java/com/massivecraft/factions/entity/UConfColl.java diff --git a/src/com/massivecraft/factions/entity/UConfColls.java b/src/main/java/com/massivecraft/factions/entity/UConfColls.java similarity index 100% rename from src/com/massivecraft/factions/entity/UConfColls.java rename to src/main/java/com/massivecraft/factions/entity/UConfColls.java diff --git a/src/com/massivecraft/factions/entity/UPlayer.java b/src/main/java/com/massivecraft/factions/entity/UPlayer.java similarity index 100% rename from src/com/massivecraft/factions/entity/UPlayer.java rename to src/main/java/com/massivecraft/factions/entity/UPlayer.java diff --git a/src/com/massivecraft/factions/entity/UPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/UPlayerColl.java similarity index 100% rename from src/com/massivecraft/factions/entity/UPlayerColl.java rename to src/main/java/com/massivecraft/factions/entity/UPlayerColl.java diff --git a/src/com/massivecraft/factions/entity/UPlayerColls.java b/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java similarity index 93% rename from src/com/massivecraft/factions/entity/UPlayerColls.java rename to src/main/java/com/massivecraft/factions/entity/UPlayerColls.java index 1726dfd2..36ef93bd 100644 --- a/src/com/massivecraft/factions/entity/UPlayerColls.java +++ b/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions; import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.util.DiscUtil; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.google.gson.reflect.TypeToken; public class UPlayerColls extends XColls { diff --git a/src/com/massivecraft/factions/entity/XColls.java b/src/main/java/com/massivecraft/factions/entity/XColls.java similarity index 100% rename from src/com/massivecraft/factions/entity/XColls.java rename to src/main/java/com/massivecraft/factions/entity/XColls.java diff --git a/src/com/massivecraft/factions/event/EventFactionsAbstract.java b/src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsAbstract.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java diff --git a/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java b/src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsAbstractSender.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java diff --git a/src/com/massivecraft/factions/event/EventFactionsChunkChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsChunkChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsChunkChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsChunkChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java b/src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java diff --git a/src/com/massivecraft/factions/event/EventFactionsCreate.java b/src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsCreate.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java diff --git a/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsDisband.java b/src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsDisband.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java diff --git a/src/com/massivecraft/factions/event/EventFactionsHomeChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsHomeChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsHomeChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsHomeChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsHomeTeleport.java b/src/main/java/com/massivecraft/factions/event/EventFactionsHomeTeleport.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsHomeTeleport.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsHomeTeleport.java diff --git a/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsInvitedChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsMembershipChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsNameChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsNameChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsOpenChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsOpenChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsOpenChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsOpenChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsPowerChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsPowerChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java b/src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java diff --git a/src/com/massivecraft/factions/event/EventFactionsRelationChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsRelationChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java diff --git a/src/com/massivecraft/factions/event/EventFactionsTitleChange.java b/src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java similarity index 100% rename from src/com/massivecraft/factions/event/EventFactionsTitleChange.java rename to src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.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/dynmap/DynmapStyle.java b/src/main/java/com/massivecraft/factions/integration/dynmap/DynmapStyle.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/DynmapStyle.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/DynmapStyle.java diff --git a/src/com/massivecraft/factions/integration/dynmap/EngineDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/EngineDynmap.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java diff --git a/src/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java diff --git a/src/com/massivecraft/factions/integration/dynmap/IntegrationDynmapFactions.java b/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmapFactions.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/IntegrationDynmapFactions.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmapFactions.java diff --git a/src/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java b/src/main/java/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java diff --git a/src/com/massivecraft/factions/integration/dynmap/TempMarker.java b/src/main/java/com/massivecraft/factions/integration/dynmap/TempMarker.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/TempMarker.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/TempMarker.java diff --git a/src/com/massivecraft/factions/integration/dynmap/TempMarkerSet.java b/src/main/java/com/massivecraft/factions/integration/dynmap/TempMarkerSet.java similarity index 100% rename from src/com/massivecraft/factions/integration/dynmap/TempMarkerSet.java rename to src/main/java/com/massivecraft/factions/integration/dynmap/TempMarkerSet.java diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java b/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java similarity index 100% rename from src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java rename to src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java b/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java similarity index 100% rename from src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java rename to src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java b/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java similarity index 100% rename from src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java rename to src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java diff --git a/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java b/src/main/java/com/massivecraft/factions/integration/herochat/EngineHerochat.java similarity index 100% rename from src/com/massivecraft/factions/integration/herochat/EngineHerochat.java rename to src/main/java/com/massivecraft/factions/integration/herochat/EngineHerochat.java diff --git a/src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java b/src/main/java/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java similarity index 100% rename from src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java rename to src/main/java/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java diff --git a/src/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java similarity index 100% rename from src/com/massivecraft/factions/integration/lwc/EngineLwc.java rename to src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java diff --git a/src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java similarity index 100% rename from src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java rename to src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerChat.java b/src/main/java/com/massivecraft/factions/listeners/FactionsListenerChat.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsListenerChat.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsListenerChat.java diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerEcon.java b/src/main/java/com/massivecraft/factions/listeners/FactionsListenerEcon.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsListenerEcon.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsListenerEcon.java diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerExploit.java b/src/main/java/com/massivecraft/factions/listeners/FactionsListenerExploit.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsListenerExploit.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsListenerExploit.java diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerMain.java b/src/main/java/com/massivecraft/factions/listeners/FactionsListenerMain.java similarity index 100% rename from src/com/massivecraft/factions/listeners/FactionsListenerMain.java rename to src/main/java/com/massivecraft/factions/listeners/FactionsListenerMain.java diff --git a/src/com/massivecraft/factions/mixin/PowerMixin.java b/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java similarity index 100% rename from src/com/massivecraft/factions/mixin/PowerMixin.java rename to src/main/java/com/massivecraft/factions/mixin/PowerMixin.java diff --git a/src/com/massivecraft/factions/mixin/PowerMixinDefault.java b/src/main/java/com/massivecraft/factions/mixin/PowerMixinDefault.java similarity index 100% rename from src/com/massivecraft/factions/mixin/PowerMixinDefault.java rename to src/main/java/com/massivecraft/factions/mixin/PowerMixinDefault.java diff --git a/src/com/massivecraft/factions/task/SpiralTask.java b/src/main/java/com/massivecraft/factions/task/SpiralTask.java similarity index 100% rename from src/com/massivecraft/factions/task/SpiralTask.java rename to src/main/java/com/massivecraft/factions/task/SpiralTask.java diff --git a/src/com/massivecraft/factions/task/TaskEconLandReward.java b/src/main/java/com/massivecraft/factions/task/TaskEconLandReward.java similarity index 100% rename from src/com/massivecraft/factions/task/TaskEconLandReward.java rename to src/main/java/com/massivecraft/factions/task/TaskEconLandReward.java diff --git a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java b/src/main/java/com/massivecraft/factions/task/TaskPlayerDataRemove.java similarity index 100% rename from src/com/massivecraft/factions/task/TaskPlayerDataRemove.java rename to src/main/java/com/massivecraft/factions/task/TaskPlayerDataRemove.java diff --git a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java similarity index 100% rename from src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java rename to src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.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/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/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/VisualizeUtil.java b/src/main/java/com/massivecraft/factions/util/VisualizeUtil.java similarity index 100% rename from src/com/massivecraft/factions/util/VisualizeUtil.java rename to src/main/java/com/massivecraft/factions/util/VisualizeUtil.java 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