diff --git a/src/com/massivecraft/factions/Const.java b/src/com/massivecraft/factions/Const.java index 727146fc..465051aa 100644 --- a/src/com/massivecraft/factions/Const.java +++ b/src/com/massivecraft/factions/Const.java @@ -12,7 +12,8 @@ public class Const // MStore Collection Names public static final String COLLECTION_BASENAME = "factions"; public static final String COLLECTION_BASENAME_ = COLLECTION_BASENAME+"_"; - public static final String COLLECTION_BASENAME_CONF = COLLECTION_BASENAME_+"conf"; + public static final String COLLECTION_BASENAME_MCONF = COLLECTION_BASENAME_+"mconf"; + public static final String COLLECTION_BASENAME_UCONF = COLLECTION_BASENAME_+"uconf"; public static final String COLLECTION_BASENAME_BOARD = COLLECTION_BASENAME_+"board"; public static final String COLLECTION_BASENAME_PLAYER = COLLECTION_BASENAME_+"player"; public static final String COLLECTION_BASENAME_FACTION = COLLECTION_BASENAME_+"faction"; diff --git a/src/com/massivecraft/factions/iface/EconomyParticipator.java b/src/com/massivecraft/factions/EconomyParticipator.java similarity index 75% rename from src/com/massivecraft/factions/iface/EconomyParticipator.java rename to src/com/massivecraft/factions/EconomyParticipator.java index 63735008..037df5a6 100644 --- a/src/com/massivecraft/factions/iface/EconomyParticipator.java +++ b/src/com/massivecraft/factions/EconomyParticipator.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.iface; +package com.massivecraft.factions; public interface EconomyParticipator extends RelationParticipator diff --git a/src/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/com/massivecraft/factions/ExtractorFactionAccountId.java index 14438a72..d6727d67 100644 --- a/src/com/massivecraft/factions/ExtractorFactionAccountId.java +++ b/src/com/massivecraft/factions/ExtractorFactionAccountId.java @@ -1,5 +1,6 @@ package com.massivecraft.factions; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.util.extractor.Extractor; public class ExtractorFactionAccountId implements Extractor diff --git a/src/com/massivecraft/factions/FPerm.java b/src/com/massivecraft/factions/FPerm.java index 63a147aa..820a8f3f 100644 --- a/src/com/massivecraft/factions/FPerm.java +++ b/src/com/massivecraft/factions/FPerm.java @@ -10,7 +10,10 @@ import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; /** diff --git a/src/com/massivecraft/factions/FactionEqualsPredictate.java b/src/com/massivecraft/factions/FactionEqualsPredictate.java index 60a155da..06741ef9 100644 --- a/src/com/massivecraft/factions/FactionEqualsPredictate.java +++ b/src/com/massivecraft/factions/FactionEqualsPredictate.java @@ -4,6 +4,8 @@ import java.io.Serializable; import org.bukkit.command.CommandSender; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.Predictate; public class FactionEqualsPredictate implements Predictate, Serializable diff --git a/src/com/massivecraft/factions/FactionListComparator.java b/src/com/massivecraft/factions/FactionListComparator.java index d5d284ab..4f36cae4 100644 --- a/src/com/massivecraft/factions/FactionListComparator.java +++ b/src/com/massivecraft/factions/FactionListComparator.java @@ -2,6 +2,7 @@ package com.massivecraft.factions; import java.util.Comparator; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.util.MUtil; public class FactionListComparator implements Comparator diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index 2ee49bf9..eb667d8f 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -1,11 +1,11 @@ package com.massivecraft.factions; -import com.massivecraft.factions.adapters.BoardAdapter; -import com.massivecraft.factions.adapters.BoardMapAdapter; -import com.massivecraft.factions.adapters.FFlagAdapter; -import com.massivecraft.factions.adapters.FPermAdapter; -import com.massivecraft.factions.adapters.RelAdapter; -import com.massivecraft.factions.adapters.TerritoryAccessAdapter; +import com.massivecraft.factions.adapter.BoardAdapter; +import com.massivecraft.factions.adapter.BoardMapAdapter; +import com.massivecraft.factions.adapter.FFlagAdapter; +import com.massivecraft.factions.adapter.FPermAdapter; +import com.massivecraft.factions.adapter.RelAdapter; +import com.massivecraft.factions.adapter.TerritoryAccessAdapter; import com.massivecraft.factions.chat.modifier.ChatModifierLc; import com.massivecraft.factions.chat.modifier.ChatModifierLp; import com.massivecraft.factions.chat.modifier.ChatModifierParse; @@ -19,7 +19,10 @@ import com.massivecraft.factions.chat.tag.ChatTagTag; import com.massivecraft.factions.chat.tag.ChatTagTagforce; import com.massivecraft.factions.chat.tag.ChatTagTitle; import com.massivecraft.factions.cmd.*; -import com.massivecraft.factions.integration.Econ; +import com.massivecraft.factions.entity.Board; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.Worldguard; @@ -125,7 +128,6 @@ public class Factions extends MPlugin this.integrate(HerochatFeatures.get()); SpoutFeatures.setup(); - Econ.setup(); LWCFeatures.setup(); if (ConfServer.worldGuardChecking) diff --git a/src/com/massivecraft/factions/iface/RelationParticipator.java b/src/com/massivecraft/factions/RelationParticipator.java similarity index 81% rename from src/com/massivecraft/factions/iface/RelationParticipator.java rename to src/com/massivecraft/factions/RelationParticipator.java index dd09cbfb..349aa22c 100644 --- a/src/com/massivecraft/factions/iface/RelationParticipator.java +++ b/src/com/massivecraft/factions/RelationParticipator.java @@ -1,8 +1,7 @@ -package com.massivecraft.factions.iface; +package com.massivecraft.factions; import org.bukkit.ChatColor; -import com.massivecraft.factions.Rel; public interface RelationParticipator { diff --git a/src/com/massivecraft/factions/TerritoryAccess.java b/src/com/massivecraft/factions/TerritoryAccess.java index c2621190..1435a7ce 100644 --- a/src/com/massivecraft/factions/TerritoryAccess.java +++ b/src/com/massivecraft/factions/TerritoryAccess.java @@ -6,6 +6,11 @@ import java.util.Set; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; + public class TerritoryAccess { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/adapters/BoardAdapter.java b/src/com/massivecraft/factions/adapter/BoardAdapter.java similarity index 93% rename from src/com/massivecraft/factions/adapters/BoardAdapter.java rename to src/com/massivecraft/factions/adapter/BoardAdapter.java index e0bf4951..1758b545 100644 --- a/src/com/massivecraft/factions/adapters/BoardAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Map; @@ -11,8 +11,8 @@ import com.massivecraft.mcore.xlib.gson.JsonParseException; import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; import com.massivecraft.mcore.xlib.gson.JsonSerializer; -import com.massivecraft.factions.Board; import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.factions.entity.Board; public class BoardAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/factions/adapters/BoardMapAdapter.java b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java similarity index 98% rename from src/com/massivecraft/factions/adapters/BoardMapAdapter.java rename to src/com/massivecraft/factions/adapter/BoardMapAdapter.java index f65bfe58..34b37d1a 100644 --- a/src/com/massivecraft/factions/adapters/BoardMapAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Map; diff --git a/src/com/massivecraft/factions/adapters/FFlagAdapter.java b/src/com/massivecraft/factions/adapter/FFlagAdapter.java similarity index 95% rename from src/com/massivecraft/factions/adapters/FFlagAdapter.java rename to src/com/massivecraft/factions/adapter/FFlagAdapter.java index bf8b6a62..b733e445 100644 --- a/src/com/massivecraft/factions/adapters/FFlagAdapter.java +++ b/src/com/massivecraft/factions/adapter/FFlagAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/factions/adapters/FPermAdapter.java b/src/com/massivecraft/factions/adapter/FPermAdapter.java similarity index 95% rename from src/com/massivecraft/factions/adapters/FPermAdapter.java rename to src/com/massivecraft/factions/adapter/FPermAdapter.java index bb4b22f4..c723c531 100644 --- a/src/com/massivecraft/factions/adapters/FPermAdapter.java +++ b/src/com/massivecraft/factions/adapter/FPermAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/factions/adapters/RelAdapter.java b/src/com/massivecraft/factions/adapter/RelAdapter.java similarity index 95% rename from src/com/massivecraft/factions/adapters/RelAdapter.java rename to src/com/massivecraft/factions/adapter/RelAdapter.java index 5025be5e..3a723834 100644 --- a/src/com/massivecraft/factions/adapters/RelAdapter.java +++ b/src/com/massivecraft/factions/adapter/RelAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java similarity index 98% rename from src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java rename to src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java index b0745917..d16dc667 100644 --- a/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java +++ b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapters; +package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Iterator; diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java index 9d3ec3c5..a0438310 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; public class ChatTagRelcolor extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java index 80bdc7b4..cb1b00af 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; import com.massivecraft.mcore.util.Txt; public class ChatTagRole extends ChatTagAbstract diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java index 8573effd..01b532bb 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; public class ChatTagRoleprefix extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagTag.java b/src/com/massivecraft/factions/chat/tag/ChatTagTag.java index 24716e85..ac0bd6c0 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagTag.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagTag.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; public class ChatTagTag extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagTagforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagTagforce.java index 0cdcec92..a413a9df 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagTagforce.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagTagforce.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; public class ChatTagTagforce extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java index a759fc23..ff9036ba 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.chat.tag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; public class ChatTagTitle extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java index 98d2e6d8..341f3ac7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.mcore.cmd.req.ReqIsPlayer; import com.massivecraft.mcore.ps.PS; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java index 3b21586b..a35d263d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqIsPlayer; import com.massivecraft.mcore.ps.PS; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java index 1c0a5ba7..d5e1645e 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java @@ -5,8 +5,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.Faction; public abstract class CmdFactionsCapeAbstract extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java index 3e24bbd0..58b1eb8e 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.task.SpiralTask; import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java index ce8d1726..7677b145 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java @@ -3,13 +3,13 @@ package com.massivecraft.factions.cmd; import java.util.ArrayList; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.event.FactionsEventCreate; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java index 2cdbc026..44a92ca6 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdFactionsDemote extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java index a3157490..26466e72 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java @@ -2,20 +2,21 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.event.FactionsEventDisband; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; public class CmdFactionsDisband extends FCommand { @@ -75,15 +76,15 @@ public class CmdFactionsDisband extends FCommand if (ConfServer.logFactionDisband) Factions.get().log("The faction "+faction.getTag()+" ("+faction.getId()+") was disbanded by "+(senderIsConsole ? "console command" : fme.getName())+"."); - if (Econ.isEnabled() && ! senderIsConsole) + if (Econ.isEnabled(faction)) { //Give all the faction's money to the disbander - double amount = Econ.getBalance(faction.getAccountId()); + double amount = Money.get(faction); Econ.transferMoney(fme, faction, fme, amount, false); if (amount > 0.0) { - String amountString = Econ.moneyString(amount); + String amountString = Money.format(faction, amount); msg("You have been given the disbanded faction's bank, totaling %s.", amountString); Factions.get().log(fme.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getTag()+"."); } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java index c9df1592..fb61a060 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FFlag; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFFlag; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.arg.ARBoolean; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java index 8d791348..3cee85cd 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java @@ -4,16 +4,16 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FFlag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventHomeTeleport; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqIsPlayer; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java index 56bda1b1..428a41ff 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.factions.event.FactionsEventInvitedChange; import com.massivecraft.mcore.cmd.arg.ARBoolean; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index ebf2ab83..637eaa8f 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java index 0c5a7be7..75bee2ca 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java @@ -2,13 +2,13 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java index d6cedfdc..84fc9c74 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.factions.util.RelationUtil; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java index ad984eac..751af4a2 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsList.java @@ -3,10 +3,10 @@ package com.massivecraft.factions.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.FactionListComparator; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java index 67efd8d3..9307ac3a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.mcore.cmd.arg.ARBoolean; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqIsPlayer; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java index 8b107238..5861ac7b 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 819200b8..8939a799 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java @@ -1,14 +1,15 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.Econ; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; import org.bukkit.ChatColor; @@ -37,11 +38,12 @@ public class CmdFactionsMoneyDeposit extends FCommand Faction faction = this.arg(1, ARFaction.get(), myFaction); if (faction == null) return; - boolean success = Econ.transferMoney(fme, fme, faction, amount); - + if (success && ConfServer.logMoneyTransactions) - Factions.get().log(ChatColor.stripColor(Txt.parse("%s deposited %s in the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null)))); + { + Factions.get().log(ChatColor.stripColor(Txt.parse("%s deposited %s in the faction bank: %s", fme.getName(), Money.format(fme, amount), faction.describeTo(null)))); + } } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java index d5f11c47..cb6a8cb3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java @@ -1,14 +1,15 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; import org.bukkit.ChatColor; @@ -43,6 +44,8 @@ public class CmdFactionsMoneyTransferFf extends FCommand boolean success = Econ.transferMoney(fme, from, to, amount); if (success && ConfServer.logMoneyTransactions) - Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the faction \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); + { + Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the faction \"%s\" to the faction \"%s\"", fme.getName(), Money.format(from, amount), from.describeTo(null), to.describeTo(null)))); + } } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index 45c09b56..c11bfb1d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java @@ -1,16 +1,17 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; import org.bukkit.ChatColor; @@ -45,6 +46,8 @@ public class CmdFactionsMoneyTransferFp extends FCommand boolean success = Econ.transferMoney(fme, from, to, amount); if (success && ConfServer.logMoneyTransactions) - Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the faction \"%s\" to the player \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); + { + Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the faction \"%s\" to the player \"%s\"", fme.getName(), Money.format(from, amount), from.describeTo(null), to.describeTo(null)))); + } } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index 74d0adf3..0779fe45 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java @@ -1,16 +1,17 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; import org.bukkit.ChatColor; @@ -45,6 +46,8 @@ public class CmdFactionsMoneyTransferPf extends FCommand boolean success = Econ.transferMoney(fme, from, to, amount); if (success && ConfServer.logMoneyTransactions) - Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the player \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); + { + Factions.get().log(ChatColor.stripColor(Txt.parse("%s transferred %s from the player \"%s\" to the faction \"%s\"", fme.getName(), Money.format(from, amount), from.describeTo(null), to.describeTo(null)))); + } } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 31e2540b..e2a61c89 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java @@ -1,14 +1,15 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; import org.bukkit.ChatColor; @@ -39,6 +40,8 @@ public class CmdFactionsMoneyWithdraw extends FCommand boolean success = Econ.transferMoney(fme, faction, fme, amount); if (success && ConfServer.logMoneyTransactions) - Factions.get().log(ChatColor.stripColor(Txt.parse("%s withdrew %s from the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null)))); + { + Factions.get().log(ChatColor.stripColor(Txt.parse("%s withdrew %s from the faction bank: %s", fme.getName(), Money.format(faction, amount), faction.describeTo(null)))); + } } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java index 9d75fb3e..0d383e00 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdFactionsOfficer extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java b/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java index 5a99b016..f7f3bdab 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.event.FactionsEventOpenChange; import com.massivecraft.mcore.cmd.arg.ARBoolean; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java index 30054a56..92a409b8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPerm; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.arg.ARRel; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.arg.ARBoolean; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPower.java b/src/com/massivecraft/factions/cmd/CmdFactionsPower.java index c4e42dc3..1aae69f3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPower.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPower.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdFactionsPower extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java index f96aa5c6..191ec84a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java @@ -1,11 +1,11 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.arg.ARDouble; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java index 4a8f1ac7..5bc47287 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdFactionsPromote extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java index 487102b0..e04b56fb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java @@ -2,11 +2,11 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FFlag; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventRelationChange; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.mcore.cmd.req.ReqHasPerm; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java index 1721f6da..e3e232c8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java @@ -2,10 +2,10 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventHomeChange; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqIsPlayer; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsShow.java index 30c4e5ad..3cb8bcad 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsShow.java @@ -7,14 +7,15 @@ import java.util.Map; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.cmd.arg.ARFaction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.FFlag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.util.Txt; public class CmdFactionsShow extends FCommand @@ -61,21 +62,21 @@ public class CmdFactionsShow extends FCommand msg("Land / Power / Maxpower: %d/%d/%d %s", faction.getLandCount(), faction.getPowerRounded(), faction.getPowerMaxRounded(), boost); // show the land value - if (Econ.isEnabled()) + if (Econ.isEnabled(faction)) { double value = Econ.calculateTotalLandValue(faction.getLandCount()); double refund = value * ConfServer.econClaimRefundMultiplier; if (value > 0) { - String stringValue = Econ.moneyString(value); - String stringRefund = (refund > 0.0) ? (" ("+Econ.moneyString(refund)+" depreciated)") : ""; + String stringValue = Money.format(faction, value); + String stringRefund = (refund > 0.0) ? (" ("+Money.format(faction, refund)+" depreciated)") : ""; msg("Total land value: " + stringValue + stringRefund); } //Show bank contents if(ConfServer.bankEnabled) { - msg("Bank contains: "+Econ.moneyString(Econ.getBalance(faction.getAccountId()))); + msg("Bank contains: "+Money.format(faction, Money.get(faction))); } } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTag.java b/src/com/massivecraft/factions/cmd/CmdFactionsTag.java index 84318622..de10d6b2 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTag.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTag.java @@ -3,11 +3,11 @@ package com.massivecraft.factions.cmd; import java.util.ArrayList; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.event.FactionsEventTagChange; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.util.MiscUtil; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index d47b0175..d742ccf3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java @@ -1,11 +1,11 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARFPlayer; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.factions.event.FactionsEventTitleChange; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.mcore.cmd.arg.ARString; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java index 1462d10b..01a7c93d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventLandUnclaim; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -39,9 +39,9 @@ public class CmdFactionsUnclaim extends FCommand if (event.isCancelled()) return; //String moneyBack = ""; - if (Econ.isEnabled()) + if (Econ.isEnabled(myFaction)) { - double refund = Econ.calculateClaimRefund(myFaction.getLandCount()); + double refund = Econ.calculateClaimRefund(myFaction); if (ConfServer.bankEnabled && ConfServer.bankFactionPaysLandCosts) { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java index 2a98dafd..96f9fddb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java @@ -1,11 +1,11 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; +import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.event.FactionsEventLandUnclaimAll; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.SpoutFeatures; @@ -25,7 +25,7 @@ public class CmdFactionsUnclaimall extends FCommand public void perform() { // TODO: Put this as a listener and not in here! - if (Econ.isEnabled()) + if (Econ.isEnabled(myFaction)) { double refund = Econ.calculateTotalLandRefund(myFaction.getLandCount()); if(ConfServer.bankEnabled && ConfServer.bankFactionPaysLandCosts) diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/com/massivecraft/factions/cmd/FCommand.java index a4e16a53..87efe518 100644 --- a/src/com/massivecraft/factions/cmd/FCommand.java +++ b/src/com/massivecraft/factions/cmd/FCommand.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/cmd/arg/ARFPlayer.java b/src/com/massivecraft/factions/cmd/arg/ARFPlayer.java index 91facc72..32b2ce94 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFPlayer.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFPlayer.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.cmd.arg; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; import com.massivecraft.mcore.cmd.arg.ARSenderEntity; import com.massivecraft.mcore.cmd.arg.ArgReader; diff --git a/src/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/com/massivecraft/factions/cmd/arg/ARFaction.java index 8c104142..f66ddc78 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFaction.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFaction.java @@ -2,10 +2,10 @@ package com.massivecraft.factions.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.mcore.cmd.arg.ArgReaderAbstract; import com.massivecraft.mcore.cmd.arg.ArgResult; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java index 811af272..b3cb1a78 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java +++ b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqAbstract; import com.massivecraft.mcore.util.Txt; diff --git a/src/com/massivecraft/factions/Board.java b/src/com/massivecraft/factions/entity/Board.java similarity index 93% rename from src/com/massivecraft/factions/Board.java rename to src/com/massivecraft/factions/entity/Board.java index fa5869a6..9f105910 100644 --- a/src/com/massivecraft/factions/Board.java +++ b/src/com/massivecraft/factions/entity/Board.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.lang.reflect.Type; import java.util.ArrayList; @@ -10,7 +10,11 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.bukkit.ChatColor; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.RelationParticipator; +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.mcore.ps.PS; diff --git a/src/com/massivecraft/factions/BoardColl.java b/src/com/massivecraft/factions/entity/BoardColl.java similarity index 90% rename from src/com/massivecraft/factions/BoardColl.java rename to src/com/massivecraft/factions/entity/BoardColl.java index ec71ab39..f23b5caf 100644 --- a/src/com/massivecraft/factions/BoardColl.java +++ b/src/com/massivecraft/factions/entity/BoardColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.io.File; import java.lang.reflect.Type; @@ -6,7 +6,11 @@ import java.util.ArrayList; import java.util.Map; import java.util.Map.Entry; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.RelationParticipator; +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.mcore.ps.PS; import com.massivecraft.mcore.ps.PSBuilder; import com.massivecraft.mcore.store.Coll; diff --git a/src/com/massivecraft/factions/BoardInterface.java b/src/com/massivecraft/factions/entity/BoardInterface.java similarity index 81% rename from src/com/massivecraft/factions/BoardInterface.java rename to src/com/massivecraft/factions/entity/BoardInterface.java index ebcf8986..e1f79462 100644 --- a/src/com/massivecraft/factions/BoardInterface.java +++ b/src/com/massivecraft/factions/entity/BoardInterface.java @@ -1,8 +1,9 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.util.ArrayList; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.RelationParticipator; +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.mcore.ps.PS; public interface BoardInterface diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/entity/FPlayer.java similarity index 97% rename from src/com/massivecraft/factions/FPlayer.java rename to src/com/massivecraft/factions/entity/FPlayer.java index 17a7121a..56f15ca8 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/entity/FPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.util.HashSet; import java.util.Set; @@ -6,19 +6,27 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.entity.Player; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.EconomyParticipator; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Lang; +import com.massivecraft.factions.Rel; +import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.event.FactionsEventLandClaim; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.factions.event.FactionsEventPowerChange; import com.massivecraft.factions.event.FactionsEventPowerChange.PowerChangeReason; -import com.massivecraft.factions.iface.EconomyParticipator; -import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.Worldguard; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.money.Money; import com.massivecraft.mcore.ps.PS; import com.massivecraft.mcore.store.SenderEntity; import com.massivecraft.mcore.util.TimeUnit; @@ -705,8 +713,10 @@ public class FPlayer extends SenderEntity implements EconomyParticipato if (myFaction.getFPlayers().size() == 1) { // Transfer all money - if (Econ.isEnabled()) - Econ.transferMoney(this, myFaction, this, Econ.getBalance(myFaction.getAccountId())); + if (Econ.isEnabled(this)) + { + Econ.transferMoney(this, myFaction, this, Money.get(this)); + } } if (myFaction.isNormal()) diff --git a/src/com/massivecraft/factions/FPlayerColl.java b/src/com/massivecraft/factions/entity/FPlayerColl.java similarity index 91% rename from src/com/massivecraft/factions/FPlayerColl.java rename to src/com/massivecraft/factions/entity/FPlayerColl.java index 483df0fa..b07593b2 100644 --- a/src/com/massivecraft/factions/FPlayerColl.java +++ b/src/com/massivecraft/factions/entity/FPlayerColl.java @@ -1,10 +1,14 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.io.File; import java.lang.reflect.Type; import java.util.Map; import java.util.Map.Entry; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Rel; import com.massivecraft.mcore.mixin.Mixin; import com.massivecraft.mcore.store.MStore; import com.massivecraft.mcore.store.SenderColl; diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/entity/Faction.java similarity index 97% rename from src/com/massivecraft/factions/Faction.java rename to src/com/massivecraft/factions/entity/Faction.java index 4a477aac..a96336f8 100644 --- a/src/com/massivecraft/factions/Faction.java +++ b/src/com/massivecraft/factions/entity/Faction.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.util.*; import java.util.Map.Entry; @@ -8,8 +8,16 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.factions.iface.EconomyParticipator; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.EconomyParticipator; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; +import com.massivecraft.factions.FactionEqualsPredictate; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Lang; +import com.massivecraft.factions.Rel; +import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.util.*; import com.massivecraft.mcore.mixin.Mixin; diff --git a/src/com/massivecraft/factions/FactionColl.java b/src/com/massivecraft/factions/entity/FactionColl.java similarity index 92% rename from src/com/massivecraft/factions/FactionColl.java rename to src/com/massivecraft/factions/entity/FactionColl.java index 07c2b65d..e0c682c4 100644 --- a/src/com/massivecraft/factions/FactionColl.java +++ b/src/com/massivecraft/factions/entity/FactionColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package com.massivecraft.factions.entity; import java.io.File; import java.lang.reflect.Type; @@ -14,6 +14,12 @@ import com.massivecraft.mcore.util.DiscUtil; import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.util.MiscUtil; @@ -76,9 +82,12 @@ public class FactionColl extends Coll String ret = super.attach(faction, oid, noteChange); // Factions start with 0 money. - if (!Money.exists(faction, faction)) + // TODO: Can this be done here? + // TODO: Or will it be a to heavy operation to do this often? + + if (!Money.exists(faction)) { - Money.set(faction, faction, 0); + Money.set(faction, 0); } return ret; @@ -203,7 +212,7 @@ public class FactionColl extends Coll public void econLandRewardRoutine() { - if (!Econ.isEnabled()) return; + if (!Econ.isEnabled(this.getUniverse())) return; if (ConfServer.econLandReward == 0.0) return; Factions.get().log("Running econLandRewardRoutine..."); diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java new file mode 100644 index 00000000..5e4da7c7 --- /dev/null +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -0,0 +1,22 @@ +package com.massivecraft.factions.entity; + +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.Entity; + +public class MConf extends Entity +{ + // -------------------------------------------- // + // META + // -------------------------------------------- // + + public static MConf get() + { + return MConfColl.get().get(MCore.INSTANCE); + } + + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + +} \ No newline at end of file diff --git a/src/com/massivecraft/factions/entity/MConfColl.java b/src/com/massivecraft/factions/entity/MConfColl.java new file mode 100644 index 00000000..4d96427a --- /dev/null +++ b/src/com/massivecraft/factions/entity/MConfColl.java @@ -0,0 +1,34 @@ +package com.massivecraft.factions.entity; + +import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.Const; +import com.massivecraft.factions.Factions; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.store.MStore; + +public class MConfColl extends Coll +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static MConfColl i = new MConfColl(); + public static MConfColl get() { return i; } + private MConfColl() + { + super(Const.COLLECTION_BASENAME_MCONF, MConf.class, MStore.getDb(ConfServer.dburi), Factions.get(), true, false); + } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void init() + { + super.init(); + this.get(MCore.INSTANCE); + } + +} diff --git a/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java b/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java index b00665c5..0e2a64d8 100644 --- a/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java +++ b/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java @@ -2,7 +2,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; -import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.entity.FPlayer; import com.massivecraft.mcore.event.MCoreEvent; public abstract class FactionsEventAbstractSender extends MCoreEvent diff --git a/src/com/massivecraft/factions/event/FactionsEventDescriptionChange.java b/src/com/massivecraft/factions/event/FactionsEventDescriptionChange.java index fd141804..49578143 100644 --- a/src/com/massivecraft/factions/event/FactionsEventDescriptionChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventDescriptionChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; public class FactionsEventDescriptionChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventDisband.java b/src/com/massivecraft/factions/event/FactionsEventDisband.java index 3ee3081a..fa649eaa 100644 --- a/src/com/massivecraft/factions/event/FactionsEventDisband.java +++ b/src/com/massivecraft/factions/event/FactionsEventDisband.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; public class FactionsEventDisband extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventHomeChange.java b/src/com/massivecraft/factions/event/FactionsEventHomeChange.java index 40d51406..ac47c996 100644 --- a/src/com/massivecraft/factions/event/FactionsEventHomeChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventHomeChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; public class FactionsEventHomeChange extends FactionsEventAbstractSender diff --git a/src/com/massivecraft/factions/event/FactionsEventInvitedChange.java b/src/com/massivecraft/factions/event/FactionsEventInvitedChange.java index c89302a3..3114e869 100644 --- a/src/com/massivecraft/factions/event/FactionsEventInvitedChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventInvitedChange.java @@ -3,8 +3,8 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; public class FactionsEventInvitedChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventLandClaim.java b/src/com/massivecraft/factions/event/FactionsEventLandClaim.java index 9702c8ea..e57920d4 100644 --- a/src/com/massivecraft/factions/event/FactionsEventLandClaim.java +++ b/src/com/massivecraft/factions/event/FactionsEventLandClaim.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; public class FactionsEventLandClaim extends FactionsEventAbstractSender diff --git a/src/com/massivecraft/factions/event/FactionsEventLandUnclaim.java b/src/com/massivecraft/factions/event/FactionsEventLandUnclaim.java index bd1c0465..0abcd534 100644 --- a/src/com/massivecraft/factions/event/FactionsEventLandUnclaim.java +++ b/src/com/massivecraft/factions/event/FactionsEventLandUnclaim.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; public class FactionsEventLandUnclaim extends FactionsEventAbstractSender diff --git a/src/com/massivecraft/factions/event/FactionsEventLandUnclaimAll.java b/src/com/massivecraft/factions/event/FactionsEventLandUnclaimAll.java index d3257966..9431c411 100644 --- a/src/com/massivecraft/factions/event/FactionsEventLandUnclaimAll.java +++ b/src/com/massivecraft/factions/event/FactionsEventLandUnclaimAll.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; public class FactionsEventLandUnclaimAll extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java b/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java index 3d110090..13f8aec0 100644 --- a/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java @@ -3,8 +3,8 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; public class FactionsEventMembershipChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventOpenChange.java b/src/com/massivecraft/factions/event/FactionsEventOpenChange.java index b26eba4a..f931de78 100644 --- a/src/com/massivecraft/factions/event/FactionsEventOpenChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventOpenChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; public class FactionsEventOpenChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventPowerChange.java b/src/com/massivecraft/factions/event/FactionsEventPowerChange.java index cf3f46f9..7c4c542e 100644 --- a/src/com/massivecraft/factions/event/FactionsEventPowerChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventPowerChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.entity.FPlayer; public class FactionsEventPowerChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventRelationChange.java b/src/com/massivecraft/factions/event/FactionsEventRelationChange.java index 0e3b4af9..a46aacf1 100644 --- a/src/com/massivecraft/factions/event/FactionsEventRelationChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventRelationChange.java @@ -3,8 +3,8 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.Faction; public class FactionsEventRelationChange extends FactionsEventAbstractSender diff --git a/src/com/massivecraft/factions/event/FactionsEventTagChange.java b/src/com/massivecraft/factions/event/FactionsEventTagChange.java index 214c74e0..8957e589 100644 --- a/src/com/massivecraft/factions/event/FactionsEventTagChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventTagChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.Faction; +import com.massivecraft.factions.entity.Faction; public class FactionsEventTagChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventTitleChange.java b/src/com/massivecraft/factions/event/FactionsEventTitleChange.java index 6a6f3b69..5262d8c1 100644 --- a/src/com/massivecraft/factions/event/FactionsEventTitleChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventTitleChange.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.entity.FPlayer; public class FactionsEventTitleChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index 558f0055..32b9eec0 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -4,68 +4,26 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; -import org.bukkit.Bukkit; -import org.bukkit.plugin.RegisteredServiceProvider; - import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.EconomyParticipator; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.iface.EconomyParticipator; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.util.RelationUtil; - -import net.milkbowl.vault.economy.Economy; -import net.milkbowl.vault.economy.EconomyResponse; - +import com.massivecraft.mcore.money.Money; public class Econ { - // -------------------------------------------- // - // DERPY OLDSCHOOL SETUP - // -------------------------------------------- // - - public static void setup() - { - if (economy != null) return; - - String integrationFail = "Economy integration is "+(ConfServer.econEnabled ? "enabled, but" : "disabled, and")+" the plugin \"Vault\" "; - - if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null) - { - Factions.get().log(integrationFail+"is not installed."); - return; - } - - RegisteredServiceProvider rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class); - if (rsp == null) - { - Factions.get().log(integrationFail+"is not hooked into an economy plugin."); - return; - } - economy = rsp.getProvider(); - - Factions.get().log("Economy integration through Vault plugin successful."); - - if (!ConfServer.econEnabled) - { - Factions.get().log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true"); - } - } - - // -------------------------------------------- // - // FIELDS - // -------------------------------------------- // - - private static Economy economy = null; - // -------------------------------------------- // // STATE // -------------------------------------------- // - public static boolean isEnabled() + // TODO: Do we really need that config option? + // TODO: Could we not have it enabled as long as Money.enabled is true? + public static boolean isEnabled(Object universe) { - return ConfServer.econEnabled && economy != null && economy.isEnabled(); + return ConfServer.econEnabled && Money.enabled(universe); } // -------------------------------------------- // @@ -74,7 +32,7 @@ public class Econ public static boolean payForAction(double cost, FPlayer fsender, String actionDescription) { - if (!isEnabled()) return true; + if (!isEnabled(fsender)) return true; if (cost == 0D) return true; if (fsender.isUsingAdminMode()) return true; @@ -94,25 +52,27 @@ public class Econ // ASSORTED // -------------------------------------------- // - public static void modifyUniverseMoney(double delta) + public static void modifyUniverseMoney(Object universe, double delta) { - if (!isEnabled()) return; + if (!isEnabled(universe)) return; if (ConfServer.econUniverseAccount == null) return; if (ConfServer.econUniverseAccount.length() == 0) return; - if ( ! economy.hasAccount(ConfServer.econUniverseAccount)) return; + + if (!Money.exists(universe, ConfServer.econUniverseAccount)) return; - deposit(ConfServer.econUniverseAccount, delta); + Money.add(universe, ConfServer.econUniverseAccount, delta); } public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) { - if (!isEnabled()) + if (!isEnabled(to)) { Factions.get().log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin."); return; } - to.msg("%s's balance is %s.", about.describeTo(to, true), Econ.moneyString(economy.getBalance(about.getAccountId()))); + + to.msg("%s's balance is %s.", about.describeTo(to, true), Money.format(about, Money.get(about))); } public static boolean canIControllYou(EconomyParticipator i, EconomyParticipator you) @@ -148,7 +108,7 @@ public class Econ } public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount, boolean notify) { - if ( ! isEnabled()) return false; + if (!isEnabled(from)) return false; // The amount must be positive. // If the amount is negative we must flip and multiply amount with -1. @@ -164,23 +124,26 @@ public class Econ if ( ! canIControllYou(invoker, from)) return false; // Is there enough money for the transaction to happen? - if ( ! economy.has(from.getAccountId(), amount)) + + + + if (Money.get(from) < amount) { // There was not enough money to pay if (invoker != null && notify) { - invoker.msg("%s can't afford to transfer %s to %s.", from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker)); + invoker.msg("%s can't afford to transfer %s to %s.", from.describeTo(invoker, true), Money.format(from, amount), to.describeTo(invoker)); } return false; } // Transfer money - EconomyResponse erw = economy.withdrawPlayer(from.getAccountId(), amount); - if (erw.transactionSuccess()) + + + if (Money.subtract(from, amount)) { - EconomyResponse erd = economy.depositPlayer(to.getAccountId(), amount); - if (erd.transactionSuccess()) + if (Money.add(from, amount)) { if (notify) { @@ -190,18 +153,16 @@ public class Econ } else { - // transaction failed, refund account - // TODO: This must be invalid thinking for sure! - // Atomicity should be built into the system implementing Vault. We are /not/ doing manual rollbacks. - // TODO: Re - economy.depositPlayer(from.getAccountId(), amount); + // We failed. Try a rollback + Money.add(from, amount); } } // if we get here something with the transaction failed if (notify) - invoker.msg("Unable to transfer %s to %s from %s.", moneyString(amount), to.describeTo(invoker), from.describeTo(invoker, true)); - + { + invoker.msg("Unable to transfer %s to %s from %s.", Money.format(from, amount), to.describeTo(invoker), from.describeTo(invoker, true)); + } return false; } @@ -237,40 +198,42 @@ public class Econ { for (FPlayer recipient : recipients) { - recipient.msg("%s was transfered from %s to %s.", moneyString(amount), from.describeTo(recipient), to.describeTo(recipient)); + recipient.msg("%s was transfered from %s to %s.", Money.format(from, amount), from.describeTo(recipient), to.describeTo(recipient)); } } else if (invoker == from) { for (FPlayer recipient : recipients) { - recipient.msg("%s gave %s to %s.", from.describeTo(recipient, true), moneyString(amount), to.describeTo(recipient)); + recipient.msg("%s gave %s to %s.", from.describeTo(recipient, true), Money.format(from, amount), to.describeTo(recipient)); } } else if (invoker == to) { for (FPlayer recipient : recipients) { - recipient.msg("%s took %s from %s.", to.describeTo(recipient, true), moneyString(amount), from.describeTo(recipient)); + recipient.msg("%s took %s from %s.", to.describeTo(recipient, true), Money.format(from, amount), from.describeTo(recipient)); } } else { for (FPlayer recipient : recipients) { - recipient.msg("%s transfered %s from %s to %s.", invoker.describeTo(recipient, true), moneyString(amount), from.describeTo(recipient), to.describeTo(recipient)); + recipient.msg("%s transfered %s from %s to %s.", invoker.describeTo(recipient, true), Money.format(from, amount), from.describeTo(recipient), to.describeTo(recipient)); } } } public static boolean hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) { - if (!isEnabled()) return true; + if (!isEnabled(ep)) return true; - if ( ! economy.has(ep.getAccountId(), delta)) + if (Money.get(ep) < delta) { if (toDoThis != null && !toDoThis.isEmpty()) - ep.msg("%s can't afford %s %s.", ep.describeTo(ep, true), moneyString(delta), toDoThis); + { + ep.msg("%s can't afford %s %s.", ep.describeTo(ep, true), Money.format(ep, delta), toDoThis); + } return false; } return true; @@ -278,71 +241,50 @@ public class Econ public static boolean modifyMoney(EconomyParticipator ep, double delta, String actionDescription) { - if (!isEnabled()) return false; + if (!isEnabled(ep)) return false; if (delta == 0) return true; - String accountId = ep.getAccountId(); String You = ep.describeTo(ep, true); boolean hasActionDesctription = (actionDescription != null && !actionDescription.isEmpty()); - if (delta > 0) + if (Money.add(ep, delta)) { - // The player should gain money - // The account might not have enough space - EconomyResponse er = economy.depositPlayer(accountId, delta); - if (er.transactionSuccess()) - { - modifyUniverseMoney(-delta); - if (hasActionDesctription) - { - ep.msg("%s gained %s since did %s.", You, moneyString(delta), actionDescription); - } - return true; - } - else - { - // transfer to account failed - if (hasActionDesctription) - { - ep.msg("%s would have gained %s since did %s, but the deposit failed.", You, moneyString(delta), actionDescription); - } - return false; - } + modifyUniverseMoney(ep, -delta); + if (hasActionDesctription) + { + if (delta > 0) + { + ep.msg("%s gained %s since did %s.", You, Money.format(ep, delta), actionDescription); + } + else + { + ep.msg("%s lost %s since did %s.", You, Money.format(ep, delta), actionDescription); + } + } + return true; } else { - // The player should loose money - // The player might not have enough. - EconomyResponse er = economy.withdrawPlayer(accountId, -delta); - if (er.transactionSuccess()) + if (hasActionDesctription) { - // There is enough money to pay - modifyUniverseMoney(-delta); - if (hasActionDesctription) + if (delta > 0) { - ep.msg("%s lost %s since did %s.", You, moneyString(delta), actionDescription); + ep.msg("%s would have gained %s since did %s, but the deposit failed.", You, Money.format(ep, delta), actionDescription); } - return true; - } - else - { - // There was not enough money to pay - if (hasActionDesctription) + else { - ep.msg("%s can't afford %s to %s.", You, moneyString(-delta), actionDescription); + ep.msg("%s can't afford %s to %s.", You, Money.format(ep, delta), actionDescription); } - return false; } + return false; } } // calculate the cost for claiming land public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction) { - if (!isEnabled()) return 0D; - // basic claim cost, plus land inflation cost, minus the potential bonus given for claiming from another faction return ConfServer.econCostClaimWilderness + (ConfServer.econCostClaimWilderness * ConfServer.econClaimAdditionalMultiplier * ownedLand) @@ -350,9 +292,9 @@ public class Econ } // calculate refund amount for unclaiming land - public static double calculateClaimRefund(int ownedLand) + public static double calculateClaimRefund(Faction forFaction) { - return calculateClaimCost(ownedLand - 1, false) * ConfServer.econClaimRefundMultiplier; + return calculateClaimCost(forFaction.getLandCount() - 1, false) * ConfServer.econClaimRefundMultiplier; } // calculate value of all owned land @@ -371,50 +313,5 @@ public class Econ { return calculateTotalLandValue(ownedLand) * ConfServer.econClaimRefundMultiplier; } - - // -------------------------------------------- // - // Standard account management methods - // -------------------------------------------- // - - // format money string based on server's set currency type, like "24 gold" or "$24.50" - public static String moneyString(double amount) - { - return economy.format(amount); - } - public static boolean hasAccount(String name) - { - return economy.hasAccount(name); - } - - public static double getBalance(String account) - { - return economy.getBalance(account); - } - - public static boolean setBalance(String account, double amount) - { - // This is about as stupid as it seems. - // Vault does however not implement a set balance feature. - double current = economy.getBalance(account); - return deposit(account, amount - current); - } - - public static boolean deposit(String account, double amount) - { - if (amount < 0) - { - return withdraw(account, -amount); - } - return economy.depositPlayer(account, amount).transactionSuccess(); - } - - public static boolean withdraw(String account, double amount) - { - if (amount < 0) - { - return deposit(account, -amount); - } - return economy.withdrawPlayer(account, amount).transactionSuccess(); - } } diff --git a/src/com/massivecraft/factions/integration/LWCFeatures.java b/src/com/massivecraft/factions/integration/LWCFeatures.java index 49cf2b3d..590f06fc 100644 --- a/src/com/massivecraft/factions/integration/LWCFeatures.java +++ b/src/com/massivecraft/factions/integration/LWCFeatures.java @@ -14,9 +14,9 @@ import com.griefcraft.lwc.LWC; import com.griefcraft.lwc.LWCPlugin; import com.griefcraft.model.Protection; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; public class LWCFeatures diff --git a/src/com/massivecraft/factions/integration/SpoutFeatures.java b/src/com/massivecraft/factions/integration/SpoutFeatures.java index 7e00c0b0..d4edb612 100644 --- a/src/com/massivecraft/factions/integration/SpoutFeatures.java +++ b/src/com/massivecraft/factions/integration/SpoutFeatures.java @@ -6,9 +6,6 @@ import java.util.HashSet; import java.util.Set; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import org.bukkit.Bukkit; @@ -16,6 +13,9 @@ import org.bukkit.ChatColor; import org.bukkit.plugin.Plugin; import org.bukkit.entity.Player; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.util.HealthBarUtil; import com.massivecraft.mcore.ps.PS; diff --git a/src/com/massivecraft/factions/integration/SpoutMainListener.java b/src/com/massivecraft/factions/integration/SpoutMainListener.java index e93086ee..ae653e98 100644 --- a/src/com/massivecraft/factions/integration/SpoutMainListener.java +++ b/src/com/massivecraft/factions/integration/SpoutMainListener.java @@ -8,13 +8,13 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.ps.PS; import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; diff --git a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java b/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java index e07251aa..6d89724b 100644 --- a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java +++ b/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java @@ -22,10 +22,10 @@ import com.dthielke.herochat.Herochat; import com.dthielke.herochat.MessageFormatSupplier; import com.dthielke.herochat.MessageNotFoundException; import com.dthielke.herochat.util.Messaging; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; public abstract class FactionsChannelAbstract implements Channel { diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerMain.java b/src/com/massivecraft/factions/listeners/FactionsListenerMain.java index d94525ed..604384d2 100644 --- a/src/com/massivecraft/factions/listeners/FactionsListenerMain.java +++ b/src/com/massivecraft/factions/listeners/FactionsListenerMain.java @@ -44,16 +44,16 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerMoveEvent; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.Const; import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.FactionsEventPowerChange; import com.massivecraft.factions.event.FactionsEventPowerChange.PowerChangeReason; import com.massivecraft.factions.util.VisualizeUtil; diff --git a/src/com/massivecraft/factions/listeners/TodoFactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/TodoFactionsPlayerListener.java index d95732c4..277716c5 100644 --- a/src/com/massivecraft/factions/listeners/TodoFactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/TodoFactionsPlayerListener.java @@ -14,13 +14,13 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; -import com.massivecraft.factions.BoardColl; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.Const; import com.massivecraft.factions.FPerm; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.FPlayerColl; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; import com.massivecraft.mcore.ps.PS; diff --git a/src/com/massivecraft/factions/task/AutoLeaveTask.java b/src/com/massivecraft/factions/task/AutoLeaveTask.java index b55129ac..369b3c43 100644 --- a/src/com/massivecraft/factions/task/AutoLeaveTask.java +++ b/src/com/massivecraft/factions/task/AutoLeaveTask.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.task; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FPlayerColl; +import com.massivecraft.factions.entity.FPlayerColl; import com.massivecraft.mcore.ModuloRepeatTask; import com.massivecraft.mcore.util.TimeUnit; diff --git a/src/com/massivecraft/factions/task/EconLandRewardTask.java b/src/com/massivecraft/factions/task/EconLandRewardTask.java index 6b4b0997..18027795 100644 --- a/src/com/massivecraft/factions/task/EconLandRewardTask.java +++ b/src/com/massivecraft/factions/task/EconLandRewardTask.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.task; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FactionColl; +import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.mcore.ModuloRepeatTask; import com.massivecraft.mcore.util.TimeUnit; diff --git a/src/com/massivecraft/factions/util/RelationUtil.java b/src/com/massivecraft/factions/util/RelationUtil.java index e3b737f9..c597e1e9 100644 --- a/src/com/massivecraft/factions/util/RelationUtil.java +++ b/src/com/massivecraft/factions/util/RelationUtil.java @@ -4,10 +4,10 @@ import org.bukkit.ChatColor; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FFlag; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; import com.massivecraft.factions.Rel; -import com.massivecraft.factions.iface.RelationParticipator; +import com.massivecraft.factions.RelationParticipator; +import com.massivecraft.factions.entity.FPlayer; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.mcore.util.Txt; public class RelationUtil