diff --git a/plugin.yml b/plugin.yml index 615c2427..8cfcbc98 100644 --- a/plugin.yml +++ b/plugin.yml @@ -4,7 +4,7 @@ version: 2.4.0 website: http://massivecraft.com/factions authors: [Cayorion, Brettflan] description: §eFactions allows the players to team up and claim land as their own and start wars with other factions. This way we hope to inspire politics, intrigue, and team spirit. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead Factions programmer. Feel free to visit us at §bhttp://massivecraft.com -depend: [mcore] +depend: [MassiveCore] softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag] permissions: # -------------------------------------------- # diff --git a/src/com/massivecraft/factions/EngineIdUpdate.java b/src/com/massivecraft/factions/EngineIdUpdate.java index 390004b8..96afe04d 100644 --- a/src/com/massivecraft/factions/EngineIdUpdate.java +++ b/src/com/massivecraft/factions/EngineIdUpdate.java @@ -15,10 +15,10 @@ import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.MPlayerColl; import com.massivecraft.factions.entity.UPlayerColl; import com.massivecraft.factions.entity.UPlayerColls; -import com.massivecraft.mcore.EngineAbstract; -import com.massivecraft.mcore.event.MCoreUuidUpdateEvent; -import com.massivecraft.mcore.util.IdUpdateUtil; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.EngineAbstract; +import com.massivecraft.massivecore.event.EventMassiveCoreUuidUpdate; +import com.massivecraft.massivecore.util.IdUpdateUtil; +import com.massivecraft.massivecore.util.MUtil; public class EngineIdUpdate extends EngineAbstract { @@ -44,7 +44,7 @@ public class EngineIdUpdate extends EngineAbstract // -------------------------------------------- // @EventHandler(priority = EventPriority.MONITOR) - public void update(MCoreUuidUpdateEvent event) + public void update(EventMassiveCoreUuidUpdate event) { for (FactionColl coll : FactionColls.get().getColls()) { diff --git a/src/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/com/massivecraft/factions/ExtractorFactionAccountId.java index 547962e9..a9cbaac1 100644 --- a/src/com/massivecraft/factions/ExtractorFactionAccountId.java +++ b/src/com/massivecraft/factions/ExtractorFactionAccountId.java @@ -1,7 +1,7 @@ package com.massivecraft.factions; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.util.extractor.Extractor; +import com.massivecraft.massivecore.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 429c2578..13241cb7 100644 --- a/src/com/massivecraft/factions/FPerm.java +++ b/src/com/massivecraft/factions/FPerm.java @@ -11,8 +11,8 @@ import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.UConf; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.Txt; /** * Permissions that you (a player) may or may not have in the territory of a certain faction. diff --git a/src/com/massivecraft/factions/FactionEqualsPredictate.java b/src/com/massivecraft/factions/FactionEqualsPredictate.java index 07dba71c..9ec2c2c6 100644 --- a/src/com/massivecraft/factions/FactionEqualsPredictate.java +++ b/src/com/massivecraft/factions/FactionEqualsPredictate.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.Predictate; +import com.massivecraft.massivecore.Predictate; public class FactionEqualsPredictate implements Predictate, Serializable { diff --git a/src/com/massivecraft/factions/FactionListComparator.java b/src/com/massivecraft/factions/FactionListComparator.java index 861a7fdb..c73f6890 100644 --- a/src/com/massivecraft/factions/FactionListComparator.java +++ b/src/com/massivecraft/factions/FactionListComparator.java @@ -3,7 +3,7 @@ package com.massivecraft.factions; import java.util.Comparator; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class FactionListComparator implements Comparator { diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index 11f23776..686ae48d 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -29,8 +29,8 @@ import com.massivecraft.factions.entity.UConfColls; import com.massivecraft.factions.entity.UPlayerColls; import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.MConfColl; -import com.massivecraft.factions.integration.herochat.HerochatFeatures; -import com.massivecraft.factions.integration.lwc.LwcFeatures; +import com.massivecraft.factions.integration.herochat.IntegrationHerochat; +import com.massivecraft.factions.integration.lwc.IntegrationLwc; import com.massivecraft.factions.listeners.FactionsListenerChat; import com.massivecraft.factions.listeners.FactionsListenerEcon; import com.massivecraft.factions.listeners.FactionsListenerExploit; @@ -40,17 +40,16 @@ import com.massivecraft.factions.mixin.PowerMixinDefault; import com.massivecraft.factions.task.TaskPlayerDataRemove; import com.massivecraft.factions.task.TaskEconLandReward; import com.massivecraft.factions.task.TaskPlayerPowerUpdate; - -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.AspectColl; -import com.massivecraft.mcore.MPlugin; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.GsonBuilder; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.AspectColl; +import com.massivecraft.massivecore.MassivePlugin; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; -public class Factions extends MPlugin +public class Factions extends MassivePlugin { // -------------------------------------------- // // CONSTANTS @@ -140,8 +139,8 @@ public class Factions extends MPlugin // Integrate this.integrate( - HerochatFeatures.get(), - LwcFeatures.get() + IntegrationHerochat.get(), + IntegrationLwc.get() ); // Schedule recurring non-tps-dependent tasks diff --git a/src/com/massivecraft/factions/Lang.java b/src/com/massivecraft/factions/Lang.java index d0b5499a..f052393f 100644 --- a/src/com/massivecraft/factions/Lang.java +++ b/src/com/massivecraft/factions/Lang.java @@ -1,6 +1,6 @@ package com.massivecraft.factions; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class Lang { diff --git a/src/com/massivecraft/factions/Perm.java b/src/com/massivecraft/factions/Perm.java index d665fca3..1a7ffd90 100644 --- a/src/com/massivecraft/factions/Perm.java +++ b/src/com/massivecraft/factions/Perm.java @@ -2,7 +2,7 @@ package com.massivecraft.factions; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.util.PermUtil; +import com.massivecraft.massivecore.util.PermUtil; public enum Perm { diff --git a/src/com/massivecraft/factions/adapter/BoardAdapter.java b/src/com/massivecraft/factions/adapter/BoardAdapter.java index 1758b545..b2b060a3 100644 --- a/src/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardAdapter.java @@ -3,14 +3,13 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Map; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonParseException; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; - +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.entity.Board; diff --git a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java index 34b37d1a..e724cc7b 100644 --- a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java @@ -5,15 +5,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonParseException; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; - +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import com.massivecraft.factions.TerritoryAccess; public class BoardMapAdapter implements JsonDeserializer>, JsonSerializer> diff --git a/src/com/massivecraft/factions/adapter/FFlagAdapter.java b/src/com/massivecraft/factions/adapter/FFlagAdapter.java index b733e445..55c7f9dc 100644 --- a/src/com/massivecraft/factions/adapter/FFlagAdapter.java +++ b/src/com/massivecraft/factions/adapter/FFlagAdapter.java @@ -3,10 +3,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import com.massivecraft.factions.FFlag; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; public class FFlagAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/factions/adapter/FPermAdapter.java b/src/com/massivecraft/factions/adapter/FPermAdapter.java index c723c531..caef6d95 100644 --- a/src/com/massivecraft/factions/adapter/FPermAdapter.java +++ b/src/com/massivecraft/factions/adapter/FPermAdapter.java @@ -2,11 +2,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonParseException; - +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; import com.massivecraft.factions.FPerm; public class FPermAdapter implements JsonDeserializer diff --git a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java b/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java index a9f143a2..09cab356 100644 --- a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java +++ b/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java @@ -2,12 +2,11 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonParseException; - +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; diff --git a/src/com/massivecraft/factions/adapter/RelAdapter.java b/src/com/massivecraft/factions/adapter/RelAdapter.java index 3a723834..22c15cad 100644 --- a/src/com/massivecraft/factions/adapter/RelAdapter.java +++ b/src/com/massivecraft/factions/adapter/RelAdapter.java @@ -2,11 +2,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonParseException; - +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; import com.massivecraft.factions.Rel; public class RelAdapter implements JsonDeserializer diff --git a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java index f3399165..2cd9f81d 100644 --- a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java +++ b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java @@ -3,16 +3,15 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Set; -import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonParseException; -import com.massivecraft.mcore.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; - +import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; import com.massivecraft.factions.TerritoryAccess; public class TerritoryAccessAdapter implements JsonDeserializer, JsonSerializer diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java index 5055b414..af5cbec7 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.chat.modifier; import org.bukkit.command.CommandSender; import com.massivecraft.factions.chat.ChatModifierAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class ChatModifierParse extends ChatModifierAbstract { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java index 3f3dcac4..9b0cb4e1 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.chat.modifier; import org.bukkit.command.CommandSender; import com.massivecraft.factions.chat.ChatModifierAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class ChatModifierUcf extends ChatModifierAbstract { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java index aa28729f..707d5d5f 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; import com.massivecraft.factions.chat.ChatTagAbstract; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class ChatTagRole extends ChatTagAbstract { diff --git a/src/com/massivecraft/factions/cmd/CmdFactions.java b/src/com/massivecraft/factions/cmd/CmdFactions.java index b0ed09c4..32f84adb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactions.java +++ b/src/com/massivecraft/factions/cmd/CmdFactions.java @@ -5,8 +5,8 @@ import java.util.List; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.MConf; -import com.massivecraft.mcore.cmd.HelpCommand; -import com.massivecraft.mcore.cmd.VersionCommand; +import com.massivecraft.massivecore.cmd.HelpCommand; +import com.massivecraft.massivecore.cmd.VersionCommand; public class CmdFactions extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java index ad2e4dc3..84c07e89 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java @@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; -import com.massivecraft.mcore.cmd.HelpCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.cmd.HelpCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; public class CmdFactionsAccess extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java index ef96c6db..7b2140ab 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java @@ -9,10 +9,10 @@ import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSFormatHumanSpace; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSFormatHumanSpace; +import com.massivecraft.massivecore.util.Txt; public abstract class CmdFactionsAccessAbstract extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java index 456cdcc4..8869abee 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java @@ -5,8 +5,8 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java index 3f20d87f..fdbf05ad 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java @@ -5,8 +5,8 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARUPlayer; import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java index 6a164388..20a9aea6 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessView.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsAccessView extends CmdFactionsAccessAbstract { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java index 369d331d..c0199338 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsAdmin extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java index d7d9a28d..0d58ee43 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java @@ -6,9 +6,9 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.UConf; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsAutoClaim extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java index af109125..cab93ae4 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java @@ -7,10 +7,10 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.task.SpiralTask; -import com.massivecraft.mcore.cmd.arg.ARInteger; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsClaim extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java index f0db95b7..19fe7983 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java @@ -16,8 +16,8 @@ import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.FactionsEventCreate; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.store.MStore; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.store.MStore; public class CmdFactionsCreate extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java index f2da783f..e3ccb5eb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARUPlayer; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsDemote extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java b/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java index 93ccb36e..485a050c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java @@ -6,8 +6,8 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; import com.massivecraft.factions.event.FactionsEventDescriptionChange; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.mixin.Mixin; public class CmdFactionsDescription extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java index 61a2226a..d6d17485 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java @@ -14,8 +14,8 @@ import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsDisband extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java index 6457cdf4..dcfe9a4d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java @@ -17,12 +17,12 @@ import com.massivecraft.factions.FFlag; import com.massivecraft.factions.Perm; import com.massivecraft.factions.PlayerRoleComparator; 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.TimeDiffUtil; -import com.massivecraft.mcore.util.TimeUnit; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.TimeDiffUtil; +import com.massivecraft.massivecore.util.TimeUnit; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsFaction extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java index 1c18046d..204dccf8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java @@ -6,9 +6,9 @@ import com.massivecraft.factions.cmd.arg.ARFFlag; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; 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; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsFlag extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java index feba1a85..ea83748c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java @@ -15,11 +15,11 @@ import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; 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; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.mixin.TeleporterException; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.mixin.TeleporterException; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsHome extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java index 6a20de11..07a09c18 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java @@ -8,9 +8,9 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.event.FactionsEventInvitedChange; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; public class CmdFactionsInvite extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index b6ce3728..76ea9174 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -11,8 +11,8 @@ import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsJoin extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java index e562093d..bf7b2666 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java @@ -13,7 +13,7 @@ import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsKick extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java index 9c06b7b0..ee21c249 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java @@ -11,8 +11,8 @@ 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; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsLeader extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java index cdb9efc9..5ab580a3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.cmd.req.ReqHasFaction; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsLeave extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java index acc09f09..22cc037f 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsList.java @@ -8,9 +8,9 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColls; -import com.massivecraft.mcore.cmd.arg.ARInteger; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsList extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java index 53dc21ee..e296c061 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java @@ -3,10 +3,10 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.BoardColls; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsMap extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java index 6dd777ee..4679b1bc 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsMoney extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java index 03913bdf..d38f1c05 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsMoneyBalance extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 47df2cb2..542ced07 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java @@ -8,10 +8,10 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; 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 com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java index e6a0f305..4b4f25ea 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java @@ -8,10 +8,10 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; 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 com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index 02e3255c..4d7ca199 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java @@ -10,10 +10,10 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; 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 com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index 64db97a2..6a13e263 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java @@ -10,10 +10,10 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; 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 com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 16a00b71..d4750756 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java @@ -9,10 +9,10 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; 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 com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/com/massivecraft/factions/cmd/CmdFactionsName.java index 7d282d8e..a19a9b43 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsName.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsName.java @@ -13,7 +13,7 @@ import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.event.FactionsEventNameChange; import com.massivecraft.factions.util.MiscUtil; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsName extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java index d73e5a73..e4cada08 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.arg.ARUPlayer; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.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 76de106c..3e0035a8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java @@ -6,8 +6,8 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; import com.massivecraft.factions.event.FactionsEventOpenChange; -import com.massivecraft.mcore.cmd.arg.ARBoolean; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsOpen extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java index 55b86c0d..a75875da 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java @@ -8,9 +8,9 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.arg.ARRel; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; 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; +import com.massivecraft.massivecore.cmd.arg.ARBoolean; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsPerm extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java index da429d56..96876bab 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java @@ -6,11 +6,11 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.arg.ARUPlayer; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.Progressbar; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.TimeDiffUtil; -import com.massivecraft.mcore.util.TimeUnit; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Progressbar; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.TimeDiffUtil; +import com.massivecraft.massivecore.util.TimeUnit; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsPlayer extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java index d4ae4a4d..b9d1b2cc 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java @@ -7,8 +7,8 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.cmd.arg.ARDouble; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.arg.ARDouble; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsPowerBoost extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java index 14629d7d..4915fd7d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.arg.ARUPlayer; import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.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 3c471dd1..0985d720 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.FactionsEventRelationChange; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public abstract class CmdFactionsRelationAbstract extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java index fd953c7a..eae91913 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java @@ -7,10 +7,10 @@ import org.bukkit.entity.Player; import com.massivecraft.factions.Perm; import com.massivecraft.factions.util.VisualizeUtil; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSFormatHumanSpace; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSFormatHumanSpace; public class CmdFactionsSeeChunk extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java index 7e446ba1..cc5b3be0 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java @@ -8,9 +8,9 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.event.FactionsEventHomeChange; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsSethome extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index 5fe0b51e..1c62c42a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java @@ -9,9 +9,9 @@ import com.massivecraft.factions.cmd.req.ReqFactionsEnabled; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.event.FactionsEventTitleChange; -import com.massivecraft.mcore.cmd.arg.ARString; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ARString; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; public class CmdFactionsTitle extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java index c11ac507..bb610523 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java @@ -5,9 +5,9 @@ import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsUnclaim extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java index 6ab45a2d..72ae7ab0 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java @@ -15,8 +15,8 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.FactionsEventChunkChange; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.ps.PS; public class CmdFactionsUnclaimall extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/com/massivecraft/factions/cmd/FCommand.java index 83563530..7fc9f571 100644 --- a/src/com/massivecraft/factions/cmd/FCommand.java +++ b/src/com/massivecraft/factions/cmd/FCommand.java @@ -5,10 +5,10 @@ import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.util.Txt; -public abstract class FCommand extends MCommand +public abstract class FCommand extends MassiveCommand { // -------------------------------------------- // // FIELDS diff --git a/src/com/massivecraft/factions/cmd/arg/ARFFlag.java b/src/com/massivecraft/factions/cmd/arg/ARFFlag.java index 1994c3e0..4545548c 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFFlag.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFFlag.java @@ -7,8 +7,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import com.massivecraft.factions.FFlag; -import com.massivecraft.mcore.cmd.arg.ARAbstractSelect; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ARAbstractSelect; +import com.massivecraft.massivecore.util.Txt; public class ARFFlag extends ARAbstractSelect { diff --git a/src/com/massivecraft/factions/cmd/arg/ARFPerm.java b/src/com/massivecraft/factions/cmd/arg/ARFPerm.java index 7f9485e7..f8d6eb41 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFPerm.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFPerm.java @@ -7,8 +7,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import com.massivecraft.factions.FPerm; -import com.massivecraft.mcore.cmd.arg.ARAbstractSelect; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ARAbstractSelect; +import com.massivecraft.massivecore.util.Txt; public class ARFPerm extends ARAbstractSelect { diff --git a/src/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/com/massivecraft/factions/cmd/arg/ARFaction.java index cbe9860a..28ca3a98 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFaction.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFaction.java @@ -7,10 +7,10 @@ import com.massivecraft.factions.entity.UPlayerColls; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColls; -import com.massivecraft.mcore.cmd.arg.ArgReaderAbstract; -import com.massivecraft.mcore.cmd.arg.ArgResult; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ArgReaderAbstract; +import com.massivecraft.massivecore.cmd.arg.ArgResult; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; public class ARFaction extends ArgReaderAbstract { diff --git a/src/com/massivecraft/factions/cmd/arg/ARRel.java b/src/com/massivecraft/factions/cmd/arg/ARRel.java index 3f1d808c..7d8f92be 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARRel.java +++ b/src/com/massivecraft/factions/cmd/arg/ARRel.java @@ -7,8 +7,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import com.massivecraft.factions.Rel; -import com.massivecraft.mcore.cmd.arg.ARAbstractSelect; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.arg.ARAbstractSelect; +import com.massivecraft.massivecore.util.Txt; public class ARRel extends ARAbstractSelect { diff --git a/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java b/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java index 662da45b..ac4b5da6 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java +++ b/src/com/massivecraft/factions/cmd/arg/ARUPlayer.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.cmd.arg; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.UPlayerColls; -import com.massivecraft.mcore.cmd.arg.ARSenderEntity; -import com.massivecraft.mcore.cmd.arg.ArgReader; +import com.massivecraft.massivecore.cmd.arg.ARSenderEntity; +import com.massivecraft.massivecore.cmd.arg.ArgReader; public class ARUPlayer { diff --git a/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java index 2751ed09..a77c88d3 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java +++ b/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java @@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd.req; import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UConf; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqAbstract; +import com.massivecraft.massivecore.util.Txt; public class ReqBankCommandsEnabled extends ReqAbstract { @@ -23,13 +23,13 @@ public class ReqBankCommandsEnabled extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return UConf.get(sender).econEnabled && UConf.get(sender).bankEnabled; } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { UConf uconf = UConf.get(sender); if (!uconf.bankEnabled) diff --git a/src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java index e94127fa..f04b7cf3 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java +++ b/src/com/massivecraft/factions/cmd/req/ReqFactionsEnabled.java @@ -3,8 +3,8 @@ package com.massivecraft.factions.cmd.req; import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UConf; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqAbstract; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqAbstract; public class ReqFactionsEnabled extends ReqAbstract { @@ -22,13 +22,13 @@ public class ReqFactionsEnabled extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return !UConf.isDisabled(sender); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return UConf.getDisabledMessage(sender); } diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java index 15db295f..d8b29f61 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java +++ b/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java @@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd.req; import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqAbstract; +import com.massivecraft.massivecore.util.Txt; public class ReqHasFaction extends ReqAbstract { @@ -23,13 +23,13 @@ public class ReqHasFaction extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return UPlayer.get(sender).hasFaction(); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Txt.parse("You must belong to a faction to "+(command == null ? "do that" : command.getDesc())+"."); } diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java index 974a04b2..a375a275 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java +++ b/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java @@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd.req; import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqAbstract; +import com.massivecraft.massivecore.util.Txt; public class ReqHasntFaction extends ReqAbstract { @@ -23,13 +23,13 @@ public class ReqHasntFaction extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return !UPlayer.get(sender).hasFaction(); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Txt.parse("You must leave your current faction before you "+(command == null ? "do that" : command.getDesc())+"."); } diff --git a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java index 3c0ba854..b708e85b 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java +++ b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java @@ -4,9 +4,9 @@ import org.bukkit.command.CommandSender; import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqAbstract; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqAbstract; +import com.massivecraft.massivecore.util.Txt; public class ReqRoleIsAtLeast extends ReqAbstract { @@ -31,14 +31,14 @@ public class ReqRoleIsAtLeast extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { UPlayer uplayer = UPlayer.get(sender); return uplayer.getRole().isAtLeast(this.rel); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Txt.parse("You must be %s or higher to "+(command == null ? "do that" : command.getDesc())+".", Txt.getNicedEnum(this.rel)); } diff --git a/src/com/massivecraft/factions/entity/Board.java b/src/com/massivecraft/factions/entity/Board.java index 1deadb7a..2cb85214 100644 --- a/src/com/massivecraft/factions/entity/Board.java +++ b/src/com/massivecraft/factions/entity/Board.java @@ -17,10 +17,10 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.util.AsciiCompass; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.Txt; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class Board extends Entity implements BoardInterface { diff --git a/src/com/massivecraft/factions/entity/BoardColl.java b/src/com/massivecraft/factions/entity/BoardColl.java index 15a56bc1..1a7987f7 100644 --- a/src/com/massivecraft/factions/entity/BoardColl.java +++ b/src/com/massivecraft/factions/entity/BoardColl.java @@ -7,10 +7,10 @@ import java.util.Set; 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.store.Coll; -import com.massivecraft.mcore.store.MStore; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.util.MUtil; public class BoardColl extends Coll implements BoardInterface { diff --git a/src/com/massivecraft/factions/entity/BoardColls.java b/src/com/massivecraft/factions/entity/BoardColls.java index 98c154fd..8bdaed73 100644 --- a/src/com/massivecraft/factions/entity/BoardColls.java +++ b/src/com/massivecraft/factions/entity/BoardColls.java @@ -12,11 +12,11 @@ import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSBuilder; -import com.massivecraft.mcore.util.DiscUtil; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSBuilder; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class BoardColls extends XColls implements BoardInterface { diff --git a/src/com/massivecraft/factions/entity/BoardInterface.java b/src/com/massivecraft/factions/entity/BoardInterface.java index db6c4d97..0e701a62 100644 --- a/src/com/massivecraft/factions/entity/BoardInterface.java +++ b/src/com/massivecraft/factions/entity/BoardInterface.java @@ -5,7 +5,7 @@ import java.util.Set; import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public interface BoardInterface { diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java index 62fb7436..fec97b86 100644 --- a/src/com/massivecraft/factions/entity/Faction.java +++ b/src/com/massivecraft/factions/entity/Faction.java @@ -17,13 +17,13 @@ import com.massivecraft.factions.Lang; import com.massivecraft.factions.Rel; import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.util.*; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.money.Money; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; public class Faction extends Entity implements EconomyParticipator { diff --git a/src/com/massivecraft/factions/entity/FactionColl.java b/src/com/massivecraft/factions/entity/FactionColl.java index d0e1b4e0..5ab6ed8d 100644 --- a/src/com/massivecraft/factions/entity/FactionColl.java +++ b/src/com/massivecraft/factions/entity/FactionColl.java @@ -4,10 +4,9 @@ import java.util.*; import org.bukkit.ChatColor; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.MStore; -import com.massivecraft.mcore.util.Txt; - +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.util.Txt; import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Factions; diff --git a/src/com/massivecraft/factions/entity/FactionColls.java b/src/com/massivecraft/factions/entity/FactionColls.java index 22133d16..a9fcc152 100644 --- a/src/com/massivecraft/factions/entity/FactionColls.java +++ b/src/com/massivecraft/factions/entity/FactionColls.java @@ -8,11 +8,11 @@ import java.util.Set; import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.util.DiscUtil; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class FactionColls extends XColls { @@ -73,7 +73,7 @@ public class FactionColls extends XColls Map id2faction = Factions.get().gson.fromJson(DiscUtil.readCatch(oldFile), type); // The Coll - FactionColl coll = this.getForUniverse(MCore.DEFAULT); + FactionColl coll = this.getForUniverse(MassiveCore.DEFAULT); // Set the data for (Entry entry : id2faction.entrySet()) diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java index b969520f..b1800b3d 100644 --- a/src/com/massivecraft/factions/entity/MConf.java +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -13,8 +13,8 @@ import org.bukkit.event.EventPriority; import com.massivecraft.factions.Factions; import com.massivecraft.factions.listeners.FactionsListenerChat; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.MUtil; public class MConf extends Entity { diff --git a/src/com/massivecraft/factions/entity/MConfColl.java b/src/com/massivecraft/factions/entity/MConfColl.java index 2f7997bb..4fed8089 100644 --- a/src/com/massivecraft/factions/entity/MConfColl.java +++ b/src/com/massivecraft/factions/entity/MConfColl.java @@ -2,9 +2,9 @@ package com.massivecraft.factions.entity; 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; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; public class MConfColl extends Coll { @@ -28,7 +28,7 @@ public class MConfColl extends Coll { super.init(); - MConf.i = this.get(MCore.INSTANCE, true); + MConf.i = this.get(MassiveCore.INSTANCE, true); } } diff --git a/src/com/massivecraft/factions/entity/MPlayer.java b/src/com/massivecraft/factions/entity/MPlayer.java index 7b18fd26..d22f614f 100644 --- a/src/com/massivecraft/factions/entity/MPlayer.java +++ b/src/com/massivecraft/factions/entity/MPlayer.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.entity; import com.massivecraft.factions.Perm; -import com.massivecraft.mcore.store.SenderEntity; +import com.massivecraft.massivecore.store.SenderEntity; public class MPlayer extends SenderEntity { diff --git a/src/com/massivecraft/factions/entity/MPlayerColl.java b/src/com/massivecraft/factions/entity/MPlayerColl.java index a1448870..7afd223d 100644 --- a/src/com/massivecraft/factions/entity/MPlayerColl.java +++ b/src/com/massivecraft/factions/entity/MPlayerColl.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.entity; import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.store.MStore; -import com.massivecraft.mcore.store.SenderColl; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.store.SenderColl; public class MPlayerColl extends SenderColl { diff --git a/src/com/massivecraft/factions/entity/UConf.java b/src/com/massivecraft/factions/entity/UConf.java index 55f99027..0f5fa853 100644 --- a/src/com/massivecraft/factions/entity/UConf.java +++ b/src/com/massivecraft/factions/entity/UConf.java @@ -13,10 +13,10 @@ import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.FactionsEventChunkChangeType; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; public class UConf extends Entity { diff --git a/src/com/massivecraft/factions/entity/UConfColl.java b/src/com/massivecraft/factions/entity/UConfColl.java index d1bcfa57..76683eaf 100644 --- a/src/com/massivecraft/factions/entity/UConfColl.java +++ b/src/com/massivecraft/factions/entity/UConfColl.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.entity; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.MStore; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; public class UConfColl extends Coll { @@ -24,7 +24,7 @@ public class UConfColl extends Coll public void init() { super.init(); - this.get(MCore.INSTANCE, true); + this.get(MassiveCore.INSTANCE, true); } } diff --git a/src/com/massivecraft/factions/entity/UConfColls.java b/src/com/massivecraft/factions/entity/UConfColls.java index be4ea4e6..85e416e3 100644 --- a/src/com/massivecraft/factions/entity/UConfColls.java +++ b/src/com/massivecraft/factions/entity/UConfColls.java @@ -2,8 +2,8 @@ package com.massivecraft.factions.entity; import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCore; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCore; public class UConfColls extends XColls { @@ -41,7 +41,7 @@ public class UConfColls extends XColls { UConfColl coll = this.get(worldNameExtractable); if (coll == null) return null; - return coll.get(MCore.INSTANCE); + return coll.get(MassiveCore.INSTANCE); } } diff --git a/src/com/massivecraft/factions/entity/UPlayer.java b/src/com/massivecraft/factions/entity/UPlayer.java index 56516dde..214fefea 100644 --- a/src/com/massivecraft/factions/entity/UPlayer.java +++ b/src/com/massivecraft/factions/entity/UPlayer.java @@ -17,13 +17,13 @@ import com.massivecraft.factions.event.FactionsEventChunkChange; import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason; import com.massivecraft.factions.util.RelationUtil; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSFormatHumanSpace; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSFormatHumanSpace; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; public class UPlayer extends SenderEntity implements EconomyParticipator diff --git a/src/com/massivecraft/factions/entity/UPlayerColl.java b/src/com/massivecraft/factions/entity/UPlayerColl.java index 0120d1c3..bfbfc726 100644 --- a/src/com/massivecraft/factions/entity/UPlayerColl.java +++ b/src/com/massivecraft/factions/entity/UPlayerColl.java @@ -2,11 +2,11 @@ package com.massivecraft.factions.entity; 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; -import com.massivecraft.mcore.util.TimeUnit; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.store.SenderColl; +import com.massivecraft.massivecore.util.TimeUnit; +import com.massivecraft.massivecore.util.Txt; public class UPlayerColl extends SenderColl { diff --git a/src/com/massivecraft/factions/entity/UPlayerColls.java b/src/com/massivecraft/factions/entity/UPlayerColls.java index 93de2ee4..1726dfd2 100644 --- a/src/com/massivecraft/factions/entity/UPlayerColls.java +++ b/src/com/massivecraft/factions/entity/UPlayerColls.java @@ -7,10 +7,10 @@ import java.util.Map.Entry; import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.util.DiscUtil; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class UPlayerColls extends XColls { @@ -66,7 +66,7 @@ public class UPlayerColls extends XColls Map id2uplayer = Factions.get().gson.fromJson(DiscUtil.readCatch(oldFile), type); // The Coll - UPlayerColl coll = this.getForUniverse(MCore.DEFAULT); + UPlayerColl coll = this.getForUniverse(MassiveCore.DEFAULT); // Set the data for (Entry entry : id2uplayer.entrySet()) diff --git a/src/com/massivecraft/factions/entity/XColls.java b/src/com/massivecraft/factions/entity/XColls.java index 24f7dad6..45a59a1a 100644 --- a/src/com/massivecraft/factions/entity/XColls.java +++ b/src/com/massivecraft/factions/entity/XColls.java @@ -4,10 +4,10 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.Colls; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.Colls; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.MUtil; public abstract class XColls, E> extends Colls { diff --git a/src/com/massivecraft/factions/event/FactionsEventAbstract.java b/src/com/massivecraft/factions/event/FactionsEventAbstract.java index cbed080e..1263f522 100644 --- a/src/com/massivecraft/factions/event/FactionsEventAbstract.java +++ b/src/com/massivecraft/factions/event/FactionsEventAbstract.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.event; -import com.massivecraft.mcore.event.MCoreEvent; +import com.massivecraft.massivecore.event.EventMassiveCore; -public abstract class FactionsEventAbstract extends MCoreEvent +public abstract class FactionsEventAbstract extends EventMassiveCore { } diff --git a/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java b/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java index 32aab0f8..7913f5d3 100644 --- a/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java +++ b/src/com/massivecraft/factions/event/FactionsEventAbstractSender.java @@ -3,9 +3,9 @@ package com.massivecraft.factions.event; import org.bukkit.command.CommandSender; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.event.MCoreEvent; +import com.massivecraft.massivecore.event.EventMassiveCore; -public abstract class FactionsEventAbstractSender extends MCoreEvent +public abstract class FactionsEventAbstractSender extends EventMassiveCore { // -------------------------------------------- // // FIELDS diff --git a/src/com/massivecraft/factions/event/FactionsEventChunkChange.java b/src/com/massivecraft/factions/event/FactionsEventChunkChange.java index 6361d3d9..8f187599 100644 --- a/src/com/massivecraft/factions/event/FactionsEventChunkChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventChunkChange.java @@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList; import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public class FactionsEventChunkChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/event/FactionsEventHomeChange.java b/src/com/massivecraft/factions/event/FactionsEventHomeChange.java index ac47c996..1ea45c63 100644 --- a/src/com/massivecraft/factions/event/FactionsEventHomeChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventHomeChange.java @@ -4,7 +4,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public class FactionsEventHomeChange extends FactionsEventAbstractSender { diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index 5bd0e4e1..e6539c15 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.util.RelationUtil; -import com.massivecraft.mcore.money.Money; +import com.massivecraft.massivecore.money.Money; public class Econ { diff --git a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java similarity index 96% rename from src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java index 2c9449bf..1412d33b 100644 --- a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java @@ -26,7 +26,7 @@ import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; -public abstract class FactionsChannelAbstract implements Channel +public abstract class ChannelFactionsAbstract implements Channel { private static final Pattern msgPattern = Pattern.compile("(.*)<(.*)%1\\$s(.*)> %2\\$s"); private final ChannelStorage storage = Herochat.getChannelManager().getStorage(); diff --git a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java similarity index 95% rename from src/com/massivecraft/factions/integration/herochat/AlliesChannel.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java index 03b0820a..eea95905 100644 --- a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java @@ -8,7 +8,7 @@ import org.bukkit.ChatColor; import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MConf; -public class AlliesChannel extends FactionsChannelAbstract +public class ChannelFactionsAllies extends ChannelFactionsAbstract { public static final Set targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT, Rel.ALLY); @Override public Set getTargetRelations() { return targetRelations; } diff --git a/src/com/massivecraft/factions/integration/herochat/FactionChannel.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java similarity index 95% rename from src/com/massivecraft/factions/integration/herochat/FactionChannel.java rename to src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java index 318760a3..4d783dea 100644 --- a/src/com/massivecraft/factions/integration/herochat/FactionChannel.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java @@ -9,7 +9,7 @@ import org.bukkit.ChatColor; import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MConf; -public class FactionChannel extends FactionsChannelAbstract +public class ChannelFactionsFaction extends ChannelFactionsAbstract { public static final Set targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT); @Override public Set getTargetRelations() { return targetRelations; } diff --git a/src/com/massivecraft/factions/integration/herochat/HerochatEngine.java b/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java similarity index 80% rename from src/com/massivecraft/factions/integration/herochat/HerochatEngine.java rename to src/com/massivecraft/factions/integration/herochat/EngineHerochat.java index 61d4214d..66792016 100644 --- a/src/com/massivecraft/factions/integration/herochat/HerochatEngine.java +++ b/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java @@ -13,15 +13,15 @@ import com.massivecraft.factions.chat.ChatFormatter; import com.massivecraft.factions.entity.MConf; -public class HerochatEngine implements Listener +public class EngineHerochat implements Listener { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static HerochatEngine i = new HerochatEngine(); - public static HerochatEngine get() { return i; } - private HerochatEngine() {} + private static EngineHerochat i = new EngineHerochat(); + public static EngineHerochat get() { return i; } + private EngineHerochat() {} // -------------------------------------------- // // ACTIVATE & DEACTIVATE @@ -29,8 +29,8 @@ public class HerochatEngine implements Listener public void activate() { - Herochat.getChannelManager().addChannel(new FactionChannel()); - Herochat.getChannelManager().addChannel(new AlliesChannel()); + Herochat.getChannelManager().addChannel(new ChannelFactionsFaction()); + Herochat.getChannelManager().addChannel(new ChannelFactionsAllies()); Bukkit.getPluginManager().registerEvents(this, Factions.get()); } diff --git a/src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java b/src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java deleted file mode 100644 index c63c5773..00000000 --- a/src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.massivecraft.factions.integration.herochat; - -import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract; - -public class HerochatFeatures extends IntegrationFeaturesAbstract -{ - // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // - - private static HerochatFeatures i = new HerochatFeatures(); - public static HerochatFeatures get() { return i; } - private HerochatFeatures() { super("Herochat"); } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public void activate() - { - HerochatEngine.get().activate(); - } - - @Override - public void deactivate() - { - HerochatEngine.get().deactivate(); - } - -} diff --git a/src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java b/src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java new file mode 100644 index 00000000..3b70dee9 --- /dev/null +++ b/src/com/massivecraft/factions/integration/herochat/IntegrationHerochat.java @@ -0,0 +1,31 @@ +package com.massivecraft.factions.integration.herochat; + +import com.massivecraft.massivecore.integration.IntegrationAbstract; + +public class IntegrationHerochat extends IntegrationAbstract +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static IntegrationHerochat i = new IntegrationHerochat(); + public static IntegrationHerochat get() { return i; } + private IntegrationHerochat() { super("Herochat"); } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void activate() + { + EngineHerochat.get().activate(); + } + + @Override + public void deactivate() + { + EngineHerochat.get().deactivate(); + } + +} diff --git a/src/com/massivecraft/factions/integration/lwc/LwcEngine.java b/src/com/massivecraft/factions/integration/lwc/EngineLwc.java similarity index 90% rename from src/com/massivecraft/factions/integration/lwc/LwcEngine.java rename to src/com/massivecraft/factions/integration/lwc/EngineLwc.java index a375ae03..fce83d94 100644 --- a/src/com/massivecraft/factions/integration/lwc/LwcEngine.java +++ b/src/com/massivecraft/factions/integration/lwc/EngineLwc.java @@ -21,18 +21,18 @@ import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.event.FactionsEventChunkChange; import com.massivecraft.factions.event.FactionsEventChunkChangeType; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; -public class LwcEngine implements Listener +public class EngineLwc implements Listener { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static LwcEngine i = new LwcEngine(); - public static LwcEngine get() { return i; } - private LwcEngine() {} + private static EngineLwc i = new EngineLwc(); + public static EngineLwc get() { return i; } + private EngineLwc() {} // -------------------------------------------- // // ACTIVATE & DEACTIVATE diff --git a/src/com/massivecraft/factions/integration/lwc/LwcFeatures.java b/src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java similarity index 51% rename from src/com/massivecraft/factions/integration/lwc/LwcFeatures.java rename to src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java index 1e1b524c..ac5764c5 100644 --- a/src/com/massivecraft/factions/integration/lwc/LwcFeatures.java +++ b/src/com/massivecraft/factions/integration/lwc/IntegrationLwc.java @@ -1,16 +1,16 @@ package com.massivecraft.factions.integration.lwc; -import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract; +import com.massivecraft.massivecore.integration.IntegrationAbstract; -public class LwcFeatures extends IntegrationFeaturesAbstract +public class IntegrationLwc extends IntegrationAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static LwcFeatures i = new LwcFeatures(); - public static LwcFeatures get() { return i; } - private LwcFeatures() { super("LWC"); } + private static IntegrationLwc i = new IntegrationLwc(); + public static IntegrationLwc get() { return i; } + private IntegrationLwc() { super("LWC"); } // -------------------------------------------- // // OVERRIDE @@ -19,13 +19,13 @@ public class LwcFeatures extends IntegrationFeaturesAbstract @Override public void activate() { - LwcEngine.get().activate(); + EngineLwc.get().activate(); } @Override public void deactivate() { - LwcEngine.get().deactivate(); + EngineLwc.get().deactivate(); } } diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerChat.java b/src/com/massivecraft/factions/listeners/FactionsListenerChat.java index 27b0e3d6..79cdc06f 100644 --- a/src/com/massivecraft/factions/listeners/FactionsListenerChat.java +++ b/src/com/massivecraft/factions/listeners/FactionsListenerChat.java @@ -12,7 +12,7 @@ import org.bukkit.plugin.EventExecutor; import com.massivecraft.factions.Factions; import com.massivecraft.factions.chat.ChatFormatter; import com.massivecraft.factions.entity.MConf; -import com.massivecraft.mcore.event.MCorePlayerToRecipientChatEvent; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; public class FactionsListenerChat implements Listener { @@ -43,7 +43,7 @@ public class FactionsListenerChat implements Listener if (MConf.get().chatParseTags) { - Bukkit.getPluginManager().registerEvent(MCorePlayerToRecipientChatEvent.class, this, EventPriority.NORMAL, new ParseRelcolorEventExecutor(), Factions.get(), true); + Bukkit.getPluginManager().registerEvent(EventMassiveCorePlayerToRecipientChat.class, this, EventPriority.NORMAL, new ParseRelcolorEventExecutor(), Factions.get(), true); } } @@ -113,8 +113,8 @@ public class FactionsListenerChat implements Listener { try { - if (!(event instanceof MCorePlayerToRecipientChatEvent)) return; - parseRelcolor((MCorePlayerToRecipientChatEvent)event); + if (!(event instanceof EventMassiveCorePlayerToRecipientChat)) return; + parseRelcolor((EventMassiveCorePlayerToRecipientChat)event); } catch (Throwable t) { @@ -123,7 +123,7 @@ public class FactionsListenerChat implements Listener } } - public static void parseRelcolor(MCorePlayerToRecipientChatEvent event) + public static void parseRelcolor(EventMassiveCorePlayerToRecipientChat event) { String format = event.getFormat(); format = ChatFormatter.format(format, event.getSender(), event.getRecipient()); diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerEcon.java b/src/com/massivecraft/factions/listeners/FactionsListenerEcon.java index c95ee83c..dfdb1175 100644 --- a/src/com/massivecraft/factions/listeners/FactionsListenerEcon.java +++ b/src/com/massivecraft/factions/listeners/FactionsListenerEcon.java @@ -25,7 +25,7 @@ import com.massivecraft.factions.event.FactionsEventRelationChange; import com.massivecraft.factions.event.FactionsEventNameChange; import com.massivecraft.factions.event.FactionsEventTitleChange; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.mcore.money.Money; +import com.massivecraft.massivecore.money.Money; public class FactionsListenerEcon implements Listener { diff --git a/src/com/massivecraft/factions/listeners/FactionsListenerMain.java b/src/com/massivecraft/factions/listeners/FactionsListenerMain.java index e09eea0f..b6cd8994 100644 --- a/src/com/massivecraft/factions/listeners/FactionsListenerMain.java +++ b/src/com/massivecraft/factions/listeners/FactionsListenerMain.java @@ -70,10 +70,10 @@ import com.massivecraft.factions.event.FactionsEventPvpDisallowed; import com.massivecraft.factions.event.FactionsEventPowerChange; import com.massivecraft.factions.event.FactionsEventPowerChange.PowerChangeReason; import com.massivecraft.factions.util.VisualizeUtil; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.PlayerUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.PlayerUtil; +import com.massivecraft.massivecore.util.Txt; public class FactionsListenerMain implements Listener { diff --git a/src/com/massivecraft/factions/task/SpiralTask.java b/src/com/massivecraft/factions/task/SpiralTask.java index a5dcbcc2..da23f79b 100644 --- a/src/com/massivecraft/factions/task/SpiralTask.java +++ b/src/com/massivecraft/factions/task/SpiralTask.java @@ -7,7 +7,7 @@ import org.bukkit.Location; import org.bukkit.World; import com.massivecraft.factions.Factions; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; /* diff --git a/src/com/massivecraft/factions/task/TaskEconLandReward.java b/src/com/massivecraft/factions/task/TaskEconLandReward.java index 82301dc0..365c3492 100644 --- a/src/com/massivecraft/factions/task/TaskEconLandReward.java +++ b/src/com/massivecraft/factions/task/TaskEconLandReward.java @@ -4,8 +4,8 @@ import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.UConf; -import com.massivecraft.mcore.ModuloRepeatTask; -import com.massivecraft.mcore.util.TimeUnit; +import com.massivecraft.massivecore.ModuloRepeatTask; +import com.massivecraft.massivecore.util.TimeUnit; public class TaskEconLandReward extends ModuloRepeatTask { diff --git a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java index ae44854c..e006ba99 100644 --- a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java +++ b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java @@ -4,8 +4,8 @@ import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayerColl; import com.massivecraft.factions.entity.UPlayerColls; -import com.massivecraft.mcore.ModuloRepeatTask; -import com.massivecraft.mcore.util.TimeUnit; +import com.massivecraft.massivecore.ModuloRepeatTask; +import com.massivecraft.massivecore.util.TimeUnit; public class TaskPlayerDataRemove extends ModuloRepeatTask { diff --git a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java index afa70b67..12c79e0f 100644 --- a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java +++ b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java @@ -8,8 +8,8 @@ import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.event.FactionsEventPowerChange; import com.massivecraft.factions.event.FactionsEventPowerChange.PowerChangeReason; -import com.massivecraft.mcore.ModuloRepeatTask; -import com.massivecraft.mcore.util.TimeUnit; +import com.massivecraft.massivecore.ModuloRepeatTask; +import com.massivecraft.massivecore.util.TimeUnit; public class TaskPlayerPowerUpdate extends ModuloRepeatTask { diff --git a/src/com/massivecraft/factions/util/RelationUtil.java b/src/com/massivecraft/factions/util/RelationUtil.java index 2cb47981..baa10433 100644 --- a/src/com/massivecraft/factions/util/RelationUtil.java +++ b/src/com/massivecraft/factions/util/RelationUtil.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class RelationUtil {