Rename

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:
 # -------------------------------------------- #

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.massivecore.EngineAbstract;
-import com.massivecraft.mcore.event.MCoreUuidUpdateEvent;
+import com.massivecraft.massivecore.event.EventMassiveCoreUuidUpdate;
-import com.massivecraft.mcore.util.IdUpdateUtil;
+import com.massivecraft.massivecore.util.IdUpdateUtil;
-import com.massivecraft.mcore.util.MUtil;
+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())
 		{

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
 {

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.massivecore.ps.PS;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 /**
  * Permissions that you (a player) may or may not have in the territory of a certain faction.

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<CommandSender>, Serializable
 {

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<Faction>
 {

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.herochat.IntegrationHerochat;
-import com.massivecraft.factions.integration.lwc.LwcFeatures;
+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.massivecore.Aspect;
-import com.massivecraft.mcore.Aspect;
+import com.massivecraft.massivecore.AspectColl;
-import com.massivecraft.mcore.AspectColl;
+import com.massivecraft.massivecore.MassivePlugin;
-import com.massivecraft.mcore.MPlugin;
+import com.massivecraft.massivecore.Multiverse;
-import com.massivecraft.mcore.Multiverse;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore.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(),
+			IntegrationHerochat.get(),
-			LwcFeatures.get()
+			IntegrationLwc.get()
 		);
 		
 		// Schedule recurring non-tps-dependent tasks

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
 {

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
 {

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.massivecore.ps.PS;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
-
 import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.factions.entity.Board;
 

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.massivecore.ps.PS;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
-
 import com.massivecraft.factions.TerritoryAccess;
 
 public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess>>, JsonSerializer<Map<PS, TerritoryAccess>>

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.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 
 public class FFlagAdapter implements JsonDeserializer<FFlag>
 {

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.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-
 import com.massivecraft.factions.FPerm;
 
 public class FPermAdapter implements JsonDeserializer<FPerm>

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.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.entity.Faction;
 

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.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-
 import com.massivecraft.factions.Rel;
 
 public class RelAdapter implements JsonDeserializer<Rel>

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.massivecore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
-
 import com.massivecraft.factions.TerritoryAccess;
 
 public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess>

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
 {

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
 {

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
 {

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.massivecore.cmd.HelpCommand;
-import com.massivecraft.mcore.cmd.VersionCommand;
+import com.massivecraft.massivecore.cmd.VersionCommand;
 
 public class CmdFactions extends FCommand
 {

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.massivecore.cmd.HelpCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
 
 
 public class CmdFactionsAccess extends FCommand

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.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.mcore.ps.PSFormatHumanSpace;
+import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 
 public abstract class CmdFactionsAccessAbstract extends FCommand

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract
 {

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
 {

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
 {

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsAdmin extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 public class CmdFactionsAutoClaim extends FCommand
 {

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.massivecore.cmd.arg.ARInteger;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 
 public class CmdFactionsClaim extends FCommand

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
 
 public class CmdFactionsCreate extends FCommand
 {

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
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.massivecore.mixin.Mixin;
 
 public class CmdFactionsDescription extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsDisband extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.massivecore.mixin.Mixin;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.TimeDiffUtil;
+import com.massivecraft.massivecore.util.TimeDiffUtil;
-import com.massivecraft.mcore.util.TimeUnit;
+import com.massivecraft.massivecore.util.TimeUnit;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsFaction extends FCommand
 {

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsFlag extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.massivecore.mixin.Mixin;
-import com.massivecraft.mcore.mixin.TeleporterException;
+import com.massivecraft.massivecore.mixin.TeleporterException;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 
 public class CmdFactionsHome extends FCommand

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
 
 public class CmdFactionsInvite extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsJoin extends FCommand
 {

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
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsLeader extends FCommand
 {

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
 {

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.massivecore.cmd.arg.ARInteger;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 
 public class CmdFactionsList extends FCommand

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 public class CmdFactionsMap extends FCommand
 {

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
 {

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
 {

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 import org.bukkit.ChatColor;
 

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 import org.bukkit.ChatColor;
 

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 import org.bukkit.ChatColor;
 

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 import org.bukkit.ChatColor;
 

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 import org.bukkit.ChatColor;
 

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
 {

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
 {

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsOpen extends FCommand
 {

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.massivecore.cmd.arg.ARBoolean;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsPerm extends FCommand
 {

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.massivecore.Progressbar;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.TimeDiffUtil;
+import com.massivecraft.massivecore.util.TimeDiffUtil;
-import com.massivecraft.mcore.util.TimeUnit;
+import com.massivecraft.massivecore.util.TimeUnit;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsPlayer extends FCommand
 {

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.massivecore.cmd.arg.ARDouble;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsPowerBoost extends FCommand
 {

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
 {

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
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.mcore.ps.PSFormatHumanSpace;
+import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
 
 public class CmdFactionsSeeChunk extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 public class CmdFactionsSethome extends FCommand
 {

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.massivecore.cmd.arg.ARString;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class CmdFactionsTitle extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
+import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 public class CmdFactionsUnclaim extends FCommand
 {

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.massivecore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
 
 public class CmdFactionsUnclaimall extends FCommand
 {	

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
-public abstract class FCommand extends MCommand
+public abstract class FCommand extends MassiveCommand
 {
 	// -------------------------------------------- //
 	// FIELDS

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.massivecore.cmd.arg.ARAbstractSelect;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class ARFFlag extends ARAbstractSelect<FFlag>
 {

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.massivecore.cmd.arg.ARAbstractSelect;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class ARFPerm extends ARAbstractSelect<FPerm>
 {

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.massivecore.cmd.arg.ArgReaderAbstract;
-import com.massivecraft.mcore.cmd.arg.ArgResult;
+import com.massivecraft.massivecore.cmd.arg.ArgResult;
-import com.massivecraft.mcore.util.IdUtil;
+import com.massivecraft.massivecore.util.IdUtil;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class ARFaction extends ArgReaderAbstract<Faction>
 {

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.massivecore.cmd.arg.ARAbstractSelect;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class ARRel extends ARAbstractSelect<Rel>
 {

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.massivecore.cmd.arg.ARSenderEntity;
-import com.massivecraft.mcore.cmd.arg.ArgReader;
+import com.massivecraft.massivecore.cmd.arg.ArgReader;
 
 public class ARUPlayer
 {

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.cmd.req.ReqAbstract;
+import com.massivecraft.massivecore.cmd.req.ReqAbstract;
-import com.massivecraft.mcore.util.Txt;
+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)

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.cmd.req.ReqAbstract;
+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);
 	}

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.cmd.req.ReqAbstract;
+import com.massivecraft.massivecore.cmd.req.ReqAbstract;
-import com.massivecraft.mcore.util.Txt;
+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("<b>You must belong to a faction to "+(command == null ? "do that" : command.getDesc())+".");
 	}

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.cmd.req.ReqAbstract;
+import com.massivecraft.massivecore.cmd.req.ReqAbstract;
-import com.massivecraft.mcore.util.Txt;
+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("<b>You must leave your current faction before you "+(command == null ? "do that" : command.getDesc())+".");
 	}

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.massivecore.cmd.MassiveCommand;
-import com.massivecraft.mcore.cmd.req.ReqAbstract;
+import com.massivecraft.massivecore.cmd.req.ReqAbstract;
-import com.massivecraft.mcore.util.Txt;
+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("<b>You must be <h>%s <b>or higher to "+(command == null ? "do that" : command.getDesc())+".", Txt.getNicedEnum(this.rel));
 	}

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.massivecore.ps.PS;
-import com.massivecraft.mcore.store.Entity;
+import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 public class Board extends Entity<Board> implements BoardInterface
 {

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.massivecore.ps.PS;
-import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.massivecore.store.Coll;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
 
 public class BoardColl extends Coll<Board> implements BoardInterface
 {

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.massivecore.Aspect;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.mcore.ps.PSBuilder;
+import com.massivecraft.massivecore.ps.PSBuilder;
-import com.massivecraft.mcore.util.DiscUtil;
+import com.massivecraft.massivecore.util.DiscUtil;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 public class BoardColls extends XColls<BoardColl, Board> implements BoardInterface
 {

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
 {

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.massivecore.mixin.Mixin;
-import com.massivecraft.mcore.money.Money;
+import com.massivecraft.massivecore.money.Money;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.mcore.store.Entity;
+import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.mcore.util.IdUtil;
+import com.massivecraft.massivecore.util.IdUtil;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class Faction extends Entity<Faction> implements EconomyParticipator
 {

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.massivecore.store.Coll;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
-
 import com.massivecraft.factions.FFlag;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Factions;

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.massivecore.Aspect;
-import com.massivecraft.mcore.MCore;
+import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.mcore.util.DiscUtil;
+import com.massivecraft.massivecore.util.DiscUtil;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 public class FactionColls extends XColls<FactionColl, Faction>
 {
@@ -73,7 +73,7 @@ public class FactionColls extends XColls<FactionColl, Faction>
 		Map<String, Faction> 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<String, Faction> entry : id2faction.entrySet())

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.massivecore.store.Entity;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
 
 public class MConf extends Entity<MConf>
 {

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.massivecore.MassiveCore;
-import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.massivecore.store.Coll;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
 
 public class MConfColl extends Coll<MConf>
 {
@@ -28,7 +28,7 @@ public class MConfColl extends Coll<MConf>
 	{
 		super.init();
 		
-		MConf.i = this.get(MCore.INSTANCE, true);
+		MConf.i = this.get(MassiveCore.INSTANCE, true);
 	}
 	
 }

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<MPlayer>
 {

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.massivecore.store.MStore;
-import com.massivecraft.mcore.store.SenderColl;
+import com.massivecraft.massivecore.store.SenderColl;
 
 public class MPlayerColl extends SenderColl<MPlayer>
 {

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.massivecore.store.Entity;
-import com.massivecraft.mcore.store.SenderEntity;
+import com.massivecraft.massivecore.store.SenderEntity;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class UConf extends Entity<UConf>
 {

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.massivecore.MassiveCore;
-import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.massivecore.store.Coll;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
 
 public class UConfColl extends Coll<UConf>
 {
@@ -24,7 +24,7 @@ public class UConfColl extends Coll<UConf>
 	public void init()
 	{
 		super.init();
-		this.get(MCore.INSTANCE, true);
+		this.get(MassiveCore.INSTANCE, true);
 	}
 	
 }

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.massivecore.Aspect;
-import com.massivecraft.mcore.MCore;
+import com.massivecraft.massivecore.MassiveCore;
 
 public class UConfColls extends XColls<UConfColl, UConf>
 {
@@ -41,7 +41,7 @@ public class UConfColls extends XColls<UConfColl, UConf>
 	{
 		UConfColl coll = this.get(worldNameExtractable);
 		if (coll == null) return null;
-		return coll.get(MCore.INSTANCE);
+		return coll.get(MassiveCore.INSTANCE);
 	}
 	
 }

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.massivecore.mixin.Mixin;
-import com.massivecraft.mcore.ps.PS;
+import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.mcore.ps.PSFormatHumanSpace;
+import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
-import com.massivecraft.mcore.store.SenderEntity;
+import com.massivecraft.massivecore.store.SenderEntity;
-import com.massivecraft.mcore.util.IdUtil;
+import com.massivecraft.massivecore.util.IdUtil;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 
 public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipator

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.massivecore.mixin.Mixin;
-import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.massivecore.store.MStore;
-import com.massivecraft.mcore.store.SenderColl;
+import com.massivecraft.massivecore.store.SenderColl;
-import com.massivecraft.mcore.util.TimeUnit;
+import com.massivecraft.massivecore.util.TimeUnit;
-import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.massivecore.util.Txt;
 
 public class UPlayerColl extends SenderColl<UPlayer>
 {

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.massivecore.Aspect;
-import com.massivecraft.mcore.MCore;
+import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.mcore.util.DiscUtil;
+import com.massivecraft.massivecore.util.DiscUtil;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 public class UPlayerColls extends XColls<UPlayerColl, UPlayer>
 {
@@ -66,7 +66,7 @@ public class UPlayerColls extends XColls<UPlayerColl, UPlayer>
 		Map<String, UPlayer> 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<String, UPlayer> entry : id2uplayer.entrySet())

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.massivecore.store.Coll;
-import com.massivecraft.mcore.store.Colls;
+import com.massivecraft.massivecore.store.Colls;
-import com.massivecraft.mcore.store.Entity;
+import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.massivecore.util.MUtil;
 
 public abstract class XColls<C extends Coll<E>, E> extends Colls<C, E>
 {

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
 {
 
 }

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

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
 {	

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
 {	

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
 {

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();

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<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT, Rel.ALLY);
 	@Override public Set<Rel> getTargetRelations() { return targetRelations; }

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<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT);
 	@Override public Set<Rel> getTargetRelations() { return targetRelations; }

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();
+	private static EngineHerochat i = new EngineHerochat();
-	public static HerochatEngine get() { return i; }
+	public static EngineHerochat get() { return i; }
-	private HerochatEngine() {}
+	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 ChannelFactionsFaction());
-		Herochat.getChannelManager().addChannel(new AlliesChannel());
+		Herochat.getChannelManager().addChannel(new ChannelFactionsAllies());
 		
 		Bukkit.getPluginManager().registerEvents(this, Factions.get());
 	}