diff --git a/README.md b/README.md index 14a7c30a..f0bdd24c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ - -![MCore Logotype](https://raw.github.com/MassiveCraft/mcore/master/media/logo300.png)
-http://massivecraft.com/mcore + +![MassiveCore Logotype](https://raw.github.com/MassiveCraft/MassiveCore/master/media/logo300.png)
+http://massivecraft.com/MassiveCore diff --git a/plugin.yml b/plugin.yml index 5893c55b..46c49973 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,134 +1,134 @@ -main: com.massivecraft.mcore.MCore -name: mcore +main: com.massivecraft.massivecore.MassiveCore +name: MassiveCore version: 7.2.1 -website: http://massivecraft.com/mcore +website: http://massivecraft.com/massivecore authors: [Cayorion] -description: §eMCore stands for MassiveCraft Core and is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttp://massivecraft.com +description: §eMassiveCore is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttp://massivecraft.com load: startup permissions: # -------------------------------------------- # # THE REAL NODES # -------------------------------------------- # # cmd - mcore.basecommand: {description: use the MCore base command, default: false} - mcore.test: {description: run developer test, default: false} - mcore.id: {description: see the server id, default: false} - mcore.version: {description: diplay plugin version, default: false} - mcore.hearsound: {description: hear a sound, default: false} - mcore.mstore: {description: use the mstore command, default: false} - mcore.mstore.stats: {description: show mstore statistics, default: false} - mcore.mstore.listcolls: {description: list collections in a database, default: false} - mcore.mstore.copydb: {description: copy database content, default: false} - mcore.usys: {description: use the usys command, default: false} - mcore.usys.multiverse: {description: manage multiverses, default: false} - mcore.usys.multiverse.list: {description: list multiverses, default: false} - mcore.usys.multiverse.show: {description: show multiverse, default: false} - mcore.usys.multiverse.new: {description: create new multiverse, default: false} - mcore.usys.multiverse.del: {description: delete multiverse, default: false} - mcore.usys.universe: {description: manage universes, default: false} - mcore.usys.universe.new: {description: create new universe in multiverse, default: false} - mcore.usys.universe.del: {description: delete universe in multiverse, default: false} - mcore.usys.universe.clear: {description: clear universe in multiverse, default: false} - mcore.usys.world: {description: set a worlds universe in a multiverse, default: false} - mcore.usys.aspect: {description: manage aspects, default: false} - mcore.usys.aspect.list: {description: list aspects, default: false} - mcore.usys.aspect.show: {description: show aspect, default: false} - mcore.usys.aspect.use: {description: set multiverse for aspect, default: false} - mcore.buffer: {description: use the buffer command, default: false} - mcore.buffer.print: {description: print buffer, default: false} - mcore.buffer.clear: {description: clear buffer, default: false} - mcore.buffer.set: {description: set buffer, default: false} - mcore.buffer.add: {description: add to buffer, default: false} - mcore.buffer.whitespace: {description: add whitespace to buffer, default: false} + massivecore.basecommand: {description: use the MassiveCore base command, default: false} + massivecore.test: {description: run developer test, default: false} + massivecore.id: {description: see the server id, default: false} + massivecore.version: {description: diplay plugin version, default: false} + massivecore.hearsound: {description: hear a sound, default: false} + massivecore.store: {description: use the mstore command, default: false} + massivecore.store.stats: {description: show mstore statistics, default: false} + massivecore.store.listcolls: {description: list collections in a database, default: false} + massivecore.store.copydb: {description: copy database content, default: false} + massivecore.usys: {description: use the usys command, default: false} + massivecore.usys.multiverse: {description: manage multiverses, default: false} + massivecore.usys.multiverse.list: {description: list multiverses, default: false} + massivecore.usys.multiverse.show: {description: show multiverse, default: false} + massivecore.usys.multiverse.new: {description: create new multiverse, default: false} + massivecore.usys.multiverse.del: {description: delete multiverse, default: false} + massivecore.usys.universe: {description: manage universes, default: false} + massivecore.usys.universe.new: {description: create new universe in multiverse, default: false} + massivecore.usys.universe.del: {description: delete universe in multiverse, default: false} + massivecore.usys.universe.clear: {description: clear universe in multiverse, default: false} + massivecore.usys.world: {description: set a worlds universe in a multiverse, default: false} + massivecore.usys.aspect: {description: manage aspects, default: false} + massivecore.usys.aspect.list: {description: list aspects, default: false} + massivecore.usys.aspect.show: {description: show aspect, default: false} + massivecore.usys.aspect.use: {description: set multiverse for aspect, default: false} + massivecore.buffer: {description: use the buffer command, default: false} + massivecore.buffer.print: {description: print buffer, default: false} + massivecore.buffer.clear: {description: clear buffer, default: false} + massivecore.buffer.set: {description: set buffer, default: false} + massivecore.buffer.add: {description: add to buffer, default: false} + massivecore.buffer.whitespace: {description: add whitespace to buffer, default: false} # misc - mcore.notpdelay: {description: teleport without delay, default: false} - mcore.variable.book: {description: replace ***book*** with content of book in your hand, default: false} - mcore.variable.buffer: {description: replace ***buffer*** with content of your buffer, default: false} + massivecore.notpdelay: {description: teleport without delay, default: false} + massivecore.variable.book: {description: replace ***book*** with content of book in your hand, default: false} + massivecore.variable.buffer: {description: replace ***buffer*** with content of your buffer, default: false} # -------------------------------------------- # # STAR NOTATION # -------------------------------------------- # - mcore.*: + massivecore.*: default: false children: - mcore.basecommand: true - mcore.test: true - mcore.id: true - mcore.version: true - mcore.hearsound: true - mcore.mstore: true - mcore.mstore.stats: true - mcore.mstore.listcolls: true - mcore.mstore.copydb: true - mcore.usys: true - mcore.usys.multiverse: true - mcore.usys.multiverse.list: true - mcore.usys.multiverse.show: true - mcore.usys.multiverse.new: true - mcore.usys.multiverse.del: true - mcore.usys.universe: true - mcore.usys.universe.new: true - mcore.usys.universe.del: true - mcore.usys.universe.clear: true - mcore.usys.world: true - mcore.usys.aspect: true - mcore.usys.aspect.list: true - mcore.usys.aspect.show: true - mcore.usys.aspect.use: true - mcore.buffer: true - mcore.buffer.print: true - mcore.buffer.clear: true - mcore.buffer.set: true - mcore.buffer.add: true - mcore.buffer.whitespace: true - mcore.notpdelay: true - mcore.variable.book: true - mcore.variable.buffer: true + massivecore.basecommand: true + massivecore.test: true + massivecore.id: true + massivecore.version: true + massivecore.hearsound: true + massivecore.store: true + massivecore.store.stats: true + massivecore.store.listcolls: true + massivecore.store.copydb: true + massivecore.usys: true + massivecore.usys.multiverse: true + massivecore.usys.multiverse.list: true + massivecore.usys.multiverse.show: true + massivecore.usys.multiverse.new: true + massivecore.usys.multiverse.del: true + massivecore.usys.universe: true + massivecore.usys.universe.new: true + massivecore.usys.universe.del: true + massivecore.usys.universe.clear: true + massivecore.usys.world: true + massivecore.usys.aspect: true + massivecore.usys.aspect.list: true + massivecore.usys.aspect.show: true + massivecore.usys.aspect.use: true + massivecore.buffer: true + massivecore.buffer.print: true + massivecore.buffer.clear: true + massivecore.buffer.set: true + massivecore.buffer.add: true + massivecore.buffer.whitespace: true + massivecore.notpdelay: true + massivecore.variable.book: true + massivecore.variable.buffer: true # -------------------------------------------- # # KITS # -------------------------------------------- # - mcore.kit.operator: + massivecore.kit.operator: default: op children: - mcore.*: true - mcore.kit.rank3: + massivecore.*: true + massivecore.kit.rank3: default: false children: - mcore.kit.rank2: true - mcore.kit.rank2: + massivecore.kit.rank2: true + massivecore.kit.rank2: default: false children: - mcore.kit.rank1: true - mcore.kit.rank1: + massivecore.kit.rank1: true + massivecore.kit.rank1: default: false children: - mcore.kit.rank0: true - mcore.id: true - mcore.mstore: true - mcore.mstore.stats: true - mcore.mstore.listcolls: true - mcore.usys: true - mcore.usys.multiverse: true - mcore.usys.multiverse.list: true - mcore.usys.multiverse.show: true - mcore.usys.aspect: true - mcore.usys.aspect.list: true - mcore.usys.aspect.show: true - mcore.buffer: true - mcore.buffer.print: true - mcore.buffer.clear: true - mcore.buffer.set: true - mcore.buffer.add: true - mcore.buffer.whitespace: true - mcore.notpdelay: true - mcore.variable.book: true - mcore.variable.buffer: true - mcore.kit.rank0: + massivecore.kit.rank0: true + massivecore.id: true + massivecore.store: true + massivecore.store.stats: true + massivecore.store.listcolls: true + massivecore.usys: true + massivecore.usys.multiverse: true + massivecore.usys.multiverse.list: true + massivecore.usys.multiverse.show: true + massivecore.usys.aspect: true + massivecore.usys.aspect.list: true + massivecore.usys.aspect.show: true + massivecore.buffer: true + massivecore.buffer.print: true + massivecore.buffer.clear: true + massivecore.buffer.set: true + massivecore.buffer.add: true + massivecore.buffer.whitespace: true + massivecore.notpdelay: true + massivecore.variable.book: true + massivecore.variable.buffer: true + massivecore.kit.rank0: default: false children: - mcore.basecommand: true - mcore.hearsound: true - mcore.version: true - mcore.kit.default: + massivecore.basecommand: true + massivecore.hearsound: true + massivecore.version: true + massivecore.kit.default: default: true children: - mcore.kit.rank0: true \ No newline at end of file + massivecore.kit.rank0: true \ No newline at end of file diff --git a/src/com/massivecraft/mcore/Aspect.java b/src/com/massivecraft/massivecore/Aspect.java similarity index 84% rename from src/com/massivecraft/mcore/Aspect.java rename to src/com/massivecraft/massivecore/Aspect.java index 6d5b8770..c73e08b8 100644 --- a/src/com/massivecraft/mcore/Aspect.java +++ b/src/com/massivecraft/massivecore/Aspect.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; public class Aspect extends Entity { @@ -42,7 +42,7 @@ public class Aspect extends Entity public Multiverse getMultiverse() { Multiverse ret = MultiverseColl.get().get(this.multiverseId); - if (ret == null) ret = MultiverseColl.get().get(MCore.DEFAULT); + if (ret == null) ret = MultiverseColl.get().get(MassiveCore.DEFAULT); return ret; } public void setMultiverse(Multiverse val) { this.multiverseId = val.getId(); } diff --git a/src/com/massivecraft/mcore/AspectColl.java b/src/com/massivecraft/massivecore/AspectColl.java similarity index 79% rename from src/com/massivecraft/mcore/AspectColl.java rename to src/com/massivecraft/massivecore/AspectColl.java index 0db11352..89850802 100644 --- a/src/com/massivecraft/mcore/AspectColl.java +++ b/src/com/massivecraft/massivecore/AspectColl.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.MStore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; public class AspectColl extends Coll { @@ -16,7 +16,7 @@ public class AspectColl extends Coll public static AspectColl get() { return i; } private AspectColl() { - super("mcore_aspect", Aspect.class, MStore.getDb("default"), MCore.get()); + super("massivecore_aspect", Aspect.class, MStore.getDb("default"), MassiveCore.get()); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/ConfServer.java b/src/com/massivecraft/massivecore/ConfServer.java similarity index 81% rename from src/com/massivecraft/mcore/ConfServer.java rename to src/com/massivecraft/massivecore/ConfServer.java index ef677c02..2f5d5806 100644 --- a/src/com/massivecraft/mcore/ConfServer.java +++ b/src/com/massivecraft/massivecore/ConfServer.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.Map; import java.util.UUID; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class ConfServer extends SimpleConfig { @@ -13,7 +13,7 @@ public class ConfServer extends SimpleConfig private static transient ConfServer i = new ConfServer(); public static ConfServer get() { return i; } - public ConfServer() { super(MCore.get()); } + public ConfServer() { super(MassiveCore.get()); } // -------------------------------------------- // // FIELDS diff --git a/src/com/massivecraft/mcore/Couple.java b/src/com/massivecraft/massivecore/Couple.java similarity index 92% rename from src/com/massivecraft/mcore/Couple.java rename to src/com/massivecraft/massivecore/Couple.java index 9d405d45..44d63e2a 100644 --- a/src/com/massivecraft/mcore/Couple.java +++ b/src/com/massivecraft/massivecore/Couple.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.io.Serializable; import java.util.Map.Entry; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class Couple implements Entry, Cloneable, Serializable { diff --git a/src/com/massivecraft/mcore/Engine.java b/src/com/massivecraft/massivecore/Engine.java similarity index 86% rename from src/com/massivecraft/mcore/Engine.java rename to src/com/massivecraft/massivecore/Engine.java index c5745881..05092894 100644 --- a/src/com/massivecraft/mcore/Engine.java +++ b/src/com/massivecraft/massivecore/Engine.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; diff --git a/src/com/massivecraft/mcore/EngineAbstract.java b/src/com/massivecraft/massivecore/EngineAbstract.java similarity index 92% rename from src/com/massivecraft/mcore/EngineAbstract.java rename to src/com/massivecraft/massivecore/EngineAbstract.java index 7c34e3c8..9221c56e 100644 --- a/src/com/massivecraft/mcore/EngineAbstract.java +++ b/src/com/massivecraft/massivecore/EngineAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; diff --git a/src/com/massivecraft/massivecore/HashCodeComparator.java b/src/com/massivecraft/massivecore/HashCodeComparator.java new file mode 100644 index 00000000..31f88d85 --- /dev/null +++ b/src/com/massivecraft/massivecore/HashCodeComparator.java @@ -0,0 +1,24 @@ +package com.massivecraft.massivecore; + +import java.util.*; + +public class HashCodeComparator implements Comparator +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static transient HashCodeComparator i = new HashCodeComparator(); + public static HashCodeComparator get() { return i; } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public int compare(Object o1, Object o2) + { + return o2.hashCode() - o1.hashCode(); + } + +} diff --git a/src/com/massivecraft/mcore/HeatData.java b/src/com/massivecraft/massivecore/HeatData.java similarity index 94% rename from src/com/massivecraft/mcore/HeatData.java rename to src/com/massivecraft/massivecore/HeatData.java index ce7082f2..994787d0 100644 --- a/src/com/massivecraft/mcore/HeatData.java +++ b/src/com/massivecraft/massivecore/HeatData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; public final class HeatData { diff --git a/src/com/massivecraft/mcore/Heatable.java b/src/com/massivecraft/massivecore/Heatable.java similarity index 94% rename from src/com/massivecraft/mcore/Heatable.java rename to src/com/massivecraft/massivecore/Heatable.java index 1a0bd8dc..d094d658 100644 --- a/src/com/massivecraft/mcore/Heatable.java +++ b/src/com/massivecraft/massivecore/Heatable.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; public abstract class Heatable { diff --git a/src/com/massivecraft/mcore/Lang.java b/src/com/massivecraft/massivecore/Lang.java similarity index 92% rename from src/com/massivecraft/mcore/Lang.java rename to src/com/massivecraft/massivecore/Lang.java index ef1c10d8..30009182 100644 --- a/src/com/massivecraft/mcore/Lang.java +++ b/src/com/massivecraft/massivecore/Lang.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; public class Lang { diff --git a/src/com/massivecraft/mcore/MCore.java b/src/com/massivecraft/massivecore/MassiveCore.java similarity index 60% rename from src/com/massivecraft/mcore/MCore.java rename to src/com/massivecraft/massivecore/MassiveCore.java index 730fe65f..1398617f 100644 --- a/src/com/massivecraft/mcore/MCore.java +++ b/src/com/massivecraft/massivecore/MassiveCore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -12,40 +12,40 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import com.massivecraft.mcore.adapter.InventoryAdapter; -import com.massivecraft.mcore.adapter.ItemStackAdapter; -import com.massivecraft.mcore.adapter.JsonElementAdapter; -import com.massivecraft.mcore.adapter.ModdedEnumTypeAdapter; -import com.massivecraft.mcore.adapter.ObjectIdAdapter; -import com.massivecraft.mcore.adapter.PlayerInventoryAdapter; -import com.massivecraft.mcore.adapter.UUIDAdapter; -import com.massivecraft.mcore.event.MCoreUuidUpdateEvent; -import com.massivecraft.mcore.fetcher.Fetcher; -import com.massivecraft.mcore.fetcher.IdAndName; -import com.massivecraft.mcore.integration.protocollib.ProtocolLibFeatures; -import com.massivecraft.mcore.integration.vault.VaultFeatures; -import com.massivecraft.mcore.mcorecmd.CmdMCore; -import com.massivecraft.mcore.mcorecmd.CmdMCoreBuffer; -import com.massivecraft.mcore.mcorecmd.CmdMCoreMStore; -import com.massivecraft.mcore.mcorecmd.CmdMCoreUsys; -import com.massivecraft.mcore.mixin.EngineTeleportMixinCause; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSAdapter; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.ExamineThread; -import com.massivecraft.mcore.teleport.EngineScheduledTeleport; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.PlayerUtil; -import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.GsonBuilder; -import com.massivecraft.mcore.xlib.gson.JsonArray; -import com.massivecraft.mcore.xlib.gson.JsonNull; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.adapter.InventoryAdapter; +import com.massivecraft.massivecore.adapter.ItemStackAdapter; +import com.massivecraft.massivecore.adapter.JsonElementAdapter; +import com.massivecraft.massivecore.adapter.ModdedEnumTypeAdapter; +import com.massivecraft.massivecore.adapter.ObjectIdAdapter; +import com.massivecraft.massivecore.adapter.PlayerInventoryAdapter; +import com.massivecraft.massivecore.adapter.UUIDAdapter; +import com.massivecraft.massivecore.cmd.massivecore.CmdMassiveCore; +import com.massivecraft.massivecore.cmd.massivecore.CmdMassiveCoreBuffer; +import com.massivecraft.massivecore.cmd.massivecore.CmdMassiveCoreStore; +import com.massivecraft.massivecore.cmd.massivecore.CmdMassiveCoreUsys; +import com.massivecraft.massivecore.event.EventMassiveCoreUuidUpdate; +import com.massivecraft.massivecore.fetcher.Fetcher; +import com.massivecraft.massivecore.fetcher.IdAndName; +import com.massivecraft.massivecore.integration.protocollib.IntegrationProtocolLib; +import com.massivecraft.massivecore.integration.vault.IntegrationVault; +import com.massivecraft.massivecore.mixin.EngineTeleportMixinCause; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSAdapter; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.ExamineThread; +import com.massivecraft.massivecore.teleport.EngineScheduledTeleport; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.PlayerUtil; +import com.massivecraft.massivecore.util.Txt; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -public class MCore extends MPlugin +public class MassiveCore extends MassivePlugin { // -------------------------------------------- // // COMMON CONSTANTS @@ -58,18 +58,18 @@ public class MCore extends MPlugin // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static MCore i; - public static MCore get() { return i; } - public MCore() { i = this; } + private static MassiveCore i; + public static MassiveCore get() { return i; } + public MassiveCore() { i = this; } // -------------------------------------------- // // STATIC // -------------------------------------------- // public static Random random = new Random(); - public static Gson gson = getMCoreGsonBuilder().create(); + public static Gson gson = getMassiveCoreGsonBuilder().create(); - public static GsonBuilder getMCoreGsonBuilder() + public static GsonBuilder getMassiveCoreGsonBuilder() { return new GsonBuilder() .setPrettyPrinting() @@ -97,17 +97,17 @@ public class MCore extends MPlugin // -------------------------------------------- // // Commands - private CmdMCore outerCmdMCore; - public CmdMCore getOuterCmdMCore() { return this.outerCmdMCore; } + private CmdMassiveCore outerCmdMassiveCore; + public CmdMassiveCore getOuterCmdMassiveCore() { return this.outerCmdMassiveCore; } - private CmdMCoreUsys outerCmdMCoreUsys; - public CmdMCoreUsys getOuterCmdMCoreUsys() { return this.outerCmdMCoreUsys; } + private CmdMassiveCoreUsys outerCmdMassiveCoreUsys; + public CmdMassiveCoreUsys getOuterCmdMassiveCoreUsys() { return this.outerCmdMassiveCoreUsys; } - private CmdMCoreMStore outerCmdMCoreMStore; - public CmdMCoreMStore getOuterCmdMCoreMStore() { return this.outerCmdMCoreMStore; } + private CmdMassiveCoreStore outerCmdMassiveCoreStore; + public CmdMassiveCoreStore getOuterCmdMassiveCoreStore() { return this.outerCmdMassiveCoreStore; } - private CmdMCoreBuffer outerCmdMCoreBuffer; - public CmdMCoreBuffer getOuterCmdMCoreBuffer() { return this.outerCmdMCoreBuffer; } + private CmdMassiveCoreBuffer outerCmdMassiveCoreBuffer; + public CmdMassiveCoreBuffer getOuterCmdMassiveCoreBuffer() { return this.outerCmdMassiveCoreBuffer; } // Runnables // TODO: Make this one a singleton @@ -161,12 +161,12 @@ public class MCore extends MPlugin IdUtil.setup(); // Register events - MCoreEngineMain.get().activate(); - MCoreEngineVariable.get().activate(); + MassiveCoreEngineMain.get().activate(); + MassiveCoreEngineVariable.get().activate(); EngineScheduledTeleport.get().activate(); EngineTeleportMixinCause.get().activate(); - MCoreEngineWorldNameSet.get().activate(); - MCoreEngineCommandRegistration.get().activate(); + MassiveCoreEngineWorldNameSet.get().activate(); + MassiveCoreEngineCommandRegistration.get().activate(); PlayerUtil.get().activate(); // Tasks @@ -175,30 +175,30 @@ public class MCore extends MPlugin // Collections MultiverseColl.get().init(); AspectColl.get().init(); - MCoreConfColl.get().init(); + MassiveCoreMConfColl.get().init(); // Register commands - this.outerCmdMCore = new CmdMCore() { public List getAliases() { return MCoreConf.get().aliasesOuterMCore; } }; - this.outerCmdMCore.register(); + this.outerCmdMassiveCore = new CmdMassiveCore() { public List getAliases() { return MassiveCoreMConf.get().aliasesOuterMassiveCore; } }; + this.outerCmdMassiveCore.register(); - this.outerCmdMCoreUsys = new CmdMCoreUsys() { public List getAliases() { return MCoreConf.get().aliasesOuterMCoreUsys; } }; - this.outerCmdMCoreUsys.register(); + this.outerCmdMassiveCoreUsys = new CmdMassiveCoreUsys() { public List getAliases() { return MassiveCoreMConf.get().aliasesOuterMassiveCoreUsys; } }; + this.outerCmdMassiveCoreUsys.register(); - this.outerCmdMCoreMStore = new CmdMCoreMStore() { public List getAliases() { return MCoreConf.get().aliasesOuterMCoreMStore; } }; - this.outerCmdMCoreMStore.register(); + this.outerCmdMassiveCoreStore = new CmdMassiveCoreStore() { public List getAliases() { return MassiveCoreMConf.get().aliasesOuterMassiveCoreStore; } }; + this.outerCmdMassiveCoreStore.register(); - this.outerCmdMCoreBuffer = new CmdMCoreBuffer() { public List getAliases() { return MCoreConf.get().aliasesOuterMCoreBuffer; } }; - this.outerCmdMCoreBuffer.register(); + this.outerCmdMassiveCoreBuffer = new CmdMassiveCoreBuffer() { public List getAliases() { return MassiveCoreMConf.get().aliasesOuterMassiveCoreBuffer; } }; + this.outerCmdMassiveCoreBuffer.register(); // Integration this.integrate( - ProtocolLibFeatures.get(), - VaultFeatures.get() + IntegrationProtocolLib.get(), + IntegrationVault.get() ); // Delete Files (at once and additionally after all plugins loaded) - TaskDeleteFiles.get().run(); - Bukkit.getScheduler().scheduleSyncDelayedTask(this, TaskDeleteFiles.get()); + MassiveCoreTaskDeleteFiles.get().run(); + Bukkit.getScheduler().scheduleSyncDelayedTask(this, MassiveCoreTaskDeleteFiles.get()); // test(); @@ -216,7 +216,7 @@ public class MCore extends MPlugin log(Txt.parse("Now updating database for plugins that are ready ...")); - MCoreUuidUpdateEvent event = new MCoreUuidUpdateEvent(); + EventMassiveCoreUuidUpdate event = new EventMassiveCoreUuidUpdate(); event.run(); log(Txt.parse(" ... done!")); @@ -308,7 +308,7 @@ public class MCore extends MPlugin { super.onDisable(); ExamineThread.get().interrupt(); - TaskDeleteFiles.get().run(); + MassiveCoreTaskDeleteFiles.get().run(); IdUtil.saveCachefileDatas(); } diff --git a/src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java b/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java similarity index 76% rename from src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java rename to src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java index 43bbdee0..404d1cf3 100644 --- a/src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java +++ b/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.lang.reflect.Field; import java.util.Iterator; @@ -11,17 +11,17 @@ import org.bukkit.command.Command; import org.bukkit.command.SimpleCommandMap; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.MCoreBukkitCommand; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.MassiveCoreBukkitCommand; -public class MCoreEngineCommandRegistration extends EngineAbstract +public class MassiveCoreEngineCommandRegistration extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static MCoreEngineCommandRegistration i = new MCoreEngineCommandRegistration(); - public static MCoreEngineCommandRegistration get() { return i; } + private static MassiveCoreEngineCommandRegistration i = new MassiveCoreEngineCommandRegistration(); + public static MassiveCoreEngineCommandRegistration get() { return i; } // -------------------------------------------- // // OVERRIDE @@ -30,7 +30,7 @@ public class MCoreEngineCommandRegistration extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } @Override @@ -66,8 +66,8 @@ public class MCoreEngineCommandRegistration extends EngineAbstract Entry entry = iter.next(); Command command = entry.getValue(); - // ... if this command is a MCoreBukkitCommand ... - if (!(command instanceof MCoreBukkitCommand)) continue; + // ... if this command is a MassiveCoreBukkitCommand ... + if (!(command instanceof MassiveCoreBukkitCommand)) continue; // ... unregister it. command.unregister(simpleCommandMap); @@ -75,7 +75,7 @@ public class MCoreEngineCommandRegistration extends EngineAbstract } // For each MCommand that is supposed to be registered ... - for (MCommand mcommand : MCommand.getRegisteredCommands()) + for (MassiveCommand mcommand : MassiveCommand.getRegisteredCommands()) { // ... and for each of it's aliases ... for (String alias : mcommand.getAliases()) @@ -90,11 +90,11 @@ public class MCoreEngineCommandRegistration extends EngineAbstract previousOccupant.unregister(simpleCommandMap); } - // ... create a new MCoreBukkitCommand ... - MCoreBukkitCommand command = new MCoreBukkitCommand(alias, mcommand); + // ... create a new MassiveCoreBukkitCommand ... + MassiveCoreBukkitCommand command = new MassiveCoreBukkitCommand(alias, mcommand); // ... and finally register it. - simpleCommandMap.register("MCore", command); + simpleCommandMap.register("MassiveCore", command); } } } diff --git a/src/com/massivecraft/mcore/MCoreEngineMain.java b/src/com/massivecraft/massivecore/MassiveCoreEngineMain.java similarity index 73% rename from src/com/massivecraft/mcore/MCoreEngineMain.java rename to src/com/massivecraft/massivecore/MassiveCoreEngineMain.java index 132a4005..cbe99840 100644 --- a/src/com/massivecraft/mcore/MCoreEngineMain.java +++ b/src/com/massivecraft/massivecore/MassiveCoreEngineMain.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.HashMap; import java.util.HashSet; @@ -23,27 +23,27 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.event.MCoreAfterPlayerRespawnEvent; -import com.massivecraft.mcore.event.MCoreAfterPlayerTeleportEvent; -import com.massivecraft.mcore.event.MCorePermissionDeniedFormatEvent; -import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore.event.MCorePlayerToRecipientChatEvent; -import com.massivecraft.mcore.event.MCoreSenderRegisterEvent; -import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.SenderColl; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.SmokeUtil; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerTeleport; +import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderRegister; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderUnregister; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.SenderColl; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.SmokeUtil; -public class MCoreEngineMain extends EngineAbstract +public class MassiveCoreEngineMain extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static MCoreEngineMain i = new MCoreEngineMain(); - public static MCoreEngineMain get() { return i; } + private static MassiveCoreEngineMain i = new MassiveCoreEngineMain(); + public static MassiveCoreEngineMain get() { return i; } // -------------------------------------------- // // OVERRIDE @@ -52,14 +52,14 @@ public class MCoreEngineMain extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } @Override public void activate() { super.activate(); - MCorePlayerLeaveEvent.player2event.clear(); + EventMassiveCorePlayerLeave.player2event.clear(); } // -------------------------------------------- // @@ -73,10 +73,10 @@ public class MCoreEngineMain extends EngineAbstract public void recipientChat(final AsyncPlayerChatEvent event) { // Return unless we are using the recipient chat event - if (!MCoreConf.get().usingRecipientChatEvent) return; + if (!MassiveCoreMConf.get().usingRecipientChatEvent) return; // Prepare vars - MCorePlayerToRecipientChatEvent recipientEvent; + EventMassiveCorePlayerToRecipientChat recipientEvent; final Player sender = event.getPlayer(); String message = event.getMessage(); String format = event.getFormat(); @@ -89,7 +89,7 @@ public class MCoreEngineMain extends EngineAbstract for (Player recipient : players) { // Run the event for this unique recipient - recipientEvent = new MCorePlayerToRecipientChatEvent(event.isAsynchronous(), sender, recipient, message, format); + recipientEvent = new EventMassiveCorePlayerToRecipientChat(event.isAsynchronous(), sender, recipient, message, format); recipientEvent.run(); // Format and send with the format and message from this recipient's own event. @@ -98,7 +98,7 @@ public class MCoreEngineMain extends EngineAbstract } // For the console - recipientEvent = new MCorePlayerToRecipientChatEvent(event.isAsynchronous(), sender, Bukkit.getConsoleSender(), message, format); + recipientEvent = new EventMassiveCorePlayerToRecipientChat(event.isAsynchronous(), sender, Bukkit.getConsoleSender(), message, format); recipientEvent.run(); event.setMessage(recipientEvent.getMessage()); event.setFormat(recipientEvent.getFormat()); @@ -109,13 +109,13 @@ public class MCoreEngineMain extends EngineAbstract // -------------------------------------------- // @EventHandler(priority = EventPriority.NORMAL) - public void permissionDeniedFormat(MCorePermissionDeniedFormatEvent event) + public void permissionDeniedFormat(EventMassiveCorePermissionDeniedFormat event) { // If noone set a format already ... if (event.hasFormat()) return; // ... and we have a custom format in the config ... - String customFormat = MCoreConf.get().getPermissionDeniedFormat(event.getPermissionName()); + String customFormat = MassiveCoreMConf.get().getPermissionDeniedFormat(event.getPermissionName()); if (customFormat == null) return; // ... then make use of that format. @@ -210,13 +210,13 @@ public class MCoreEngineMain extends EngineAbstract } @EventHandler(priority = EventPriority.MONITOR) - public void setSenderReferencesRegisterMonitor(MCoreSenderRegisterEvent event) + public void setSenderReferencesRegisterMonitor(EventMassiveCoreSenderRegister event) { setSenderReferences(event.getSender(), event.getSender()); } @EventHandler(priority = EventPriority.MONITOR) - public void setSenderReferencesUnregisterMonitor(MCoreSenderUnregisterEvent event) + public void setSenderReferencesUnregisterMonitor(EventMassiveCoreSenderUnregister event) { setSenderReferences(event.getSender(), null); } @@ -228,13 +228,13 @@ public class MCoreEngineMain extends EngineAbstract @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void after(PlayerTeleportEvent event) { - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new MCoreAfterPlayerTeleportEvent(event), 0); + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new EventMassiveCoreAfterPlayerTeleport(event), 0); } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void after(PlayerRespawnEvent event) { - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new MCoreAfterPlayerRespawnEvent(event, event.getPlayer().getLocation()), 0); + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new EventMassiveCoreAfterPlayerRespawn(event, event.getPlayer().getLocation()), 0); } // -------------------------------------------- // @@ -255,7 +255,7 @@ public class MCoreEngineMain extends EngineAbstract { // We do the schedule in order for the set to be correct through out the whole MONITOR priority state. final String name = event.getPlayer().getName(); - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() @@ -272,13 +272,13 @@ public class MCoreEngineMain extends EngineAbstract @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void leaveEventKickCall(PlayerKickEvent event) { - new MCorePlayerLeaveEvent(event.getPlayer(), true, "kick", event.getReason()).run(); + new EventMassiveCorePlayerLeave(event.getPlayer(), true, "kick", event.getReason()).run(); } @EventHandler(priority = EventPriority.MONITOR) public void leaveEventQuitCall(PlayerQuitEvent event) { - new MCorePlayerLeaveEvent(event.getPlayer(), false, "quit", null).run(); + new EventMassiveCorePlayerLeave(event.getPlayer(), false, "quit", null).run(); } @EventHandler(priority = EventPriority.MONITOR) @@ -286,12 +286,12 @@ public class MCoreEngineMain extends EngineAbstract { // We do the schedule in order for the set to be correct through out the whole MONITOR priority state. final String name = event.getPlayer().getName(); - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() { - MCorePlayerLeaveEvent.player2event.remove(name); + EventMassiveCorePlayerLeave.player2event.remove(name); } }); } @@ -303,14 +303,14 @@ public class MCoreEngineMain extends EngineAbstract @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void syncOnPlayerLogin(PlayerLoginEvent event) { - //MCore.get().log("LOWEST syncOnPlayerLogin", event.getPlayer().getName()); + //MassiveCore.get().log("LOWEST syncOnPlayerLogin", event.getPlayer().getName()); this.syncAllForPlayer(event.getPlayer()); } @EventHandler(priority = EventPriority.MONITOR) - public void syncOnPlayerLeave(MCorePlayerLeaveEvent event) + public void syncOnPlayerLeave(EventMassiveCorePlayerLeave event) { - //MCore.get().log("MONITOR syncOnPlayerLeave", event.getPlayer().getName()); + //MassiveCore.get().log("MONITOR syncOnPlayerLeave", event.getPlayer().getName()); this.syncAllForPlayer(event.getPlayer()); } diff --git a/src/com/massivecraft/mcore/MCoreEngineVariable.java b/src/com/massivecraft/massivecore/MassiveCoreEngineVariable.java similarity index 78% rename from src/com/massivecraft/mcore/MCoreEngineVariable.java rename to src/com/massivecraft/massivecore/MassiveCoreEngineVariable.java index 80c2056a..a16e72b9 100644 --- a/src/com/massivecraft/mcore/MCoreEngineVariable.java +++ b/src/com/massivecraft/massivecore/MassiveCoreEngineVariable.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.HashMap; import java.util.List; @@ -17,17 +17,17 @@ import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; -public class MCoreEngineVariable extends EngineAbstract +public class MassiveCoreEngineVariable extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static MCoreEngineVariable i = new MCoreEngineVariable(); - public static MCoreEngineVariable get() { return i; } + private static MassiveCoreEngineVariable i = new MassiveCoreEngineVariable(); + public static MassiveCoreEngineVariable get() { return i; } // -------------------------------------------- // // OVERRIDE @@ -36,7 +36,7 @@ public class MCoreEngineVariable extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } // -------------------------------------------- // @@ -87,17 +87,17 @@ public class MCoreEngineVariable extends EngineAbstract public static String variableBook(Player player, String message) { // If we are using this variable ... - if (!MCoreConf.get().usingVariableBook) return message; + if (!MassiveCoreMConf.get().usingVariableBook) return message; // ... get the variable content ... String content = getBookText(player); if (content == null) return message; // ... check use permission ... - if (!MCorePerm.VARIABLE_BOOK.has(player, false)) return message; + if (!MassiveCorePerm.VARIABLE_BOOK.has(player, false)) return message; // ... and replace. - return StringUtils.replace(message, MCoreConf.get().variableBook, content); + return StringUtils.replace(message, MassiveCoreMConf.get().variableBook, content); } // -------------------------------------------- // @@ -124,16 +124,16 @@ public class MCoreEngineVariable extends EngineAbstract public static String variableBuffer(Player player, String message) { // If we are using this variable ... - if (!MCoreConf.get().usingVariableBuffer) return message; + if (!MassiveCoreMConf.get().usingVariableBuffer) return message; // ... get the variable content ... String content = getBuffer(player); if (content == null) return message; // ... check use permission ... - if (!MCorePerm.VARIABLE_BUFFER.has(player, false)) return message; + if (!MassiveCorePerm.VARIABLE_BUFFER.has(player, false)) return message; // ... and replace. - return StringUtils.replace(message, MCoreConf.get().variableBuffer, content); + return StringUtils.replace(message, MassiveCoreMConf.get().variableBuffer, content); } } diff --git a/src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java b/src/com/massivecraft/massivecore/MassiveCoreEngineWorldNameSet.java similarity index 82% rename from src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java rename to src/com/massivecraft/massivecore/MassiveCoreEngineWorldNameSet.java index 77a2737e..c39350fd 100644 --- a/src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java +++ b/src/com/massivecraft/massivecore/MassiveCoreEngineWorldNameSet.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.Collections; import java.util.Set; @@ -12,14 +12,14 @@ import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.plugin.Plugin; -public class MCoreEngineWorldNameSet extends EngineAbstract +public class MassiveCoreEngineWorldNameSet extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static MCoreEngineWorldNameSet i = new MCoreEngineWorldNameSet(); - public static MCoreEngineWorldNameSet get() { return i; } + private static MassiveCoreEngineWorldNameSet i = new MassiveCoreEngineWorldNameSet(); + public static MassiveCoreEngineWorldNameSet get() { return i; } // -------------------------------------------- // // OVERRIDE @@ -28,7 +28,7 @@ public class MCoreEngineWorldNameSet extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } @Override diff --git a/src/com/massivecraft/mcore/MCoreConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java similarity index 70% rename from src/com/massivecraft/mcore/MCoreConf.java rename to src/com/massivecraft/massivecore/MassiveCoreMConf.java index f32f8bf0..6691e5f6 100644 --- a/src/com/massivecraft/mcore/MCoreConf.java +++ b/src/com/massivecraft/massivecore/MassiveCoreMConf.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.ArrayList; import java.util.List; @@ -6,31 +6,31 @@ import java.util.Map; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.PermUtil; -import com.massivecraft.mcore.xlib.mongodb.WriteConcern; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.xlib.mongodb.WriteConcern; -public class MCoreConf extends Entity +public class MassiveCoreMConf extends Entity { // -------------------------------------------- // // META // -------------------------------------------- // - protected static transient MCoreConf i; - public static MCoreConf get() { return i; } + protected static transient MassiveCoreMConf i; + public static MassiveCoreMConf get() { return i; } // -------------------------------------------- // // FIELDS // -------------------------------------------- // - public List aliasesOuterMCore = MUtil.list("mcore"); + public List aliasesOuterMassiveCore = MUtil.list("massivecore", "mcore", "massivec", "mc"); - public List aliasesOuterMCoreUsys = MUtil.list("usys"); + public List aliasesOuterMassiveCoreUsys = MUtil.list("usys"); - public List aliasesOuterMCoreMStore = MUtil.list("mstore"); + public List aliasesOuterMassiveCoreStore = MUtil.list("massivestore", "mstore"); - public List aliasesOuterMCoreBuffer = MUtil.list("buffer"); + public List aliasesOuterMassiveCoreBuffer = MUtil.list("buffer"); public boolean usingRecipientChatEvent = true; @@ -52,7 +52,7 @@ public class MCoreConf extends Entity } public Map permissionToTpdelay = MUtil.map( - "mcore.notpdelay", 0, + "massivecore.notpdelay", 0, "default", 10 ); diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java b/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java new file mode 100644 index 00000000..3167dabf --- /dev/null +++ b/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java @@ -0,0 +1,38 @@ +package com.massivecraft.massivecore; + +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; + +public class MassiveCoreMConfColl extends Coll +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static MassiveCoreMConfColl i = new MassiveCoreMConfColl(); + public static MassiveCoreMConfColl get() { return i; } + private MassiveCoreMConfColl() + { + super("massivecore_mconf", MassiveCoreMConf.class, MStore.getDb(ConfServer.dburi), MassiveCore.get()); + } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void init() + { + super.init(); + MassiveCoreMConf.i = this.get(MassiveCore.INSTANCE, true); + } + + @Override + public synchronized void loadFromRemote(Object oid) + { + super.loadFromRemote(oid); + if ( ! this.inited()) return; + } + +} diff --git a/src/com/massivecraft/mcore/MCorePerm.java b/src/com/massivecraft/massivecore/MassiveCorePerm.java similarity index 81% rename from src/com/massivecraft/mcore/MCorePerm.java rename to src/com/massivecraft/massivecore/MassiveCorePerm.java index ba3ec815..29e3e8cb 100644 --- a/src/com/massivecraft/mcore/MCorePerm.java +++ b/src/com/massivecraft/massivecore/MassiveCorePerm.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.util.PermUtil; +import com.massivecraft.massivecore.util.PermUtil; -public enum MCorePerm +public enum MassiveCorePerm { // -------------------------------------------- // // ENUM @@ -15,10 +15,10 @@ public enum MCorePerm ID("id"), VERSION("version"), HEARSOUND("hearsound"), - MSTORE("mstore"), - MSTORE_STATS("mstore.stats"), - MSTORE_LISTCOLLS("mstore.listcolls"), - MSTORE_COPYDB("mstore.copydb"), + STORE("store"), + STORE_STATS("store.stats"), + STORE_LISTCOLLS("store.listcolls"), + STORE_COPYDB("store.copydb"), USYS("usys"), USYS_MULTIVERSE("usys.multiverse"), USYS_MULTIVERSE_LIST("usys.multiverse.list"), @@ -57,9 +57,9 @@ public enum MCorePerm // CONSTRUCT // -------------------------------------------- // - MCorePerm(final String permissionNode) + MassiveCorePerm(final String permissionNode) { - this.node = "mcore."+permissionNode; + this.node = "massivecore."+permissionNode; } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/TaskDeleteFiles.java b/src/com/massivecraft/massivecore/MassiveCoreTaskDeleteFiles.java similarity index 53% rename from src/com/massivecraft/mcore/TaskDeleteFiles.java rename to src/com/massivecraft/massivecore/MassiveCoreTaskDeleteFiles.java index a9f02d26..d390e225 100644 --- a/src/com/massivecraft/mcore/TaskDeleteFiles.java +++ b/src/com/massivecraft/massivecore/MassiveCoreTaskDeleteFiles.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.io.File; -public class TaskDeleteFiles implements Runnable +public class MassiveCoreTaskDeleteFiles implements Runnable { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static TaskDeleteFiles i = new TaskDeleteFiles(); - public static TaskDeleteFiles get() { return i; } + private static MassiveCoreTaskDeleteFiles i = new MassiveCoreTaskDeleteFiles(); + public static MassiveCoreTaskDeleteFiles get() { return i; } // -------------------------------------------- // // OVERRIDE @@ -18,7 +18,7 @@ public class TaskDeleteFiles implements Runnable @Override public void run() { - for (String deleteFile : MCoreConf.get().deleteFiles) + for (String deleteFile : MassiveCoreMConf.get().deleteFiles) { File file = new File(deleteFile); file.delete(); diff --git a/src/com/massivecraft/mcore/MPlugin.java b/src/com/massivecraft/massivecore/MassivePlugin.java similarity index 77% rename from src/com/massivecraft/mcore/MPlugin.java rename to src/com/massivecraft/massivecore/MassivePlugin.java index 891cd8a0..2fc49406 100644 --- a/src/com/massivecraft/mcore/MPlugin.java +++ b/src/com/massivecraft/massivecore/MassivePlugin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.logging.Level; import java.util.logging.Logger; @@ -9,14 +9,14 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import com.massivecraft.mcore.integration.Integration; -import com.massivecraft.mcore.integration.IntegrationFeatures; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.GsonBuilder; +import com.massivecraft.massivecore.integration.IntegrationGlue; +import com.massivecraft.massivecore.integration.Integration; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.util.Txt; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; -public abstract class MPlugin extends JavaPlugin implements Listener +public abstract class MassivePlugin extends JavaPlugin implements Listener { // Gson public Gson gson; @@ -80,7 +80,7 @@ public abstract class MPlugin extends JavaPlugin implements Listener public GsonBuilder getGsonBuilder() { - return MCore.getMCoreGsonBuilder(); + return MassiveCore.getMassiveCoreGsonBuilder(); } // -------------------------------------------- // @@ -93,11 +93,11 @@ public abstract class MPlugin extends JavaPlugin implements Listener Bukkit.getPluginManager().disablePlugin(this); } - public void integrate(IntegrationFeatures... features) + public void integrate(Integration... features) { - for (IntegrationFeatures f : features) + for (Integration f : features) { - new Integration(this, f); + new IntegrationGlue(this, f); } } diff --git a/src/com/massivecraft/mcore/MetadataSimple.java b/src/com/massivecraft/massivecore/MetadataSimple.java similarity index 93% rename from src/com/massivecraft/mcore/MetadataSimple.java rename to src/com/massivecraft/massivecore/MetadataSimple.java index bfd7ddcd..5b1df6a3 100644 --- a/src/com/massivecraft/mcore/MetadataSimple.java +++ b/src/com/massivecraft/massivecore/MetadataSimple.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.List; diff --git a/src/com/massivecraft/mcore/ModuloRepeatTask.java b/src/com/massivecraft/massivecore/ModuloRepeatTask.java similarity index 95% rename from src/com/massivecraft/mcore/ModuloRepeatTask.java rename to src/com/massivecraft/massivecore/ModuloRepeatTask.java index d8a256fa..6d84fb7d 100644 --- a/src/com/massivecraft/mcore/ModuloRepeatTask.java +++ b/src/com/massivecraft/massivecore/ModuloRepeatTask.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/com/massivecraft/mcore/Multiverse.java b/src/com/massivecraft/massivecore/Multiverse.java similarity index 87% rename from src/com/massivecraft/mcore/Multiverse.java rename to src/com/massivecraft/massivecore/Multiverse.java index 4d338192..df1f2765 100644 --- a/src/com/massivecraft/mcore/Multiverse.java +++ b/src/com/massivecraft/massivecore/Multiverse.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.HashMap; import java.util.HashSet; @@ -8,9 +8,9 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; -import com.massivecraft.mcore.cmd.arg.ARUniverse; -import com.massivecraft.mcore.store.Entity; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.cmd.arg.ARUniverse; +import com.massivecraft.massivecore.store.Entity; +import com.massivecraft.massivecore.util.MUtil; public class Multiverse extends Entity { @@ -64,7 +64,7 @@ public class Multiverse extends Entity public Set newUniverse(String universe) { - if (universe.equals(MCore.DEFAULT)) return null; + if (universe.equals(MassiveCore.DEFAULT)) return null; Set ret = this.uw.get(universe); if (ret == null) { @@ -83,7 +83,7 @@ public class Multiverse extends Entity { Set ret = new TreeSet(); ret.addAll(this.uw.keySet()); - ret.add(MCore.DEFAULT); + ret.add(MassiveCore.DEFAULT); return ret; } @@ -95,7 +95,7 @@ public class Multiverse extends Entity Set worlds = entry.getValue(); if (worlds.contains(worldName)) return universe; } - return MCore.DEFAULT; + return MassiveCore.DEFAULT; } public String getUniverse(Object worldNameExtractable) @@ -120,7 +120,7 @@ public class Multiverse extends Entity { if (this.getUniverseForWorldName(worldName).equals(universe)) return false; this.removeWorld(worldName); - if (!universe.equals(MCore.DEFAULT)) + if (!universe.equals(MassiveCore.DEFAULT)) { this.newUniverse(universe).add(worldName); } diff --git a/src/com/massivecraft/mcore/MultiverseColl.java b/src/com/massivecraft/massivecore/MultiverseColl.java similarity index 64% rename from src/com/massivecraft/mcore/MultiverseColl.java rename to src/com/massivecraft/massivecore/MultiverseColl.java index 8b8174ae..6c4bd137 100644 --- a/src/com/massivecraft/mcore/MultiverseColl.java +++ b/src/com/massivecraft/massivecore/MultiverseColl.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.MStore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.MStore; public class MultiverseColl extends Coll { @@ -13,7 +13,7 @@ public class MultiverseColl extends Coll public static MultiverseColl get() { return i; } private MultiverseColl() { - super("mcore_multiverse", Multiverse.class, MStore.getDb("default"), MCore.get()); + super("massivecore_multiverse", Multiverse.class, MStore.getDb("default"), MassiveCore.get()); } // -------------------------------------------- // @@ -26,7 +26,7 @@ public class MultiverseColl extends Coll super.init(); // Ensure the default multiverse exits - this.get(MCore.DEFAULT, true); + this.get(MassiveCore.DEFAULT, true); } } diff --git a/src/com/massivecraft/mcore/NaturalOrderComparator.java b/src/com/massivecraft/massivecore/NaturalOrderComparator.java similarity index 97% rename from src/com/massivecraft/mcore/NaturalOrderComparator.java rename to src/com/massivecraft/massivecore/NaturalOrderComparator.java index 2ed8913b..df27aae0 100644 --- a/src/com/massivecraft/mcore/NaturalOrderComparator.java +++ b/src/com/massivecraft/massivecore/NaturalOrderComparator.java @@ -23,11 +23,11 @@ */ /* -This version has been slightly modified for usage in the MCore library. +This version has been slightly modified for usage in the MassiveCore library. Check out the original at: https://github.com/paour/natorder/blob/master/NaturalOrderComparator.java */ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.*; diff --git a/src/com/massivecraft/mcore/Predictate.java b/src/com/massivecraft/massivecore/Predictate.java similarity index 60% rename from src/com/massivecraft/mcore/Predictate.java rename to src/com/massivecraft/massivecore/Predictate.java index d06469e8..c8378f60 100644 --- a/src/com/massivecraft/mcore/Predictate.java +++ b/src/com/massivecraft/massivecore/Predictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; public interface Predictate { diff --git a/src/com/massivecraft/mcore/PredictateAnd.java b/src/com/massivecraft/massivecore/PredictateAnd.java similarity index 94% rename from src/com/massivecraft/mcore/PredictateAnd.java rename to src/com/massivecraft/massivecore/PredictateAnd.java index 2fa3369c..2940109a 100644 --- a/src/com/massivecraft/mcore/PredictateAnd.java +++ b/src/com/massivecraft/massivecore/PredictateAnd.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/PredictateIsntDefaultEntity.java b/src/com/massivecraft/massivecore/PredictateIsntDefaultEntity.java similarity index 83% rename from src/com/massivecraft/mcore/PredictateIsntDefaultEntity.java rename to src/com/massivecraft/massivecore/PredictateIsntDefaultEntity.java index 536be52c..05c94ee5 100644 --- a/src/com/massivecraft/mcore/PredictateIsntDefaultEntity.java +++ b/src/com/massivecraft/massivecore/PredictateIsntDefaultEntity.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; -import com.massivecraft.mcore.store.Entity; +import com.massivecraft.massivecore.store.Entity; public class PredictateIsntDefaultEntity implements Predictate> { diff --git a/src/com/massivecraft/mcore/Prioritized.java b/src/com/massivecraft/massivecore/Prioritized.java similarity index 58% rename from src/com/massivecraft/mcore/Prioritized.java rename to src/com/massivecraft/massivecore/Prioritized.java index b86315ed..4c50837c 100644 --- a/src/com/massivecraft/mcore/Prioritized.java +++ b/src/com/massivecraft/massivecore/Prioritized.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; public interface Prioritized { diff --git a/src/com/massivecraft/mcore/PriorityComparator.java b/src/com/massivecraft/massivecore/PriorityComparator.java similarity index 91% rename from src/com/massivecraft/mcore/PriorityComparator.java rename to src/com/massivecraft/massivecore/PriorityComparator.java index c916e7a3..26651112 100644 --- a/src/com/massivecraft/mcore/PriorityComparator.java +++ b/src/com/massivecraft/massivecore/PriorityComparator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.Comparator; diff --git a/src/com/massivecraft/mcore/Progressbar.java b/src/com/massivecraft/massivecore/Progressbar.java similarity index 95% rename from src/com/massivecraft/mcore/Progressbar.java rename to src/com/massivecraft/massivecore/Progressbar.java index c38fdb55..0c822af0 100644 --- a/src/com/massivecraft/mcore/Progressbar.java +++ b/src/com/massivecraft/massivecore/Progressbar.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.Collections; import java.util.Map; import java.util.Map.Entry; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; public class Progressbar { diff --git a/src/com/massivecraft/mcore/ReversePriorityComparator.java b/src/com/massivecraft/massivecore/ReversePriorityComparator.java similarity index 92% rename from src/com/massivecraft/mcore/ReversePriorityComparator.java rename to src/com/massivecraft/massivecore/ReversePriorityComparator.java index 6059c7eb..c00aa50c 100644 --- a/src/com/massivecraft/mcore/ReversePriorityComparator.java +++ b/src/com/massivecraft/massivecore/ReversePriorityComparator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.util.Comparator; diff --git a/src/com/massivecraft/mcore/SimpleConfig.java b/src/com/massivecraft/massivecore/SimpleConfig.java similarity index 81% rename from src/com/massivecraft/mcore/SimpleConfig.java rename to src/com/massivecraft/massivecore/SimpleConfig.java index 0dc1677b..f88cbcaa 100644 --- a/src/com/massivecraft/mcore/SimpleConfig.java +++ b/src/com/massivecraft/massivecore/SimpleConfig.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.io.File; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.store.accessor.Accessor; -import com.massivecraft.mcore.util.DiscUtil; -import com.massivecraft.mcore.xlib.gson.Gson; +import com.massivecraft.massivecore.store.accessor.Accessor; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.xlib.gson.Gson; public class SimpleConfig { @@ -42,11 +42,11 @@ public class SimpleConfig private Gson getGson() { - if (this.plugin instanceof MPlugin) + if (this.plugin instanceof MassivePlugin) { - return ((MPlugin)this.plugin).gson; + return ((MassivePlugin)this.plugin).gson; } - return MCore.gson; + return MassiveCore.gson; } protected static boolean contentRequestsDefaults(String content) diff --git a/src/com/massivecraft/mcore/SoundEffect.java b/src/com/massivecraft/massivecore/SoundEffect.java similarity index 94% rename from src/com/massivecraft/mcore/SoundEffect.java rename to src/com/massivecraft/massivecore/SoundEffect.java index b395d9f8..a7e64a05 100644 --- a/src/com/massivecraft/mcore/SoundEffect.java +++ b/src/com/massivecraft/massivecore/SoundEffect.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.io.Serializable; import java.util.Collection; @@ -7,7 +7,7 @@ import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.entity.Player; -import com.massivecraft.mcore.cmd.arg.ARSound; +import com.massivecraft.massivecore.cmd.arg.ARSound; public final class SoundEffect implements Cloneable, Serializable { diff --git a/src/com/massivecraft/mcore/Triple.java b/src/com/massivecraft/massivecore/Triple.java similarity index 92% rename from src/com/massivecraft/mcore/Triple.java rename to src/com/massivecraft/massivecore/Triple.java index be0f0a97..2106fb87 100644 --- a/src/com/massivecraft/mcore/Triple.java +++ b/src/com/massivecraft/massivecore/Triple.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore; +package com.massivecraft.massivecore; import java.io.Serializable; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class Triple implements Cloneable, Serializable { diff --git a/src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java b/src/com/massivecraft/massivecore/adapter/FireworkEffectAdapter.java similarity index 88% rename from src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java rename to src/com/massivecraft/massivecore/adapter/FireworkEffectAdapter.java index a492fe3b..f35e7e41 100644 --- a/src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/FireworkEffectAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.util.ArrayList; import java.util.Collection; @@ -10,11 +10,11 @@ import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.xlib.gson.JsonArray; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; public class FireworkEffectAdapter { diff --git a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java b/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java similarity index 77% rename from src/com/massivecraft/mcore/adapter/InventoryAdapter.java rename to src/com/massivecraft/massivecore/adapter/InventoryAdapter.java index 90154a5f..15e942bb 100644 --- a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; @@ -8,16 +8,16 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.inventory.MCorePlayerInventory; -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.massivecore.MassiveCore; +import com.massivecraft.massivecore.inventory.MassiveCorePlayerInventory; +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; /** * This is my Gson adapter for Inventories. @@ -90,7 +90,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial itemStack = psrc.getHelmet(); if (itemStack != null) { - jsonItemStack = MCore.gson.toJsonTree(itemStack, ItemStack.class); + jsonItemStack = MassiveCore.gson.toJsonTree(itemStack, ItemStack.class); jsonInventory.add(HELMET, jsonItemStack); } @@ -98,7 +98,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial itemStack = psrc.getChestplate(); if (itemStack != null) { - jsonItemStack = MCore.gson.toJsonTree(itemStack, ItemStack.class); + jsonItemStack = MassiveCore.gson.toJsonTree(itemStack, ItemStack.class); jsonInventory.add(CHESTPLATE, jsonItemStack); } @@ -106,7 +106,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial itemStack = psrc.getLeggings(); if (itemStack != null) { - jsonItemStack = MCore.gson.toJsonTree(itemStack, ItemStack.class); + jsonItemStack = MassiveCore.gson.toJsonTree(itemStack, ItemStack.class); jsonInventory.add(LEGGINGS, jsonItemStack); } @@ -114,7 +114,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial itemStack = psrc.getBoots(); if (itemStack != null) { - jsonItemStack = MCore.gson.toJsonTree(itemStack, ItemStack.class); + jsonItemStack = MassiveCore.gson.toJsonTree(itemStack, ItemStack.class); jsonInventory.add(BOOTS, jsonItemStack); } } @@ -128,7 +128,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial for (int i = 0; i < itemStacks.length; i++) { itemStack = itemStacks[i]; - jsonItemStack = MCore.gson.toJsonTree(itemStack, ItemStack.class); + jsonItemStack = MassiveCore.gson.toJsonTree(itemStack, ItemStack.class); if (jsonItemStack == null) continue; jsonInventory.add(String.valueOf(i), jsonItemStack); } @@ -162,14 +162,14 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial size = 36; // This is a PlayerInventory - ret = new CraftInventoryPlayer(new MCorePlayerInventory()); + ret = new CraftInventoryPlayer(new MassiveCorePlayerInventory()); PlayerInventory pret = (PlayerInventory)ret; // helmet if (jsonInventory.has(HELMET)) { jsonItemStack = jsonInventory.get(HELMET); - itemStack = MCore.gson.fromJson(jsonItemStack, ItemStack.class); + itemStack = MassiveCore.gson.fromJson(jsonItemStack, ItemStack.class); pret.setHelmet(itemStack); } @@ -177,7 +177,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial if (jsonInventory.has(CHESTPLATE)) { jsonItemStack = jsonInventory.get(CHESTPLATE); - itemStack = MCore.gson.fromJson(jsonItemStack, ItemStack.class); + itemStack = MassiveCore.gson.fromJson(jsonItemStack, ItemStack.class); pret.setChestplate(itemStack); } @@ -185,7 +185,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial if (jsonInventory.has(LEGGINGS)) { jsonItemStack = jsonInventory.get(LEGGINGS); - itemStack = MCore.gson.fromJson(jsonItemStack, ItemStack.class); + itemStack = MassiveCore.gson.fromJson(jsonItemStack, ItemStack.class); pret.setLeggings(itemStack); } @@ -193,7 +193,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial if (jsonInventory.has(BOOTS)) { jsonItemStack = jsonInventory.get(BOOTS); - itemStack = MCore.gson.fromJson(jsonItemStack, ItemStack.class); + itemStack = MassiveCore.gson.fromJson(jsonItemStack, ItemStack.class); pret.setBoots(itemStack); } } @@ -213,7 +213,7 @@ public class InventoryAdapter implements JsonDeserializer, JsonSerial // Fetch the jsonItemStack or mark it as empty and continue String stackIdx = String.valueOf(i); jsonItemStack = jsonInventory.get(stackIdx); - itemStack = MCore.gson.fromJson(jsonItemStack, ItemStack.class); + itemStack = MassiveCore.gson.fromJson(jsonItemStack, ItemStack.class); itemStacks[i] = itemStack; } ret.setContents(itemStacks); diff --git a/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java b/src/com/massivecraft/massivecore/adapter/ItemStackAdapter.java similarity index 93% rename from src/com/massivecraft/mcore/adapter/ItemStackAdapter.java rename to src/com/massivecraft/massivecore/adapter/ItemStackAdapter.java index 75501585..6f550eb7 100644 --- a/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/ItemStackAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; import java.util.ArrayList; @@ -26,15 +26,15 @@ import org.bukkit.inventory.meta.Repairable; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.potion.PotionEffect; -import com.massivecraft.mcore.xlib.gson.JsonArray; -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.massivecore.xlib.gson.JsonArray; +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; /** * This is a GSON serializer/deserializer for the Bukkit ItemStack. Why not use diff --git a/src/com/massivecraft/mcore/adapter/JsonElementAdapter.java b/src/com/massivecraft/massivecore/adapter/JsonElementAdapter.java similarity index 62% rename from src/com/massivecraft/mcore/adapter/JsonElementAdapter.java rename to src/com/massivecraft/massivecore/adapter/JsonElementAdapter.java index ef636ee9..5d4a4303 100644 --- a/src/com/massivecraft/mcore/adapter/JsonElementAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/JsonElementAdapter.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.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.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; +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; public class JsonElementAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore/adapter/ModdedEnumTypeAdapter.java b/src/com/massivecraft/massivecore/adapter/ModdedEnumTypeAdapter.java similarity index 75% rename from src/com/massivecraft/mcore/adapter/ModdedEnumTypeAdapter.java rename to src/com/massivecraft/massivecore/adapter/ModdedEnumTypeAdapter.java index a619b4d8..0d0294b5 100644 --- a/src/com/massivecraft/mcore/adapter/ModdedEnumTypeAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/ModdedEnumTypeAdapter.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.TypeAdapter; -import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory; -import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; -import com.massivecraft.mcore.xlib.gson.stream.JsonReader; -import com.massivecraft.mcore.xlib.gson.stream.JsonToken; -import com.massivecraft.mcore.xlib.gson.stream.JsonWriter; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.TypeAdapter; +import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; +import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; import java.io.IOException; import java.util.HashMap; @@ -15,10 +15,10 @@ import java.util.Map; /** * This type adapter and factory handles modified Java Enums. - * It's based upon: https://github.com/MassiveCraft/mcore/blob/91f9ec7c0c7d9a11a35db905be520f5cf6b6743e/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java#L670 + * It's based upon: https://github.com/MassiveCraft/MassiveCore/blob/91f9ec7c0c7d9a11a35db905be520f5cf6b6743e/src/com/massivecraft/MassiveCore/xlib/gson/internal/bind/TypeAdapters.java#L670 * The only change is the try-catch around the annotation code. * - * https://github.com/MassiveCraft/mcore/pull/62 + * https://github.com/MassiveCraft/MassiveCore/pull/62 * * # Problem * The problem that was occurring is Forge modifies Vanilla Minecraft Enums @@ -47,12 +47,12 @@ public final class ModdedEnumTypeAdapter> extends TypeAdapter< public ModdedEnumTypeAdapter(Class classOfT) { for (T constant : classOfT.getEnumConstants()) { String name = constant.name(); - try { // MCore - Ignore when the field can't be found since modified enums won't have it. + try { // MassiveCore - Ignore when the field can't be found since modified enums won't have it. SerializedName annotation = classOfT.getField(name).getAnnotation(SerializedName.class); if (annotation != null) { name = annotation.value(); } - } catch (NoSuchFieldException ex) {} // MCore + } catch (NoSuchFieldException ex) {} // MassiveCore nameToConstant.put(name, constant); constantToName.put(constant, name); } diff --git a/src/com/massivecraft/mcore/adapter/ObjectIdAdapter.java b/src/com/massivecraft/massivecore/adapter/ObjectIdAdapter.java similarity index 70% rename from src/com/massivecraft/mcore/adapter/ObjectIdAdapter.java rename to src/com/massivecraft/massivecore/adapter/ObjectIdAdapter.java index d9571c2c..5b638de0 100644 --- a/src/com/massivecraft/mcore/adapter/ObjectIdAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/ObjectIdAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; -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.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; +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.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; public class ObjectIdAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore/adapter/PlayerInventoryAdapter.java b/src/com/massivecraft/massivecore/adapter/PlayerInventoryAdapter.java similarity index 68% rename from src/com/massivecraft/mcore/adapter/PlayerInventoryAdapter.java rename to src/com/massivecraft/massivecore/adapter/PlayerInventoryAdapter.java index 7a152692..5218262f 100644 --- a/src/com/massivecraft/mcore/adapter/PlayerInventoryAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/PlayerInventoryAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; import org.bukkit.inventory.PlayerInventory; -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.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; public class PlayerInventoryAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java b/src/com/massivecraft/massivecore/adapter/PolymorphicAdapter.java similarity index 67% rename from src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java rename to src/com/massivecraft/massivecore/adapter/PolymorphicAdapter.java index 1a002f19..bb4ce6c4 100644 --- a/src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/PolymorphicAdapter.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.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.JsonNull; -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.massivecore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +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; public class PolymorphicAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java b/src/com/massivecraft/massivecore/adapter/PotionEffectAdapter.java similarity index 90% rename from src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java rename to src/com/massivecraft/massivecore/adapter/PotionEffectAdapter.java index 71bac7f1..2133d472 100644 --- a/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/PotionEffectAdapter.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; @SuppressWarnings("deprecation") public class PotionEffectAdapter diff --git a/src/com/massivecraft/mcore/adapter/UUIDAdapter.java b/src/com/massivecraft/massivecore/adapter/UUIDAdapter.java similarity index 71% rename from src/com/massivecraft/mcore/adapter/UUIDAdapter.java rename to src/com/massivecraft/massivecore/adapter/UUIDAdapter.java index 21b4e715..d8643f40 100644 --- a/src/com/massivecraft/mcore/adapter/UUIDAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/UUIDAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore.adapter; +package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; import java.util.UUID; -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.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; +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.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; public class UUIDAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore/cmd/HelpCommand.java b/src/com/massivecraft/massivecore/cmd/HelpCommand.java similarity index 70% rename from src/com/massivecraft/mcore/cmd/HelpCommand.java rename to src/com/massivecraft/massivecore/cmd/HelpCommand.java index b1e2fcf2..ad7cb5e1 100644 --- a/src/com/massivecraft/mcore/cmd/HelpCommand.java +++ b/src/com/massivecraft/massivecore/cmd/HelpCommand.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.cmd; +package com.massivecraft.massivecore.cmd; import java.util.ArrayList; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARInteger; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.util.Txt; -public class HelpCommand extends MCommand +public class HelpCommand extends MassiveCommand { // -------------------------------------------- // // INSTANCE & CONSTRUCT @@ -29,7 +29,7 @@ public class HelpCommand extends MCommand public void perform() { if (this.getCommandChain().size() == 0) return; - MCommand parentCommand = this.getCommandChain().get(this.getCommandChain().size()-1); + MassiveCommand parentCommand = this.getCommandChain().get(this.getCommandChain().size()-1); ArrayList lines = new ArrayList(); @@ -38,7 +38,7 @@ public class HelpCommand extends MCommand lines.add(Txt.parse("# "+helpline)); } - for (MCommand subCommand : parentCommand.getSubCommands()) + for (MassiveCommand subCommand : parentCommand.getSubCommands()) { if (subCommand.visibleTo(sender)) { diff --git a/src/com/massivecraft/mcore/cmd/MCommand.java b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java similarity index 84% rename from src/com/massivecraft/mcore/cmd/MCommand.java rename to src/com/massivecraft/massivecore/cmd/MassiveCommand.java index a2d4919e..f3f2fbe2 100644 --- a/src/com/massivecraft/mcore/cmd/MCommand.java +++ b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd; +package com.massivecraft.massivecore.cmd; import java.util.*; import java.util.Map.Entry; @@ -6,21 +6,21 @@ import java.util.Map.Entry; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.Lang; -import com.massivecraft.mcore.cmd.arg.ArgReader; -import com.massivecraft.mcore.cmd.arg.ArgResult; -import com.massivecraft.mcore.cmd.req.Req; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.PermUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Lang; +import com.massivecraft.massivecore.cmd.arg.ArgReader; +import com.massivecraft.massivecore.cmd.arg.ArgResult; +import com.massivecraft.massivecore.cmd.req.Req; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.Txt; -public class MCommand +public class MassiveCommand { // -------------------------------------------- // // REGISTER // -------------------------------------------- // - // MCore commands are a bit special when it comes to registration. + // MassiveCore commands are a bit special when it comes to registration. // // I want my users to be able to edit the command aliases and I want // them to be able to do so during server runtime without having to use the /reload command. @@ -29,12 +29,12 @@ public class MCommand // As such these config files are polled for changes and loaded into the server automatically. // If someone changed the command aliases we must update all Bukkit command registrations. // - // In order to achieve this we run a task once a second (see com.massivecraft.mcore.EngineCommandRegistration). + // In order to achieve this we run a task once a second (see com.massivecraft.massivecore.MassiveCoreEngineCommandRegistration). // This task unregisters /all/ registered MCommands and then register them all again. // When registering again we use the fresh and current aliases. - private static transient Set registeredCommands = new LinkedHashSet(); - public static Set getRegisteredCommands() { return registeredCommands; } + private static transient Set registeredCommands = new LinkedHashSet(); + public static Set getRegisteredCommands() { return registeredCommands; } public void register() { getRegisteredCommands().add(this); } public void unregister() { getRegisteredCommands().remove(this); } @@ -44,11 +44,11 @@ public class MCommand // FIELD: subCommands // The sub-commands to this command - protected List subCommands; - public List getSubCommands() { return this.subCommands; } - public void setSubCommands(List subCommands) { this.subCommands = subCommands; } + protected List subCommands; + public List getSubCommands() { return this.subCommands; } + public void setSubCommands(List subCommands) { this.subCommands = subCommands; } - public void addSubCommand(MCommand subCommand) + public void addSubCommand(MassiveCommand subCommand) { subCommand.commandChain.addAll(this.commandChain); subCommand.commandChain.add(this); @@ -170,9 +170,9 @@ public class MCommand // FIELD: commandChain // The command chain used to execute this command - protected List commandChain = new ArrayList(); - public List getCommandChain() { return this.commandChain; } - public void setCommandChain(List commandChain) { this.commandChain = commandChain; } + protected List commandChain = new ArrayList(); + public List getCommandChain() { return this.commandChain; } + public void setCommandChain(List commandChain) { this.commandChain = commandChain; } // FIELDS: sender, me, senderIsConsole public CommandSender sender; @@ -183,9 +183,9 @@ public class MCommand // CONSTRUCTORS AND EXECUTOR // -------------------------------------------- // - public MCommand() + public MassiveCommand() { - this.subCommands = new ArrayList(); + this.subCommands = new ArrayList(); this.aliases = new ArrayList(); @@ -205,7 +205,7 @@ public class MCommand } // The commandChain is a list of the parent command chain used to get to this command. - public void execute(CommandSender sender, List args, List commandChain) + public void execute(CommandSender sender, List args, List commandChain) { // Set the execution-time specific variables this.sender = sender; @@ -225,7 +225,7 @@ public class MCommand // Is there a matching sub command? if (args.size() > 0) { - for (MCommand subCommand: this.getSubCommands()) + for (MassiveCommand subCommand: this.getSubCommands()) { for (String alias : subCommand.getAliases()) { @@ -249,7 +249,7 @@ public class MCommand public void execute(CommandSender sender, List args) { - execute(sender, args, new ArrayList()); + execute(sender, args, new ArrayList()); } // This is where the command action is performed. @@ -340,11 +340,11 @@ public class MCommand // HELP AND USAGE INFORMATION // -------------------------------------------- // - public String getUseageTemplate(List commandChain, boolean addDesc, boolean onlyFirstAlias, CommandSender sender) + public String getUseageTemplate(List commandChain, boolean addDesc, boolean onlyFirstAlias, CommandSender sender) { StringBuilder ret = new StringBuilder(); - List commands = new ArrayList(commandChain); + List commands = new ArrayList(commandChain); commands.add(this); String commandGoodColor = Txt.parse(""); @@ -354,10 +354,10 @@ public class MCommand ret.append('/'); boolean first = true; - Iterator iter = commands.iterator(); + Iterator iter = commands.iterator(); while(iter.hasNext()) { - MCommand mc = iter.next(); + MassiveCommand mc = iter.next(); if (sender != null && !mc.requirementsAreMet(sender, false)) { ret.append(commandBadColor); @@ -422,12 +422,12 @@ public class MCommand return ret.toString(); } - public String getUseageTemplate(List commandChain, boolean addDesc, boolean onlyFirstAlias) + public String getUseageTemplate(List commandChain, boolean addDesc, boolean onlyFirstAlias) { return getUseageTemplate(commandChain, addDesc, onlyFirstAlias, null); } - public String getUseageTemplate(List commandChain, boolean addDesc) + public String getUseageTemplate(List commandChain, boolean addDesc) { return getUseageTemplate(commandChain, addDesc, false); } diff --git a/src/com/massivecraft/mcore/cmd/MCoreBukkitCommand.java b/src/com/massivecraft/massivecore/cmd/MassiveCoreBukkitCommand.java similarity index 80% rename from src/com/massivecraft/mcore/cmd/MCoreBukkitCommand.java rename to src/com/massivecraft/massivecore/cmd/MassiveCoreBukkitCommand.java index 452db4e5..dd40f870 100644 --- a/src/com/massivecraft/mcore/cmd/MCoreBukkitCommand.java +++ b/src/com/massivecraft/massivecore/cmd/MassiveCoreBukkitCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd; +package com.massivecraft.massivecore.cmd; import java.util.ArrayList; import java.util.Arrays; @@ -9,24 +9,24 @@ import java.util.TreeSet; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; -public class MCoreBukkitCommand extends Command +public class MassiveCoreBukkitCommand extends Command { // -------------------------------------------- // // FIELDS // -------------------------------------------- // - private final MCommand mcommand; - public MCommand getMcommand() { return this.mcommand; } + private final MassiveCommand mcommand; + public MassiveCommand getMcommand() { return this.mcommand; } // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public MCoreBukkitCommand(String name, MCommand mcommand) + public MassiveCoreBukkitCommand(String name, MassiveCommand mcommand) { super( name, diff --git a/src/com/massivecraft/mcore/cmd/VersionCommand.java b/src/com/massivecraft/massivecore/cmd/VersionCommand.java similarity index 86% rename from src/com/massivecraft/mcore/cmd/VersionCommand.java rename to src/com/massivecraft/massivecore/cmd/VersionCommand.java index c98df523..412a7e24 100644 --- a/src/com/massivecraft/mcore/cmd/VersionCommand.java +++ b/src/com/massivecraft/massivecore/cmd/VersionCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd; +package com.massivecraft.massivecore.cmd; import java.util.Collection; import java.util.List; @@ -6,11 +6,11 @@ import java.util.List; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; -public class VersionCommand extends MCommand +public class VersionCommand extends MassiveCommand { // -------------------------------------------- // // CONSTANTS diff --git a/src/com/massivecraft/mcore/cmd/VisibilityMode.java b/src/com/massivecraft/massivecore/cmd/VisibilityMode.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/VisibilityMode.java rename to src/com/massivecraft/massivecore/cmd/VisibilityMode.java index 26d40d38..07d48500 100644 --- a/src/com/massivecraft/mcore/cmd/VisibilityMode.java +++ b/src/com/massivecraft/massivecore/cmd/VisibilityMode.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd; +package com.massivecraft.massivecore.cmd; public enum VisibilityMode { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java b/src/com/massivecraft/massivecore/cmd/arg/ARAbstractPrimitive.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java rename to src/com/massivecraft/massivecore/cmd/arg/ARAbstractPrimitive.java index 3df02d34..de8bb86f 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARAbstractPrimitive.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java b/src/com/massivecraft/massivecore/cmd/arg/ARAbstractSelect.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java rename to src/com/massivecraft/massivecore/cmd/arg/ARAbstractSelect.java index 94edb7b1..863c0263 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARAbstractSelect.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public abstract class ARAbstractSelect extends ArgReaderAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java b/src/com/massivecraft/massivecore/cmd/arg/ARAspect.java similarity index 73% rename from src/com/massivecraft/mcore/cmd/arg/ARAspect.java rename to src/com/massivecraft/massivecore/cmd/arg/ARAspect.java index f38b8688..2b17dbb4 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARAspect.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.AspectColl; -import com.massivecraft.mcore.MCorePerm; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.AspectColl; +import com.massivecraft.massivecore.MassiveCorePerm; public class ARAspect extends ARAbstractSelect { @@ -36,7 +36,7 @@ public class ARAspect extends ARAbstractSelect @Override public boolean canList(CommandSender sender) { - return MCorePerm.USYS_ASPECT_LIST.has(sender, false); + return MassiveCorePerm.USYS_ASPECT_LIST.has(sender, false); } @Override diff --git a/src/com/massivecraft/mcore/cmd/arg/ARBiome.java b/src/com/massivecraft/massivecore/cmd/arg/ARBiome.java similarity index 92% rename from src/com/massivecraft/mcore/cmd/arg/ARBiome.java rename to src/com/massivecraft/massivecore/cmd/arg/ARBiome.java index 021fea8a..d7bc73ec 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARBiome.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARBiome.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARBoolean.java b/src/com/massivecraft/massivecore/cmd/arg/ARBoolean.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ARBoolean.java rename to src/com/massivecraft/massivecore/cmd/arg/ARBoolean.java index 16752e8e..f791f0e5 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARBoolean.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARBoolean.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARBoolean extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARByte.java b/src/com/massivecraft/massivecore/cmd/arg/ARByte.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARByte.java rename to src/com/massivecraft/massivecore/cmd/arg/ARByte.java index d81a35e0..9d0d3fdb 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARByte.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARByte.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARByte extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARChatColor.java b/src/com/massivecraft/massivecore/cmd/arg/ARChatColor.java similarity index 92% rename from src/com/massivecraft/mcore/cmd/arg/ARChatColor.java rename to src/com/massivecraft/massivecore/cmd/arg/ARChatColor.java index 1c7ef194..539aaabe 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARChatColor.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARChatColor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARColl.java b/src/com/massivecraft/massivecore/cmd/arg/ARColl.java similarity index 84% rename from src/com/massivecraft/mcore/cmd/arg/ARColl.java rename to src/com/massivecraft/massivecore/cmd/arg/ARColl.java index 095efbfc..9baad924 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARColl.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARColl.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.store.Coll; +import com.massivecraft.massivecore.store.Coll; public class ARColl extends ARAbstractSelect> { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARDate.java b/src/com/massivecraft/massivecore/cmd/arg/ARDate.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ARDate.java rename to src/com/massivecraft/massivecore/cmd/arg/ARDate.java index eb9dc1da..02dc3837 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARDate.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARDate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java b/src/com/massivecraft/massivecore/cmd/arg/ARDifficulty.java similarity index 87% rename from src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java rename to src/com/massivecraft/massivecore/cmd/arg/ARDifficulty.java index ec65e425..8b258c06 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARDifficulty.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.Difficulty; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class ARDifficulty extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARDouble.java b/src/com/massivecraft/massivecore/cmd/arg/ARDouble.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARDouble.java rename to src/com/massivecraft/massivecore/cmd/arg/ARDouble.java index 7f9f523a..92c9832f 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARDouble.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARDouble.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARDouble extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/AREntityType.java b/src/com/massivecraft/massivecore/cmd/arg/AREntityType.java similarity index 93% rename from src/com/massivecraft/mcore/cmd/arg/AREntityType.java rename to src/com/massivecraft/massivecore/cmd/arg/AREntityType.java index b6a2bfc3..debf0f55 100644 --- a/src/com/massivecraft/mcore/cmd/arg/AREntityType.java +++ b/src/com/massivecraft/massivecore/cmd/arg/AREntityType.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/cmd/arg/AREnum.java b/src/com/massivecraft/massivecore/cmd/arg/AREnum.java similarity index 91% rename from src/com/massivecraft/mcore/cmd/arg/AREnum.java rename to src/com/massivecraft/massivecore/cmd/arg/AREnum.java index 8cdeb0e1..c0a96717 100644 --- a/src/com/massivecraft/mcore/cmd/arg/AREnum.java +++ b/src/com/massivecraft/massivecore/cmd/arg/AREnum.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.lang.reflect.Method; import java.util.ArrayList; @@ -7,7 +7,7 @@ import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class AREnum extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/AREnvironment.java b/src/com/massivecraft/massivecore/cmd/arg/AREnvironment.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/AREnvironment.java rename to src/com/massivecraft/massivecore/cmd/arg/AREnvironment.java index b5e527a6..4fc9cd75 100644 --- a/src/com/massivecraft/mcore/cmd/arg/AREnvironment.java +++ b/src/com/massivecraft/massivecore/cmd/arg/AREnvironment.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class AREnvironment extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARFloat.java b/src/com/massivecraft/massivecore/cmd/arg/ARFloat.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARFloat.java rename to src/com/massivecraft/massivecore/cmd/arg/ARFloat.java index 86ed0aaf..1bc2d5d8 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARFloat.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARFloat.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARFloat extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARGameMode.java b/src/com/massivecraft/massivecore/cmd/arg/ARGameMode.java similarity index 87% rename from src/com/massivecraft/mcore/cmd/arg/ARGameMode.java rename to src/com/massivecraft/massivecore/cmd/arg/ARGameMode.java index 35f7d7e7..0355d4ae 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARGameMode.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARGameMode.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class ARGameMode extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARInteger.java b/src/com/massivecraft/massivecore/cmd/arg/ARInteger.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARInteger.java rename to src/com/massivecraft/massivecore/cmd/arg/ARInteger.java index 06b061d2..52424e44 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARInteger.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARInteger.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARInteger extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARLong.java b/src/com/massivecraft/massivecore/cmd/arg/ARLong.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARLong.java rename to src/com/massivecraft/massivecore/cmd/arg/ARLong.java index 9610587f..f018715a 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARLong.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARLong.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARLong extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARMaterial.java b/src/com/massivecraft/massivecore/cmd/arg/ARMaterial.java similarity index 91% rename from src/com/massivecraft/mcore/cmd/arg/ARMaterial.java rename to src/com/massivecraft/massivecore/cmd/arg/ARMaterial.java index c2f66743..fff2f4fe 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARMaterial.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARMaterial.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java b/src/com/massivecraft/massivecore/cmd/arg/ARMillisDiff.java similarity index 80% rename from src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java rename to src/com/massivecraft/massivecore/cmd/arg/ARMillisDiff.java index ecabec7c..385a5380 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARMillisDiff.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.TimeDiffUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.TimeDiffUtil; +import com.massivecraft.massivecore.util.Txt; public class ARMillisDiff extends ArgReaderAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java b/src/com/massivecraft/massivecore/cmd/arg/ARMultiverse.java similarity index 73% rename from src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java rename to src/com/massivecraft/massivecore/cmd/arg/ARMultiverse.java index 1535b833..c4803c8f 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARMultiverse.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.MCorePerm; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.MultiverseColl; public class ARMultiverse extends ARAbstractSelect { @@ -36,7 +36,7 @@ public class ARMultiverse extends ARAbstractSelect @Override public boolean canList(CommandSender sender) { - return MCorePerm.USYS_MULTIVERSE_LIST.has(sender, false); + return MassiveCorePerm.USYS_MULTIVERSE_LIST.has(sender, false); } @Override diff --git a/src/com/massivecraft/mcore/cmd/arg/ARPermission.java b/src/com/massivecraft/massivecore/cmd/arg/ARPermission.java similarity index 92% rename from src/com/massivecraft/mcore/cmd/arg/ARPermission.java rename to src/com/massivecraft/massivecore/cmd/arg/ARPermission.java index 83c85392..2dfc5178 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARPermission.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARPermission.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARPlayer.java b/src/com/massivecraft/massivecore/cmd/arg/ARPlayer.java similarity index 81% rename from src/com/massivecraft/mcore/cmd/arg/ARPlayer.java rename to src/com/massivecraft/massivecore/cmd/arg/ARPlayer.java index 6d079710..528eaf34 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARPlayer.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.entity.Player; -import com.massivecraft.mcore.store.SenderIdSource; -import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.store.SenderIdSource; +import com.massivecraft.massivecore.store.SenderIdSourceMixinAllSenderIds; +import com.massivecraft.massivecore.util.IdUtil; public class ARPlayer extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSender.java b/src/com/massivecraft/massivecore/cmd/arg/ARSender.java similarity index 81% rename from src/com/massivecraft/mcore/cmd/arg/ARSender.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSender.java index d91fbb87..70599945 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSender.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSender.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.store.SenderIdSource; -import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.store.SenderIdSource; +import com.massivecraft.massivecore.store.SenderIdSourceMixinAllSenderIds; +import com.massivecraft.massivecore.util.IdUtil; public class ARSender extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java b/src/com/massivecraft/massivecore/cmd/arg/ARSenderEntity.java similarity index 89% rename from src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSenderEntity.java index 4ac88700..905d5ba6 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSenderEntity.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; -import com.massivecraft.mcore.store.SenderColl; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.store.SenderIdSource; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.store.SenderColl; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.store.SenderIdSource; +import com.massivecraft.massivecore.util.IdUtil; public class ARSenderEntity> extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSenderId.java b/src/com/massivecraft/massivecore/cmd/arg/ARSenderId.java similarity index 82% rename from src/com/massivecraft/mcore/cmd/arg/ARSenderId.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSenderId.java index 80dc0e6c..6becfae3 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSenderId.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSenderId.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; -import com.massivecraft.mcore.store.SenderIdSource; -import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.store.SenderIdSource; +import com.massivecraft.massivecore.store.SenderIdSourceMixinAllSenderIds; +import com.massivecraft.massivecore.util.IdUtil; public class ARSenderId extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java b/src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstract.java similarity index 89% rename from src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstract.java index b204940e..3e16cfc7 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstract.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; public abstract class ARSenderIdAbstract extends ArgReaderAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java b/src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstractPredsource.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstractPredsource.java index 0a4a674b..7fc14a1d 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstractPredsource.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import java.util.TreeSet; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.store.SenderIdSource; +import com.massivecraft.massivecore.store.SenderIdSource; public abstract class ARSenderIdAbstractPredsource extends ARSenderIdAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSound.java b/src/com/massivecraft/massivecore/cmd/arg/ARSound.java similarity index 93% rename from src/com/massivecraft/mcore/cmd/arg/ARSound.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSound.java index ca1fffbb..2e238f30 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSound.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSound.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.Sound; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSoundEffect.java b/src/com/massivecraft/massivecore/cmd/arg/ARSoundEffect.java similarity index 81% rename from src/com/massivecraft/mcore/cmd/arg/ARSoundEffect.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSoundEffect.java index 54420b22..6ade1ce1 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSoundEffect.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSoundEffect.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.SoundEffect; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.SoundEffect; +import com.massivecraft.massivecore.util.Txt; public class ARSoundEffect extends ArgReaderAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARSoundEffects.java b/src/com/massivecraft/massivecore/cmd/arg/ARSoundEffects.java similarity index 85% rename from src/com/massivecraft/mcore/cmd/arg/ARSoundEffects.java rename to src/com/massivecraft/massivecore/cmd/arg/ARSoundEffects.java index 893b5cf1..709c3b60 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARSoundEffects.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARSoundEffects.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Arrays; @@ -6,8 +6,8 @@ import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.SoundEffect; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.SoundEffect; +import com.massivecraft.massivecore.util.Txt; public class ARSoundEffects extends ArgReaderAbstract> { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARString.java b/src/com/massivecraft/massivecore/cmd/arg/ARString.java similarity index 88% rename from src/com/massivecraft/mcore/cmd/arg/ARString.java rename to src/com/massivecraft/massivecore/cmd/arg/ARString.java index 493cf174..d69a8923 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARString.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARString.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; public class ARString extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java b/src/com/massivecraft/massivecore/cmd/arg/ARUniverse.java similarity index 86% rename from src/com/massivecraft/mcore/cmd/arg/ARUniverse.java rename to src/com/massivecraft/massivecore/cmd/arg/ARUniverse.java index 87906e89..cc8376d6 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARUniverse.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.util.Txt; public class ARUniverse extends ArgReaderAbstract { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARWorld.java b/src/com/massivecraft/massivecore/cmd/arg/ARWorld.java similarity index 91% rename from src/com/massivecraft/mcore/cmd/arg/ARWorld.java rename to src/com/massivecraft/massivecore/cmd/arg/ARWorld.java index 77052d0d..0b8c8fc9 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARWorld.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARWorld.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java b/src/com/massivecraft/massivecore/cmd/arg/ARWorldId.java similarity index 89% rename from src/com/massivecraft/mcore/cmd/arg/ARWorldId.java rename to src/com/massivecraft/massivecore/cmd/arg/ARWorldId.java index 2cfaf715..f8a6d598 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARWorldId.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.massivecore.mixin.Mixin; public class ARWorldId extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/ARWorldType.java b/src/com/massivecraft/massivecore/cmd/arg/ARWorldType.java similarity index 89% rename from src/com/massivecraft/mcore/cmd/arg/ARWorldType.java rename to src/com/massivecraft/massivecore/cmd/arg/ARWorldType.java index ace9b239..3b7b6c3b 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARWorldType.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ARWorldType.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.Collection; import org.bukkit.WorldType; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class ARWorldType extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictate.java similarity index 73% rename from src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgPredictate.java index 159b6446..d8633413 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateAnd.java similarity index 91% rename from src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgPredictateAnd.java index 3c100f40..15612740 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateAnd.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringEqualsLC.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringEqualsLC.java index 72524bdd..0d8f8725 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringEqualsLC.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java similarity index 84% rename from src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java index 81a81832..c5e2b337 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.massivecore.mixin.Mixin; public class ArgPredictateStringIsOnlineSenderId implements ArgPredictate { diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringStartsLC.java similarity index 90% rename from src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringStartsLC.java index e9a12ce0..4bb28cc4 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgPredictateStringStartsLC.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgReader.java b/src/com/massivecraft/massivecore/cmd/arg/ArgReader.java similarity index 81% rename from src/com/massivecraft/mcore/cmd/arg/ArgReader.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgReader.java index 56e9d251..0751535b 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgReader.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgReader.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgReaderAbstract.java b/src/com/massivecraft/massivecore/cmd/arg/ArgReaderAbstract.java similarity index 86% rename from src/com/massivecraft/mcore/cmd/arg/ArgReaderAbstract.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgReaderAbstract.java index 451084e9..8e35f228 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgReaderAbstract.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgReaderAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore/cmd/arg/ArgResult.java b/src/com/massivecraft/massivecore/cmd/arg/ArgResult.java similarity index 92% rename from src/com/massivecraft/mcore/cmd/arg/ArgResult.java rename to src/com/massivecraft/massivecore/cmd/arg/ArgResult.java index 95e68171..69dfc152 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ArgResult.java +++ b/src/com/massivecraft/massivecore/cmd/arg/ArgResult.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.arg; +package com.massivecraft.massivecore.cmd.arg; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCore.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCore.java new file mode 100644 index 00000000..3eb76b07 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCore.java @@ -0,0 +1,42 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.VersionCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCore extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreUsys cmdMassiveCoreUsys = new CmdMassiveCoreUsys(); + public CmdMassiveCoreStore cmdMassiveCoreMStore = new CmdMassiveCoreStore(); + public CmdMassiveCoreId cmdMassiveCoreId = new CmdMassiveCoreId(); + public CmdMassiveCoreTest cmdMassiveCoreTest = new CmdMassiveCoreTest(); + public CmdMassiveCoreHearsound cmdMassiveCoreHearsound = new CmdMassiveCoreHearsound(); + public CmdMassiveCoreBuffer cmdMassiveCoreBuffer = new CmdMassiveCoreBuffer(); + public VersionCommand cmdMassiveCoreVersion = new VersionCommand(MassiveCore.get(), MassiveCorePerm.VERSION.node, "v", "version"); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCore() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreUsys); + this.addSubCommand(this.cmdMassiveCoreMStore); + this.addSubCommand(this.cmdMassiveCoreId); + this.addSubCommand(this.cmdMassiveCoreTest); + this.addSubCommand(this.cmdMassiveCoreHearsound); + this.addSubCommand(this.cmdMassiveCoreBuffer); + this.addSubCommand(this.cmdMassiveCoreVersion); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BASECOMMAND.node)); + } + +} diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBuffer.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBuffer.java new file mode 100644 index 00000000..03626240 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBuffer.java @@ -0,0 +1,39 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreBuffer extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreBufferPrint cmdMassiveCoreBufferPrint = new CmdMassiveCoreBufferPrint(); + public CmdMassiveCoreBufferClear cmdMassiveCoreBufferClear = new CmdMassiveCoreBufferClear(); + public CmdMassiveCoreBufferSet cmdMassiveCoreBufferSet = new CmdMassiveCoreBufferSet(); + public CmdMassiveCoreBufferAdd cmdMassiveCoreBufferAdd = new CmdMassiveCoreBufferAdd(); + public CmdMassiveCoreBufferWhitespace cmdMassiveCoreBufferWhitespace = new CmdMassiveCoreBufferWhitespace(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreBuffer() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreBufferPrint); + this.addSubCommand(this.cmdMassiveCoreBufferClear); + this.addSubCommand(this.cmdMassiveCoreBufferSet); + this.addSubCommand(this.cmdMassiveCoreBufferAdd); + this.addSubCommand(this.cmdMassiveCoreBufferWhitespace); + + // Aliases + this.addAliases("buffer"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER.node)); + } + +} diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferAdd.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferAdd.java new file mode 100644 index 00000000..1e75d06f --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferAdd.java @@ -0,0 +1,44 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCoreEngineVariable; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreBufferAdd extends MassiveCommand +{ + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreBufferAdd() + { + // Aliases + this.addAliases("a", "add"); + + // Args + this.addRequiredArg("string"); + this.setErrorOnToManyArgs(false); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_ADD.node)); + } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void perform() + { + String string = this.argConcatFrom(0); + if (string == null) return; + + String buffer = MassiveCoreEngineVariable.getBuffer(sender); + buffer += string; + MassiveCoreEngineVariable.setBuffer(sender, buffer); + + msg("Buffer Add"); + } + +} diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferClear.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferClear.java new file mode 100644 index 00000000..ab88014c --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferClear.java @@ -0,0 +1,35 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCoreEngineVariable; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreBufferClear extends MassiveCommand +{ + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreBufferClear() + { + // Aliases + this.addAliases("c", "clear"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_CLEAR.node)); + } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void perform() + { + MassiveCoreEngineVariable.setBuffer(sender, ""); + + msg("Buffer Clear"); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java similarity index 51% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java index 2597eae6..20100994 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java @@ -1,23 +1,23 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MCoreEngineVariable; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCoreEngineVariable; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreBufferPrint extends MCommand +public class CmdMassiveCoreBufferPrint extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreBufferPrint() + public CmdMassiveCoreBufferPrint() { // Aliases this.addAliases("p", "print"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER_PRINT.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_PRINT.node)); } // -------------------------------------------- // @@ -27,7 +27,7 @@ public class CmdMCoreBufferPrint extends MCommand @Override public void perform() { - String buffer = MCoreEngineVariable.getBuffer(sender); + String buffer = MassiveCoreEngineVariable.getBuffer(sender); if (buffer == null || buffer.length() == 0) { msg("Nothing to print. Your buffer is empty."); diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferSet.java similarity index 52% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferSet.java index 6ced4cde..4059d9c6 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferSet.java @@ -1,17 +1,17 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MCoreEngineVariable; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCoreEngineVariable; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreBufferSet extends MCommand +public class CmdMassiveCoreBufferSet extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreBufferSet() + public CmdMassiveCoreBufferSet() { // Aliases this.addAliases("s", "set"); @@ -21,7 +21,7 @@ public class CmdMCoreBufferSet extends MCommand this.setErrorOnToManyArgs(false); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER_SET.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_SET.node)); } // -------------------------------------------- // @@ -34,7 +34,7 @@ public class CmdMCoreBufferSet extends MCommand String string = this.argConcatFrom(0); if (string == null) return; - MCoreEngineVariable.setBuffer(sender, string); + MassiveCoreEngineVariable.setBuffer(sender, string); msg("Buffer was Set"); } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java new file mode 100644 index 00000000..68aefc5e --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java @@ -0,0 +1,47 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCoreEngineVariable; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; + +public class CmdMassiveCoreBufferWhitespace extends MassiveCommand +{ + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreBufferWhitespace() + { + // Aliases + this.addAliases("w", "whitespace"); + + // Args + this.addOptionalArg("times", "1"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_WHITESPACE.node)); + } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void perform() + { + Integer times = this.arg(0, ARInteger.get(), 1); + if (times == null) return; + + String string = Txt.repeat(" ", times); + + String buffer = MassiveCoreEngineVariable.getBuffer(sender); + buffer += string; + MassiveCoreEngineVariable.setBuffer(sender, buffer); + + msg("Buffer Whitespace"); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreHearsound.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreHearsound.java similarity index 54% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreHearsound.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreHearsound.java index 200a06b4..d1ec908b 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreHearsound.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreHearsound.java @@ -1,21 +1,21 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.List; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.SoundEffect; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARSoundEffects; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.cmd.req.ReqIsPlayer; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.SoundEffect; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARSoundEffects; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; -public class CmdMCoreHearsound extends MCommand +public class CmdMassiveCoreHearsound extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreHearsound() + public CmdMassiveCoreHearsound() { // Aliases this.addAliases("hearsound", "hearsounds"); @@ -25,7 +25,7 @@ public class CmdMCoreHearsound extends MCommand this.setErrorOnToManyArgs(false); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.HEARSOUND.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.HEARSOUND.node)); this.addRequirements(ReqIsPlayer.get()); } diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreId.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreId.java similarity index 55% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreId.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreId.java index 66037ec8..f659f83e 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreId.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreId.java @@ -1,23 +1,23 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.ConfServer; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.ConfServer; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreId extends MCommand +public class CmdMassiveCoreId extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreId() + public CmdMassiveCoreId() { // Aliases this.addAliases("id"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.ID.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.ID.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStore.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStore.java new file mode 100644 index 00000000..fc4af537 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStore.java @@ -0,0 +1,35 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreStore extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreStoreStats cmdMassiveCoreStoreStats = new CmdMassiveCoreStoreStats(); + public CmdMassiveCoreStoreListcolls cmdMassiveCoreStoreListcolls = new CmdMassiveCoreStoreListcolls(); + public CmdMassiveCoreStoreCopydb cmdMassiveCoreStoreCopydb = new CmdMassiveCoreStoreCopydb(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreStore() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreStoreStats); + this.addSubCommand(this.cmdMassiveCoreStoreListcolls); + this.addSubCommand(this.cmdMassiveCoreStoreCopydb); + + // Args + this.addAliases("store"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.STORE.node)); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreCopydb.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreCopydb.java similarity index 74% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreCopydb.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreCopydb.java index 3810bdb3..4eee3aba 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreCopydb.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreCopydb.java @@ -1,26 +1,26 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.Collection; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.Db; -import com.massivecraft.mcore.store.Driver; -import com.massivecraft.mcore.store.MStore; -import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.Db; +import com.massivecraft.massivecore.store.Driver; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.xlib.gson.JsonElement; -public class CmdMCoreMStoreCopydb extends MCommand +public class CmdMassiveCoreStoreCopydb extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreMStoreCopydb() + public CmdMassiveCoreStoreCopydb() { // Aliases this.addAliases("copydb"); @@ -30,7 +30,7 @@ public class CmdMCoreMStoreCopydb extends MCommand this.addRequiredArg("to"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_COPYDB.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.STORE_COPYDB.node)); } // -------------------------------------------- // @@ -73,8 +73,8 @@ public class CmdMCoreMStoreCopydb extends MCommand for (String collname : fromDb.getCollnames()) { countCollCurrent++; - final Coll fromColl = new Coll(collname, Object.class, fromDb, MCore.get()); - final Coll toColl = new Coll(collname, Object.class, toDb, MCore.get()); + final Coll fromColl = new Coll(collname, Object.class, fromDb, MassiveCore.get()); + final Coll toColl = new Coll(collname, Object.class, toDb, MassiveCore.get()); Collection ids = fromDriver.getIds(fromColl); msg("Now copying collection %d/%d %s with %d documents.", countCollCurrent, countCollTotal, collname, ids.size()); diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreListcolls.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java similarity index 64% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreListcolls.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java index a51f2ac9..294e78e9 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreListcolls.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java @@ -1,26 +1,26 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.Set; import java.util.TreeSet; -import com.massivecraft.mcore.ConfServer; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.NaturalOrderComparator; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARString; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.Db; -import com.massivecraft.mcore.store.MStore; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.ConfServer; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.NaturalOrderComparator; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARString; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.Db; +import com.massivecraft.massivecore.store.MStore; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreMStoreListcolls extends MCommand +public class CmdMassiveCoreStoreListcolls extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreMStoreListcolls() + public CmdMassiveCoreStoreListcolls() { // Aliases this.addAliases("listcolls"); @@ -29,7 +29,7 @@ public class CmdMCoreMStoreListcolls extends MCommand this.addOptionalArg("db", ConfServer.dburi); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_LISTCOLLS.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.STORE_LISTCOLLS.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreStats.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreStats.java similarity index 77% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreStats.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreStats.java index 08c55d13..7d7b6c26 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreStats.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreStats.java @@ -1,23 +1,23 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.Map.Entry; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARColl; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.ExamineThread; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARColl; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.ExamineThread; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreMStoreStats extends MCommand +public class CmdMassiveCoreStoreStats extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreMStoreStats() + public CmdMassiveCoreStoreStats() { // Aliases this.addAliases("stats"); @@ -26,7 +26,7 @@ public class CmdMCoreMStoreStats extends MCommand this.addOptionalArg("coll", Coll.TOTAL); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_STATS.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.STORE_STATS.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreTest.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java similarity index 64% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreTest.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java index c8ed2afa..1a1690e9 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreTest.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java @@ -1,25 +1,25 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.VisibilityMode; -import com.massivecraft.mcore.cmd.arg.AREnum; -import com.massivecraft.mcore.cmd.arg.ARFloat; -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.particleeffect.ParticleEffect; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.VisibilityMode; +import com.massivecraft.massivecore.cmd.arg.AREnum; +import com.massivecraft.massivecore.cmd.arg.ARFloat; +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.particleeffect.ParticleEffect; -public class CmdMCoreTest extends MCommand +public class CmdMassiveCoreTest extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreTest() + public CmdMassiveCoreTest() { // Aliases this.addAliases("test"); @@ -33,7 +33,7 @@ public class CmdMCoreTest extends MCommand this.addRequiredArg("amount"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.TEST.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.TEST.node)); this.addRequirements(ReqIsPlayer.get()); // VisibilityMode diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsys.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsys.java new file mode 100644 index 00000000..c2c268f4 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsys.java @@ -0,0 +1,37 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreUsys extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreUsysMultiverse cmdMassiveCoreUsysMultiverse = new CmdMassiveCoreUsysMultiverse(); + public CmdMassiveCoreUsysUniverse cmdMassiveCoreUsysUniverse = new CmdMassiveCoreUsysUniverse(); + public CmdMassiveCoreUsysWorld cmdMassiveCoreUsysWorld = new CmdMassiveCoreUsysWorld(); + public CmdMassiveCoreUsysAspect cmdMassiveCoreUsysAspect = new CmdMassiveCoreUsysAspect(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreUsys() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreUsysMultiverse); + this.addSubCommand(this.cmdMassiveCoreUsysUniverse); + this.addSubCommand(this.cmdMassiveCoreUsysWorld); + this.addSubCommand(this.cmdMassiveCoreUsysAspect); + + // Aliases + this.addAliases("usys"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS.node)); + } + +} diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspect.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspect.java new file mode 100644 index 00000000..85a6f61e --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspect.java @@ -0,0 +1,35 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreUsysAspect extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreUsysAspectList cmdMassiveCoreUsysAspectList = new CmdMassiveCoreUsysAspectList(); + public CmdMassiveCoreUsysAspectShow cmdMassiveCoreUsysAspectShow = new CmdMassiveCoreUsysAspectShow(); + public CmdMassiveCoreUsysAspectUse cmdMassiveCoreUsysAspectUse = new CmdMassiveCoreUsysAspectUse(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreUsysAspect() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreUsysAspectList); + this.addSubCommand(this.cmdMassiveCoreUsysAspectShow); + this.addSubCommand(this.cmdMassiveCoreUsysAspectUse); + + // Aliases + this.addAliases("a", "aspect"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_ASPECT.node)); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java similarity index 60% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectList.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java index b844a81b..66ff5f01 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java @@ -1,23 +1,23 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.AspectColl; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARInteger; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.AspectColl; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreUsysAspectList extends MCommand +public class CmdMassiveCoreUsysAspectList extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysAspectList() + public CmdMassiveCoreUsysAspectList() { // Aliases this.addAliases("l", "list"); @@ -26,7 +26,7 @@ public class CmdMCoreUsysAspectList extends MCommand this.addOptionalArg("page", "1"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_LIST.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_ASPECT_LIST.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectShow.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectShow.java similarity index 55% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectShow.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectShow.java index 8f1ed9cd..c584cceb 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectShow.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectShow.java @@ -1,19 +1,19 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARAspect; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARAspect; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreUsysAspectShow extends MCommand +public class CmdMassiveCoreUsysAspectShow extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysAspectShow() + public CmdMassiveCoreUsysAspectShow() { // Aliases this.addAliases("s", "show"); @@ -22,7 +22,7 @@ public class CmdMCoreUsysAspectShow extends MCommand this.addRequiredArg("aspect"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_SHOW.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_ASPECT_SHOW.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectUse.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectUse.java similarity index 55% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectUse.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectUse.java index 2627ba50..e943246d 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectUse.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectUse.java @@ -1,20 +1,20 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARAspect; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARAspect; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysAspectUse extends MCommand +public class CmdMassiveCoreUsysAspectUse extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysAspectUse() + public CmdMassiveCoreUsysAspectUse() { // Aliases this.addAliases("u", "use"); @@ -24,7 +24,7 @@ public class CmdMCoreUsysAspectUse extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_USE.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_ASPECT_USE.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverse.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverse.java new file mode 100644 index 00000000..20e72ad8 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverse.java @@ -0,0 +1,37 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreUsysMultiverse extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreUsysMultiverseList cmdMassiveCoreUsysMultiverseList = new CmdMassiveCoreUsysMultiverseList(); + public CmdMassiveCoreUsysMultiverseShow cmdMassiveCoreUsysMultiverseShow = new CmdMassiveCoreUsysMultiverseShow(); + public CmdMassiveCoreUsysMultiverseNew cmdMassiveCoreUsysMultiverseNew = new CmdMassiveCoreUsysMultiverseNew(); + public CmdMassiveCoreUsysMultiverseDel cmdMassiveCoreUsysMultiverseDel = new CmdMassiveCoreUsysMultiverseDel(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreUsysMultiverse() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreUsysMultiverseList); + this.addSubCommand(this.cmdMassiveCoreUsysMultiverseShow); + this.addSubCommand(this.cmdMassiveCoreUsysMultiverseNew); + this.addSubCommand(this.cmdMassiveCoreUsysMultiverseDel); + + // Aliases + this.addAliases("m", "multiverse"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE.node)); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseDel.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseDel.java similarity index 53% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseDel.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseDel.java index 43a4e571..79ec4938 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseDel.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseDel.java @@ -1,19 +1,19 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysMultiverseDel extends MCommand +public class CmdMassiveCoreUsysMultiverseDel extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysMultiverseDel() + public CmdMassiveCoreUsysMultiverseDel() { // Aliases this.addAliases("d", "del"); @@ -22,7 +22,7 @@ public class CmdMCoreUsysMultiverseDel extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_DEL.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_DEL.node)); } // -------------------------------------------- // @@ -37,7 +37,7 @@ public class CmdMCoreUsysMultiverseDel extends MCommand String id = multiverse.getId(); - if (id.equals(MCore.DEFAULT)) + if (id.equals(MassiveCore.DEFAULT)) { msg("You can't delete the default multiverse."); return; diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java similarity index 61% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseList.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java index d2ec929c..204d5a2b 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java @@ -1,23 +1,23 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARInteger; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.MultiverseColl; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARInteger; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreUsysMultiverseList extends MCommand +public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysMultiverseList() + public CmdMassiveCoreUsysMultiverseList() { // Aliases this.addAliases("l", "list"); @@ -26,7 +26,7 @@ public class CmdMCoreUsysMultiverseList extends MCommand this.addOptionalArg("page", "1"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_LIST.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_LIST.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseNew.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseNew.java similarity index 58% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseNew.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseNew.java index 55f91bbe..73ba2ce5 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseNew.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseNew.java @@ -1,17 +1,17 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.MultiverseColl; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysMultiverseNew extends MCommand +public class CmdMassiveCoreUsysMultiverseNew extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysMultiverseNew() + public CmdMassiveCoreUsysMultiverseNew() { // Aliases this.addAliases("n", "new"); @@ -20,7 +20,7 @@ public class CmdMCoreUsysMultiverseNew extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_NEW.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_NEW.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseShow.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseShow.java similarity index 65% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseShow.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseShow.java index e625c7a7..e4695f85 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseShow.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseShow.java @@ -1,24 +1,24 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.util.Txt; -public class CmdMCoreUsysMultiverseShow extends MCommand +public class CmdMassiveCoreUsysMultiverseShow extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysMultiverseShow() + public CmdMassiveCoreUsysMultiverseShow() { // Aliases this.addAliases("s", "show"); @@ -27,7 +27,7 @@ public class CmdMCoreUsysMultiverseShow extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_SHOW.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_SHOW.node)); } // -------------------------------------------- // @@ -44,7 +44,7 @@ public class CmdMCoreUsysMultiverseShow extends MCommand for (String universe : multiverse.getUniverses()) { - if (universe.equals(MCore.DEFAULT)) continue; + if (universe.equals(MassiveCore.DEFAULT)) continue; msg(""+universe+": "+Txt.implodeCommaAndDot(multiverse.getWorlds(universe), "%s", ", ", " and ", ".")); } msg("default: for all other worlds."); diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverse.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverse.java new file mode 100644 index 00000000..a28b6dc4 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverse.java @@ -0,0 +1,35 @@ +package com.massivecraft.massivecore.cmd.massivecore; + +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; + +public class CmdMassiveCoreUsysUniverse extends MassiveCommand +{ + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + + public CmdMassiveCoreUsysUniverseNew cmdMassiveCoreUsysUniverseNew = new CmdMassiveCoreUsysUniverseNew(); + public CmdMassiveCoreUsysUniverseDel cmdMassiveCoreUsysUniverseDel = new CmdMassiveCoreUsysUniverseDel(); + public CmdMassiveCoreUsysUniverseClear cmdMassiveCoreUsysUniverseClear = new CmdMassiveCoreUsysUniverseClear(); + + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + + public CmdMassiveCoreUsysUniverse() + { + // SubCommands + this.addSubCommand(this.cmdMassiveCoreUsysUniverseNew); + this.addSubCommand(this.cmdMassiveCoreUsysUniverseDel); + this.addSubCommand(this.cmdMassiveCoreUsysUniverseClear); + + // Aliases + this.addAliases("u", "universe"); + + // Requirements + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_UNIVERSE.node)); + } + +} diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseClear.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseClear.java similarity index 61% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseClear.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseClear.java index 6dd09552..9a9dd89a 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseClear.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseClear.java @@ -1,19 +1,19 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysUniverseClear extends MCommand +public class CmdMassiveCoreUsysUniverseClear extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysUniverseClear() + public CmdMassiveCoreUsysUniverseClear() { // Aliases this.addAliases("c", "clear"); @@ -23,7 +23,7 @@ public class CmdMCoreUsysUniverseClear extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE_CLEAR.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_UNIVERSE_CLEAR.node)); } // -------------------------------------------- // @@ -38,7 +38,7 @@ public class CmdMCoreUsysUniverseClear extends MCommand String universe = this.arg(0); - if (universe.equals(MCore.DEFAULT)) + if (universe.equals(MassiveCore.DEFAULT)) { msg("You can't clear the default universe."); msg("It contains the worlds that aren't assigned to a universe."); diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseDel.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseDel.java similarity index 62% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseDel.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseDel.java index 2478fc4a..e5928a2b 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseDel.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseDel.java @@ -1,19 +1,19 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysUniverseDel extends MCommand +public class CmdMassiveCoreUsysUniverseDel extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysUniverseDel() + public CmdMassiveCoreUsysUniverseDel() { // Aliases this.addAliases("d", "del"); @@ -23,7 +23,7 @@ public class CmdMCoreUsysUniverseDel extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_DEL.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_DEL.node)); } // -------------------------------------------- // @@ -38,7 +38,7 @@ public class CmdMCoreUsysUniverseDel extends MCommand String universe = this.arg(0); - if (universe.equals(MCore.DEFAULT)) + if (universe.equals(MassiveCore.DEFAULT)) { msg("You can't remove the default universe."); msg("Each multiverse contains a default universe."); diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseNew.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseNew.java similarity index 63% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseNew.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseNew.java index cb3477e2..a8ee769b 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseNew.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysUniverseNew.java @@ -1,18 +1,18 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysUniverseNew extends MCommand +public class CmdMassiveCoreUsysUniverseNew extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysUniverseNew() + public CmdMassiveCoreUsysUniverseNew() { // Aliases this.addAliases("n", "new"); @@ -22,7 +22,7 @@ public class CmdMCoreUsysUniverseNew extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE_NEW.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_UNIVERSE_NEW.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysWorld.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysWorld.java similarity index 71% rename from src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysWorld.java rename to src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysWorld.java index 28bb8f90..cf026e9d 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysWorld.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysWorld.java @@ -1,18 +1,18 @@ -package com.massivecraft.mcore.mcorecmd; +package com.massivecraft.massivecore.cmd.massivecore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.MCorePerm; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.cmd.arg.ARMultiverse; -import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.cmd.arg.ARMultiverse; +import com.massivecraft.massivecore.cmd.req.ReqHasPerm; -public class CmdMCoreUsysWorld extends MCommand +public class CmdMassiveCoreUsysWorld extends MassiveCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdMCoreUsysWorld() + public CmdMassiveCoreUsysWorld() { // Aliases this.addAliases("w", "world"); @@ -23,7 +23,7 @@ public class CmdMCoreUsysWorld extends MCommand this.addRequiredArg("multiverse"); // Requirements - this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_WORLD.node)); + this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_WORLD.node)); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/cmd/req/Req.java b/src/com/massivecraft/massivecore/cmd/req/Req.java new file mode 100644 index 00000000..c8002e87 --- /dev/null +++ b/src/com/massivecraft/massivecore/cmd/req/Req.java @@ -0,0 +1,16 @@ +package com.massivecraft.massivecore.cmd.req; + +import org.bukkit.command.CommandSender; + +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.cmd.MassiveCommand; + +public interface Req extends Predictate +{ + public boolean apply(CommandSender sender, MassiveCommand command); + + // This just composes the error message and does NOT test the requirement at all. + + public String createErrorMessage(CommandSender sender); + public String createErrorMessage(CommandSender sender, MassiveCommand command); +} diff --git a/src/com/massivecraft/mcore/cmd/req/ReqAbstract.java b/src/com/massivecraft/massivecore/cmd/req/ReqAbstract.java similarity index 85% rename from src/com/massivecraft/mcore/cmd/req/ReqAbstract.java rename to src/com/massivecraft/massivecore/cmd/req/ReqAbstract.java index 7e40136e..a16716a0 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqAbstract.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore/cmd/req/ReqAnd.java b/src/com/massivecraft/massivecore/cmd/req/ReqAnd.java similarity index 77% rename from src/com/massivecraft/mcore/cmd/req/ReqAnd.java rename to src/com/massivecraft/massivecore/cmd/req/ReqAnd.java index f7b9b7c3..c9ceadc6 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqAnd.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqAnd.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,7 @@ import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.massivecore.cmd.MassiveCommand; public class ReqAnd extends ReqAbstract { @@ -42,18 +42,18 @@ public class ReqAnd extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return this.getFirstFailedSubreq(sender, command) == null; } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return this.getFirstFailedSubreq(sender, command).createErrorMessage(sender, command); } - public Req getFirstFailedSubreq(CommandSender sender, MCommand command) + public Req getFirstFailedSubreq(CommandSender sender, MassiveCommand command) { for (Req req : this.getReqs()) { diff --git a/src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java b/src/com/massivecraft/massivecore/cmd/req/ReqHasPerm.java similarity index 71% rename from src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java rename to src/com/massivecraft/massivecore/cmd/req/ReqHasPerm.java index 1ab60645..22175087 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqHasPerm.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.util.PermUtil; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.util.PermUtil; public class ReqHasPerm extends ReqAbstract { @@ -28,13 +28,13 @@ public class ReqHasPerm extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return sender.hasPermission(this.perm); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return PermUtil.getDeniedMessage(this.perm); } diff --git a/src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java b/src/com/massivecraft/massivecore/cmd/req/ReqIsPlayer.java similarity index 66% rename from src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java rename to src/com/massivecraft/massivecore/cmd/req/ReqIsPlayer.java index c0b22158..54ebba08 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqIsPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.Lang; -import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.massivecore.Lang; +import com.massivecraft.massivecore.cmd.MassiveCommand; public class ReqIsPlayer extends ReqAbstract { @@ -22,13 +22,13 @@ public class ReqIsPlayer extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return sender instanceof Player; } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Lang.COMMAND_SENDER_MUST_BE_PLAYER; } diff --git a/src/com/massivecraft/mcore/cmd/req/ReqIsntCertainSender.java b/src/com/massivecraft/massivecore/cmd/req/ReqIsntCertainSender.java similarity index 70% rename from src/com/massivecraft/mcore/cmd/req/ReqIsntCertainSender.java rename to src/com/massivecraft/massivecore/cmd/req/ReqIsntCertainSender.java index 0a22b6b2..173bf0dd 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqIsntCertainSender.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqIsntCertainSender.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.cmd.MCommand; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.cmd.MassiveCommand; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; public class ReqIsntCertainSender extends ReqAbstract { @@ -30,13 +30,13 @@ public class ReqIsntCertainSender extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return !this.getSenderId().equalsIgnoreCase(IdUtil.getId(sender)); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Txt.parse("Player can't be %s.", Mixin.getDisplayName(this.getSenderId())); } diff --git a/src/com/massivecraft/mcore/cmd/req/ReqIsntPlayer.java b/src/com/massivecraft/massivecore/cmd/req/ReqIsntPlayer.java similarity index 66% rename from src/com/massivecraft/mcore/cmd/req/ReqIsntPlayer.java rename to src/com/massivecraft/massivecore/cmd/req/ReqIsntPlayer.java index 9f46ee45..5b17bfe5 100644 --- a/src/com/massivecraft/mcore/cmd/req/ReqIsntPlayer.java +++ b/src/com/massivecraft/massivecore/cmd/req/ReqIsntPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.cmd.req; +package com.massivecraft.massivecore.cmd.req; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.Lang; -import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.massivecore.Lang; +import com.massivecraft.massivecore.cmd.MassiveCommand; public class ReqIsntPlayer extends ReqAbstract { @@ -22,13 +22,13 @@ public class ReqIsntPlayer extends ReqAbstract // -------------------------------------------- // @Override - public boolean apply(CommandSender sender, MCommand command) + public boolean apply(CommandSender sender, MassiveCommand command) { return ! (sender instanceof Player); } @Override - public String createErrorMessage(CommandSender sender, MCommand command) + public String createErrorMessage(CommandSender sender, MassiveCommand command) { return Lang.COMMAND_SENDER_MUSNT_BE_PLAYER; } diff --git a/src/com/massivecraft/mcore/event/MCoreEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCore.java similarity index 80% rename from src/com/massivecraft/mcore/event/MCoreEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCore.java index 0e91766d..7bd8a4be 100644 --- a/src/com/massivecraft/mcore/event/MCoreEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import java.util.LinkedHashMap; import java.util.Map; @@ -7,7 +7,7 @@ import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; -public abstract class MCoreEvent extends Event implements Runnable, Cancellable +public abstract class EventMassiveCore extends Event implements Runnable, Cancellable { // -------------------------------------------- // // FIELDS @@ -34,12 +34,12 @@ public abstract class MCoreEvent extends Event implements Runnable, Cancellable // CONSTRUCT // -------------------------------------------- // - public MCoreEvent() + public EventMassiveCore() { } - public MCoreEvent(boolean isAsync) + public EventMassiveCore(boolean isAsync) { super(isAsync); } diff --git a/src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerRespawn.java similarity index 82% rename from src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerRespawn.java index 641624db..4dc374da 100644 --- a/src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerRespawn.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerRespawnEvent; -public class MCoreAfterPlayerRespawnEvent extends MCoreEvent +public class EventMassiveCoreAfterPlayerRespawn extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -32,7 +32,7 @@ public class MCoreAfterPlayerRespawnEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCoreAfterPlayerRespawnEvent(PlayerRespawnEvent bukkitEvent, Location deathLocation) + public EventMassiveCoreAfterPlayerRespawn(PlayerRespawnEvent bukkitEvent, Location deathLocation) { this.bukkitEvent = bukkitEvent; this.deathLocation = deathLocation; diff --git a/src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerTeleport.java similarity index 85% rename from src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerTeleport.java index 7fe5406a..39cb6910 100644 --- a/src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreAfterPlayerTeleport.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.Location; import org.bukkit.World; @@ -7,7 +7,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -public class MCoreAfterPlayerTeleportEvent extends MCoreEvent +public class EventMassiveCoreAfterPlayerTeleport extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -40,7 +40,7 @@ public class MCoreAfterPlayerTeleportEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCoreAfterPlayerTeleportEvent(PlayerTeleportEvent bukkitEvent) + public EventMassiveCoreAfterPlayerTeleport(PlayerTeleportEvent bukkitEvent) { this.bukkitEvent = bukkitEvent; } diff --git a/src/com/massivecraft/mcore/event/MCorePermissionDeniedFormatEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePermissionDeniedFormat.java similarity index 81% rename from src/com/massivecraft/mcore/event/MCorePermissionDeniedFormatEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCorePermissionDeniedFormat.java index 5105da4c..5870a26a 100644 --- a/src/com/massivecraft/mcore/event/MCorePermissionDeniedFormatEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePermissionDeniedFormat.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.event.HandlerList; -public class MCorePermissionDeniedFormatEvent extends MCoreEvent +public class EventMassiveCorePermissionDeniedFormat extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -28,7 +28,7 @@ public class MCorePermissionDeniedFormatEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCorePermissionDeniedFormatEvent(String permissionName) + public EventMassiveCorePermissionDeniedFormat(String permissionName) { this.permissionName = permissionName; this.format = null; diff --git a/src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java similarity index 73% rename from src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java index d433e6e3..af792d86 100644 --- a/src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import java.util.HashMap; import java.util.Map; @@ -9,16 +9,16 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; /** - * The MCorePlayerLeaveEvent is a non-cancellable event. + * The EventMassiveCorePlayerLeave is a non-cancellable event. * It is run at the MONITOR of either PlayerKickEvent or PlayerQuitEvent. - * It is also guaranteed to run before the MCore "store" module syncs + * It is also guaranteed to run before the MassiveCore "store" module syncs * all entities related to the player that is leaving the server. * * Use this even if you want to update a player entity as * that player leaves. Automatic syncing will be guaranteed and the * event will run pre disconnect if possible due to the internal usage if the PlayerKickedEvent. */ -public class MCorePlayerLeaveEvent extends Event implements Runnable +public class EventMassiveCorePlayerLeave extends Event implements Runnable { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -51,7 +51,7 @@ public class MCorePlayerLeaveEvent extends Event implements Runnable // CONSTRUCT // -------------------------------------------- // - public MCorePlayerLeaveEvent(Player player, boolean preDisconnect, String caller, String message) + public EventMassiveCorePlayerLeave(Player player, boolean preDisconnect, String caller, String message) { this.player = player; this.preDisconnect = preDisconnect; @@ -70,11 +70,11 @@ public class MCorePlayerLeaveEvent extends Event implements Runnable // We ignore that since we want one leave event called per disconnect only. boolean doit = !player2event.containsKey(this.player.getName()); - //MCore.p.log("MCorePlayerLeaveEvent", "caller:", caller, "doit:", doit, "player:", player.getDisplayName(), "preDisconnect:", preDisconnect, "message:", message); + //MassiveCore.p.log("EventMassiveCorePlayerLeave", "caller:", caller, "doit:", doit, "player:", player.getDisplayName(), "preDisconnect:", preDisconnect, "message:", message); if (doit) { - //MCore.p.log("MCorePlayerLeaveEvent", caller, player.getDisplayName(), preDisconnect, message); + //MassiveCore.p.log("EventMassiveCorePlayerLeave", caller, player.getDisplayName(), preDisconnect, message); player2event.put(this.player.getName(), this); Bukkit.getPluginManager().callEvent(this); } @@ -83,6 +83,6 @@ public class MCorePlayerLeaveEvent extends Event implements Runnable // -------------------------------------------- // // STORING THE ACTIVE PLAYER EVENT // -------------------------------------------- // - public static Map player2event = new HashMap(); + public static Map player2event = new HashMap(); } diff --git a/src/com/massivecraft/mcore/event/MCorePlayerPSTeleportEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java similarity index 82% rename from src/com/massivecraft/mcore/event/MCorePlayerPSTeleportEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java index 4c54b2e9..b18ba6f7 100644 --- a/src/com/massivecraft/mcore/event/MCorePlayerPSTeleportEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; -public class MCorePlayerPSTeleportEvent extends Event implements Cancellable, Runnable +public class EventMassiveCorePlayerPSTeleport extends Event implements Cancellable, Runnable { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -43,7 +43,7 @@ public class MCorePlayerPSTeleportEvent extends Event implements Cancellable, Ru // CONSTRUCT // -------------------------------------------- // - public MCorePlayerPSTeleportEvent(String teleporteeId, PS from, PS to, String desc) + public EventMassiveCorePlayerPSTeleport(String teleporteeId, PS from, PS to, String desc) { this.teleporteeId = teleporteeId; this.from = from; diff --git a/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerToRecipientChat.java similarity index 81% rename from src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCorePlayerToRecipientChat.java index 896a6562..54299c9a 100644 --- a/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerToRecipientChat.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -public class MCorePlayerToRecipientChatEvent extends MCoreEvent +public class EventMassiveCorePlayerToRecipientChat extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -36,7 +36,7 @@ public class MCorePlayerToRecipientChatEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCorePlayerToRecipientChatEvent(boolean async, Player sender, CommandSender recipient, String message, String format) + public EventMassiveCorePlayerToRecipientChat(boolean async, Player sender, CommandSender recipient, String message, String format) { super(async); this.sender = sender; diff --git a/src/com/massivecraft/mcore/event/EventMCorePlayerUpdate.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java similarity index 85% rename from src/com/massivecraft/mcore/event/EventMCorePlayerUpdate.java rename to src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java index 4d94987d..b9c782a1 100644 --- a/src/com/massivecraft/mcore/event/EventMCorePlayerUpdate.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import com.massivecraft.mcore.util.PlayerUtil; +import com.massivecraft.massivecore.util.PlayerUtil; -public class EventMCorePlayerUpdate extends MCoreEvent +public class EventMassiveCorePlayerUpdate extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -42,7 +42,7 @@ public class EventMCorePlayerUpdate extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public EventMCorePlayerUpdate(Player player) + public EventMassiveCorePlayerUpdate(Player player) { this.player = player; this.maxHealth = PlayerUtil.getMaxHealth(player); diff --git a/src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java similarity index 67% rename from src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java index 975d476e..2be28759 100644 --- a/src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.mcore.util.IdData; +import com.massivecraft.massivecore.util.IdData; -public class MCoreSenderRegisterEvent extends MCoreSenderRegistryEvent +public class EventMassiveCoreSenderRegister extends EventMassiveCoreSenderRegistry { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -19,7 +19,7 @@ public class MCoreSenderRegisterEvent extends MCoreSenderRegistryEvent // CONSTRUCT // -------------------------------------------- // - public MCoreSenderRegisterEvent(CommandSender sender, IdData data) + public EventMassiveCoreSenderRegister(CommandSender sender, IdData data) { super(sender, data); } diff --git a/src/com/massivecraft/mcore/event/MCoreSenderRegistryEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java similarity index 65% rename from src/com/massivecraft/mcore/event/MCoreSenderRegistryEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java index f42e393c..8fd3e52a 100644 --- a/src/com/massivecraft/mcore/event/MCoreSenderRegistryEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.IdData; +import com.massivecraft.massivecore.util.IdData; -public abstract class MCoreSenderRegistryEvent extends MCoreEvent +public abstract class EventMassiveCoreSenderRegistry extends EventMassiveCore { // -------------------------------------------- // // FIELDS @@ -20,7 +20,7 @@ public abstract class MCoreSenderRegistryEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCoreSenderRegistryEvent(CommandSender sender, IdData data) + public EventMassiveCoreSenderRegistry(CommandSender sender, IdData data) { this.sender = sender; this.data = data; diff --git a/src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java similarity index 66% rename from src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java index a1d06e40..89475e70 100644 --- a/src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.mcore.util.IdData; +import com.massivecraft.massivecore.util.IdData; -public class MCoreSenderUnregisterEvent extends MCoreSenderRegistryEvent +public class EventMassiveCoreSenderUnregister extends EventMassiveCoreSenderRegistry { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -19,7 +19,7 @@ public class MCoreSenderUnregisterEvent extends MCoreSenderRegistryEvent // CONSTRUCT // -------------------------------------------- // - public MCoreSenderUnregisterEvent(CommandSender sender, IdData data) + public EventMassiveCoreSenderUnregister(CommandSender sender, IdData data) { super(sender, data); } diff --git a/src/com/massivecraft/mcore/event/MCoreUuidUpdateEvent.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreUuidUpdate.java similarity index 74% rename from src/com/massivecraft/mcore/event/MCoreUuidUpdateEvent.java rename to src/com/massivecraft/massivecore/event/EventMassiveCoreUuidUpdate.java index c4b252dc..c6c2fc8b 100644 --- a/src/com/massivecraft/mcore/event/MCoreUuidUpdateEvent.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreUuidUpdate.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.event; +package com.massivecraft.massivecore.event; import org.bukkit.event.HandlerList; -public class MCoreUuidUpdateEvent extends MCoreEvent +public class EventMassiveCoreUuidUpdate extends EventMassiveCore { // -------------------------------------------- // // REQUIRED EVENT CODE diff --git a/src/com/massivecraft/mcore/fetcher/Fetcher.java b/src/com/massivecraft/massivecore/fetcher/Fetcher.java similarity index 93% rename from src/com/massivecraft/mcore/fetcher/Fetcher.java rename to src/com/massivecraft/massivecore/fetcher/Fetcher.java index 46542e9d..4215ba6d 100644 --- a/src/com/massivecraft/mcore/fetcher/Fetcher.java +++ b/src/com/massivecraft/massivecore/fetcher/Fetcher.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.util.ArrayList; import java.util.Collection; @@ -12,7 +12,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class Fetcher implements Callable> { diff --git a/src/com/massivecraft/mcore/fetcher/FetcherById.java b/src/com/massivecraft/massivecore/fetcher/FetcherById.java similarity index 94% rename from src/com/massivecraft/mcore/fetcher/FetcherById.java rename to src/com/massivecraft/massivecore/fetcher/FetcherById.java index 7ad42c74..3ca8c90a 100644 --- a/src/com/massivecraft/mcore/fetcher/FetcherById.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherById.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/fetcher/FetcherByIdSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java similarity index 95% rename from src/com/massivecraft/mcore/fetcher/FetcherByIdSingle.java rename to src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java index c08b1c59..1653d3e2 100644 --- a/src/com/massivecraft/mcore/fetcher/FetcherByIdSingle.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/com/massivecraft/mcore/fetcher/FetcherByName.java b/src/com/massivecraft/massivecore/fetcher/FetcherByName.java similarity index 94% rename from src/com/massivecraft/mcore/fetcher/FetcherByName.java rename to src/com/massivecraft/massivecore/fetcher/FetcherByName.java index 302206e4..fbe4c418 100644 --- a/src/com/massivecraft/mcore/fetcher/FetcherByName.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/fetcher/FetcherByNameSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java similarity index 95% rename from src/com/massivecraft/mcore/fetcher/FetcherByNameSingle.java rename to src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java index 7ba62ff7..5932fdfe 100644 --- a/src/com/massivecraft/mcore/fetcher/FetcherByNameSingle.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/com/massivecraft/mcore/fetcher/IdAndName.java b/src/com/massivecraft/massivecore/fetcher/IdAndName.java similarity index 92% rename from src/com/massivecraft/mcore/fetcher/IdAndName.java rename to src/com/massivecraft/massivecore/fetcher/IdAndName.java index 16a24d11..e3864612 100644 --- a/src/com/massivecraft/mcore/fetcher/IdAndName.java +++ b/src/com/massivecraft/massivecore/fetcher/IdAndName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.fetcher; +package com.massivecraft.massivecore.fetcher; import java.util.UUID; diff --git a/src/com/massivecraft/mcore/integration/IntegrationFeatures.java b/src/com/massivecraft/massivecore/integration/Integration.java similarity index 58% rename from src/com/massivecraft/mcore/integration/IntegrationFeatures.java rename to src/com/massivecraft/massivecore/integration/Integration.java index 41eff0af..c044061c 100644 --- a/src/com/massivecraft/mcore/integration/IntegrationFeatures.java +++ b/src/com/massivecraft/massivecore/integration/Integration.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.integration; +package com.massivecraft.massivecore.integration; import java.util.List; -public interface IntegrationFeatures +public interface Integration { public List getTargetPluginNames(); public void activate(); diff --git a/src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java b/src/com/massivecraft/massivecore/integration/IntegrationAbstract.java similarity index 76% rename from src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java rename to src/com/massivecraft/massivecore/integration/IntegrationAbstract.java index 78063975..0d267063 100644 --- a/src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java +++ b/src/com/massivecraft/massivecore/integration/IntegrationAbstract.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.integration; +package com.massivecraft.massivecore.integration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public abstract class IntegrationFeaturesAbstract implements IntegrationFeatures +public abstract class IntegrationAbstract implements Integration { // -------------------------------------------- // // FIELDS @@ -16,7 +16,7 @@ public abstract class IntegrationFeaturesAbstract implements IntegrationFeatures // CONSTRUCT // -------------------------------------------- // - public IntegrationFeaturesAbstract(String... targetPluginNames) + public IntegrationAbstract(String... targetPluginNames) { this.targetPluginNames = new ArrayList(Arrays.asList(targetPluginNames)); } diff --git a/src/com/massivecraft/mcore/integration/Integration.java b/src/com/massivecraft/massivecore/integration/IntegrationGlue.java similarity index 85% rename from src/com/massivecraft/mcore/integration/Integration.java rename to src/com/massivecraft/massivecore/integration/IntegrationGlue.java index ce847af2..9c359920 100644 --- a/src/com/massivecraft/mcore/integration/Integration.java +++ b/src/com/massivecraft/massivecore/integration/IntegrationGlue.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.integration; +package com.massivecraft.massivecore.integration; import java.util.Collection; @@ -10,17 +10,17 @@ import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.MPlugin; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.MassivePlugin; +import com.massivecraft.massivecore.util.Txt; -public class Integration implements Listener +public class IntegrationGlue implements Listener { // -------------------------------------------- // // FIELDS // -------------------------------------------- // - protected MPlugin ourPlugin; - protected IntegrationFeatures features; + protected MassivePlugin ourPlugin; + protected Integration features; protected boolean active = false; public boolean isActive() { return this.active; } @@ -29,7 +29,7 @@ public class Integration implements Listener // CONSTRUCT // -------------------------------------------- // - public Integration(MPlugin ourPlugin, IntegrationFeatures features) + public IntegrationGlue(MassivePlugin ourPlugin, Integration features) { this.ourPlugin = ourPlugin; this.features = features; diff --git a/src/com/massivecraft/mcore/integration/protocollib/EntityPotionColorPacketAdapter.java b/src/com/massivecraft/massivecore/integration/protocollib/EntityPotionColorPacketAdapter.java similarity index 83% rename from src/com/massivecraft/mcore/integration/protocollib/EntityPotionColorPacketAdapter.java rename to src/com/massivecraft/massivecore/integration/protocollib/EntityPotionColorPacketAdapter.java index a94c5d71..d5184a60 100644 --- a/src/com/massivecraft/mcore/integration/protocollib/EntityPotionColorPacketAdapter.java +++ b/src/com/massivecraft/massivecore/integration/protocollib/EntityPotionColorPacketAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.integration.protocollib; +package com.massivecraft.massivecore.integration.protocollib; import java.util.List; @@ -13,7 +13,7 @@ import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.wrappers.WrappedWatchableObject; -import com.massivecraft.mcore.MCore; +import com.massivecraft.massivecore.MassiveCore; public class EntityPotionColorPacketAdapter extends PacketAdapter { @@ -21,10 +21,9 @@ public class EntityPotionColorPacketAdapter extends PacketAdapter // INSTANCE & CONSTRUCT // -------------------------------------------- // - //private EntityPotionColorPacketAdapter() { super(MCore.get(), ConnectionSide.SERVER_SIDE, ListenerPriority.NORMAL, Packets.Server.ENTITY_METADATA); } private EntityPotionColorPacketAdapter() { - super(PacketAdapter.params().plugin(MCore.get()).serverSide().listenerPriority(ListenerPriority.NORMAL).types(PacketType.Play.Server.ENTITY_METADATA)); + super(PacketAdapter.params().plugin(MassiveCore.get()).serverSide().listenerPriority(ListenerPriority.NORMAL).types(PacketType.Play.Server.ENTITY_METADATA)); } private static EntityPotionColorPacketAdapter i = new EntityPotionColorPacketAdapter(); public static EntityPotionColorPacketAdapter get() { return i; } @@ -73,7 +72,7 @@ public class EntityPotionColorPacketAdapter extends PacketAdapter // ... run our custom async event to allow changing it ... int oldColor = (Integer) watchable.getValue(); - MCoreEntityPotionColorEvent colorEvent = new MCoreEntityPotionColorEvent(sendee, entity, oldColor); + EventMassiveCoreEntityPotionColor colorEvent = new EventMassiveCoreEntityPotionColor(sendee, entity, oldColor); colorEvent.run(); int newColor = colorEvent.getColor(); diff --git a/src/com/massivecraft/mcore/integration/protocollib/MCoreEntityPotionColorEvent.java b/src/com/massivecraft/massivecore/integration/protocollib/EventMassiveCoreEntityPotionColor.java similarity index 83% rename from src/com/massivecraft/mcore/integration/protocollib/MCoreEntityPotionColorEvent.java rename to src/com/massivecraft/massivecore/integration/protocollib/EventMassiveCoreEntityPotionColor.java index efaca502..6d80edd6 100644 --- a/src/com/massivecraft/mcore/integration/protocollib/MCoreEntityPotionColorEvent.java +++ b/src/com/massivecraft/massivecore/integration/protocollib/EventMassiveCoreEntityPotionColor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.integration.protocollib; +package com.massivecraft.massivecore.integration.protocollib; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -public class MCoreEntityPotionColorEvent extends Event implements Runnable +public class EventMassiveCoreEntityPotionColor extends Event implements Runnable { // -------------------------------------------- // // REQUIRED EVENT CODE @@ -36,7 +36,7 @@ public class MCoreEntityPotionColorEvent extends Event implements Runnable // CONSTRUCT // -------------------------------------------- // - public MCoreEntityPotionColorEvent(Player sendee, Entity entity, int color) + public EventMassiveCoreEntityPotionColor(Player sendee, Entity entity, int color) { this.sendee = sendee; this.entity = entity; diff --git a/src/com/massivecraft/massivecore/integration/protocollib/IntegrationProtocolLib.java b/src/com/massivecraft/massivecore/integration/protocollib/IntegrationProtocolLib.java new file mode 100644 index 00000000..4ad13e66 --- /dev/null +++ b/src/com/massivecraft/massivecore/integration/protocollib/IntegrationProtocolLib.java @@ -0,0 +1,25 @@ +package com.massivecraft.massivecore.integration.protocollib; + +import com.massivecraft.massivecore.integration.IntegrationAbstract; + +public class IntegrationProtocolLib extends IntegrationAbstract +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private IntegrationProtocolLib() { super("ProtocolLib"); } + private static IntegrationProtocolLib i = new IntegrationProtocolLib(); + public static IntegrationProtocolLib get() { return i; } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void activate() + { + EntityPotionColorPacketAdapter.get().setup(); + } + +} diff --git a/src/com/massivecraft/massivecore/integration/vault/IntegrationVault.java b/src/com/massivecraft/massivecore/integration/vault/IntegrationVault.java new file mode 100644 index 00000000..16029134 --- /dev/null +++ b/src/com/massivecraft/massivecore/integration/vault/IntegrationVault.java @@ -0,0 +1,32 @@ +package com.massivecraft.massivecore.integration.vault; + +import com.massivecraft.massivecore.integration.IntegrationAbstract; +import com.massivecraft.massivecore.money.MoneyMixinVault; + +public class IntegrationVault extends IntegrationAbstract +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static IntegrationVault i = new IntegrationVault(); + public static IntegrationVault get() { return i; } + private IntegrationVault() { super("Vault"); } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public void activate() + { + MoneyMixinVault.get().activate(); + } + + @Override + public void deactivate() + { + MoneyMixinVault.get().deactivate(); + } + +} diff --git a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java b/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java similarity index 91% rename from src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java rename to src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java index 31d204cd..380566b2 100644 --- a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java +++ b/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.inventory; +package com.massivecraft.massivecore.inventory; import net.minecraft.server.v1_7_R3.EntityHuman; import net.minecraft.server.v1_7_R3.ItemStack; @@ -40,13 +40,13 @@ import org.bukkit.inventory.InventoryHolder; * */ -public class MCorePlayerInventory extends PlayerInventory +public class MassiveCorePlayerInventory extends PlayerInventory { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public MCorePlayerInventory() + public MassiveCorePlayerInventory() { super(null); } diff --git a/src/com/massivecraft/massivecore/mixin/ActualMixin.java b/src/com/massivecraft/massivecore/mixin/ActualMixin.java new file mode 100644 index 00000000..f451f1f7 --- /dev/null +++ b/src/com/massivecraft/massivecore/mixin/ActualMixin.java @@ -0,0 +1,11 @@ +package com.massivecraft.massivecore.mixin; + +import org.bukkit.event.player.PlayerJoinEvent; + +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; + +public interface ActualMixin +{ + public boolean isActualJoin(PlayerJoinEvent event); + public boolean isActualLeave(EventMassiveCorePlayerLeave event); +} diff --git a/src/com/massivecraft/mcore/mixin/ActualMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/ActualMixinAbstract.java similarity index 59% rename from src/com/massivecraft/mcore/mixin/ActualMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/ActualMixinAbstract.java index 91bff2e9..7b638e4d 100644 --- a/src/com/massivecraft/mcore/mixin/ActualMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/ActualMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class ActualMixinAbstract implements ActualMixin { diff --git a/src/com/massivecraft/mcore/mixin/ActualMixinDefault.java b/src/com/massivecraft/massivecore/mixin/ActualMixinDefault.java similarity index 74% rename from src/com/massivecraft/mcore/mixin/ActualMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/ActualMixinDefault.java index 7265c01f..86daced8 100644 --- a/src/com/massivecraft/mcore/mixin/ActualMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/ActualMixinDefault.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.event.player.PlayerJoinEvent; -import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; public class ActualMixinDefault extends ActualMixinAbstract { @@ -24,7 +24,7 @@ public class ActualMixinDefault extends ActualMixinAbstract } @Override - public boolean isActualLeave(MCorePlayerLeaveEvent event) + public boolean isActualLeave(EventMassiveCorePlayerLeave event) { return true; } diff --git a/src/com/massivecraft/mcore/mixin/CommandMixin.java b/src/com/massivecraft/massivecore/mixin/CommandMixin.java similarity index 81% rename from src/com/massivecraft/mcore/mixin/CommandMixin.java rename to src/com/massivecraft/massivecore/mixin/CommandMixin.java index 0a96cd77..1018d0f7 100644 --- a/src/com/massivecraft/mcore/mixin/CommandMixin.java +++ b/src/com/massivecraft/massivecore/mixin/CommandMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface CommandMixin { diff --git a/src/com/massivecraft/mcore/mixin/CommandMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/CommandMixinAbstract.java similarity index 81% rename from src/com/massivecraft/mcore/mixin/CommandMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/CommandMixinAbstract.java index e4af9d90..e63dca3e 100644 --- a/src/com/massivecraft/mcore/mixin/CommandMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/CommandMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class CommandMixinAbstract implements CommandMixin { diff --git a/src/com/massivecraft/mcore/mixin/CommandMixinDefault.java b/src/com/massivecraft/massivecore/mixin/CommandMixinDefault.java similarity index 88% rename from src/com/massivecraft/mcore/mixin/CommandMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/CommandMixinDefault.java index dc534c6f..6957340f 100644 --- a/src/com/massivecraft/mcore/mixin/CommandMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/CommandMixinDefault.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class CommandMixinDefault extends CommandMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/DisplayNameMixin.java b/src/com/massivecraft/massivecore/mixin/DisplayNameMixin.java similarity index 75% rename from src/com/massivecraft/mcore/mixin/DisplayNameMixin.java rename to src/com/massivecraft/massivecore/mixin/DisplayNameMixin.java index 550767e0..88f12f97 100644 --- a/src/com/massivecraft/mcore/mixin/DisplayNameMixin.java +++ b/src/com/massivecraft/massivecore/mixin/DisplayNameMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface DisplayNameMixin { diff --git a/src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java similarity index 62% rename from src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java index bdec7e8b..b9b48bb9 100644 --- a/src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class DisplayNameMixinAbstract implements DisplayNameMixin { diff --git a/src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinDefault.java similarity index 91% rename from src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/DisplayNameMixinDefault.java index b032bfc5..7f85fb9f 100644 --- a/src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Map; import java.util.TreeMap; @@ -6,7 +6,7 @@ import java.util.TreeMap; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class DisplayNameMixinDefault extends DisplayNameMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/EngineTeleportMixinCause.java b/src/com/massivecraft/massivecore/mixin/EngineTeleportMixinCause.java similarity index 86% rename from src/com/massivecraft/mcore/mixin/EngineTeleportMixinCause.java rename to src/com/massivecraft/massivecore/mixin/EngineTeleportMixinCause.java index d950350d..f40a0619 100644 --- a/src/com/massivecraft/mcore/mixin/EngineTeleportMixinCause.java +++ b/src/com/massivecraft/massivecore/mixin/EngineTeleportMixinCause.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Collections; import java.util.Set; @@ -10,8 +10,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.EngineAbstract; -import com.massivecraft.mcore.MCore; +import com.massivecraft.massivecore.EngineAbstract; +import com.massivecraft.massivecore.MassiveCore; public class EngineTeleportMixinCause extends EngineAbstract { @@ -30,7 +30,7 @@ public class EngineTeleportMixinCause extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } // -------------------------------------------- // @@ -62,7 +62,7 @@ public class EngineTeleportMixinCause extends EngineAbstract if (!mixinCausedTeleportIncoming) return; mixinCausedTeleportIncoming = false; mixinCausedTeleportEvents.add(event); - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() diff --git a/src/com/massivecraft/mcore/mixin/KickMixin.java b/src/com/massivecraft/massivecore/mixin/KickMixin.java similarity index 72% rename from src/com/massivecraft/mcore/mixin/KickMixin.java rename to src/com/massivecraft/massivecore/mixin/KickMixin.java index 8b7d471f..0c69f6b2 100644 --- a/src/com/massivecraft/mcore/mixin/KickMixin.java +++ b/src/com/massivecraft/massivecore/mixin/KickMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface KickMixin { diff --git a/src/com/massivecraft/mcore/mixin/KickMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/KickMixinAbstract.java similarity index 75% rename from src/com/massivecraft/mcore/mixin/KickMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/KickMixinAbstract.java index e02789b8..5680054f 100644 --- a/src/com/massivecraft/mcore/mixin/KickMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/KickMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class KickMixinAbstract implements KickMixin { diff --git a/src/com/massivecraft/mcore/mixin/KickMixinDefault.java b/src/com/massivecraft/massivecore/mixin/KickMixinDefault.java similarity index 84% rename from src/com/massivecraft/mcore/mixin/KickMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/KickMixinDefault.java index 4574bc6d..62f7079e 100644 --- a/src/com/massivecraft/mcore/mixin/KickMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/KickMixinDefault.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.entity.Player; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class KickMixinDefault extends KickMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/ListNameMixin.java b/src/com/massivecraft/massivecore/mixin/ListNameMixin.java similarity index 74% rename from src/com/massivecraft/mcore/mixin/ListNameMixin.java rename to src/com/massivecraft/massivecore/mixin/ListNameMixin.java index 8805d93e..0a9abf67 100644 --- a/src/com/massivecraft/mcore/mixin/ListNameMixin.java +++ b/src/com/massivecraft/massivecore/mixin/ListNameMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface ListNameMixin { diff --git a/src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java similarity index 60% rename from src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java index 82fbfb44..77c3a418 100644 --- a/src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class ListNameMixinAbstract implements ListNameMixin { diff --git a/src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java b/src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java similarity index 91% rename from src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java index 60f6ebd6..4fa675c5 100644 --- a/src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Map; import java.util.TreeMap; @@ -6,7 +6,7 @@ import java.util.TreeMap; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class ListNameMixinDefault extends ListNameMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/MessageMixin.java b/src/com/massivecraft/massivecore/mixin/MessageMixin.java similarity index 92% rename from src/com/massivecraft/mcore/mixin/MessageMixin.java rename to src/com/massivecraft/massivecore/mixin/MessageMixin.java index 0bf664f6..2a04f108 100644 --- a/src/com/massivecraft/mcore/mixin/MessageMixin.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixin.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Predictate; +import com.massivecraft.massivecore.Predictate; public interface MessageMixin { diff --git a/src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java similarity index 89% rename from src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java index 274a4c4f..c96c39f9 100644 --- a/src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Arrays; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Predictate; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; public abstract class MessageMixinAbstract implements MessageMixin { diff --git a/src/com/massivecraft/mcore/mixin/MessageMixinDefault.java b/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java similarity index 87% rename from src/com/massivecraft/mcore/mixin/MessageMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java index 506facc5..bce165fc 100644 --- a/src/com/massivecraft/mcore/mixin/MessageMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.Predictate; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.util.IdUtil; public class MessageMixinDefault extends MessageMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/Mixin.java b/src/com/massivecraft/massivecore/mixin/Mixin.java similarity index 94% rename from src/com/massivecraft/mcore/mixin/Mixin.java rename to src/com/massivecraft/massivecore/mixin/Mixin.java index cc7752eb..9cc8908d 100644 --- a/src/com/massivecraft/mcore/mixin/Mixin.java +++ b/src/com/massivecraft/massivecore/mixin/Mixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.Collection; import java.util.List; @@ -9,11 +9,11 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.Predictate; -import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.teleport.PSGetter; +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.teleport.PSGetter; public class Mixin { @@ -415,7 +415,7 @@ public class Mixin return getActualMixin().isActualJoin(event); } - public static boolean isActualLeave(MCorePlayerLeaveEvent event) + public static boolean isActualLeave(EventMassiveCorePlayerLeave event) { return getActualMixin().isActualLeave(event); } diff --git a/src/com/massivecraft/mcore/mixin/PlayedMixin.java b/src/com/massivecraft/massivecore/mixin/PlayedMixin.java similarity index 83% rename from src/com/massivecraft/mcore/mixin/PlayedMixin.java rename to src/com/massivecraft/massivecore/mixin/PlayedMixin.java index c483d60f..05679829 100644 --- a/src/com/massivecraft/mcore/mixin/PlayedMixin.java +++ b/src/com/massivecraft/massivecore/mixin/PlayedMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface PlayedMixin { diff --git a/src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/PlayedMixinAbstract.java similarity index 79% rename from src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/PlayedMixinAbstract.java index f0c8d5ee..408217be 100644 --- a/src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/PlayedMixinAbstract.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public abstract class PlayedMixinAbstract implements PlayedMixin { diff --git a/src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java b/src/com/massivecraft/massivecore/mixin/PlayedMixinDefault.java similarity index 90% rename from src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/PlayedMixinDefault.java index 1b2f976d..4bd1073a 100644 --- a/src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/PlayedMixinDefault.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class PlayedMixinDefault extends PlayedMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/SenderPsMixin.java b/src/com/massivecraft/massivecore/mixin/SenderPsMixin.java similarity index 58% rename from src/com/massivecraft/mcore/mixin/SenderPsMixin.java rename to src/com/massivecraft/massivecore/mixin/SenderPsMixin.java index 7a22e33c..e3858719 100644 --- a/src/com/massivecraft/mcore/mixin/SenderPsMixin.java +++ b/src/com/massivecraft/massivecore/mixin/SenderPsMixin.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public interface SenderPsMixin { diff --git a/src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/SenderPsMixinAbstract.java similarity index 60% rename from src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/SenderPsMixinAbstract.java index 38cf5583..3347afd0 100644 --- a/src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/SenderPsMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class SenderPsMixinAbstract implements SenderPsMixin { diff --git a/src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java b/src/com/massivecraft/massivecore/mixin/SenderPsMixinDefault.java similarity index 82% rename from src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/SenderPsMixinDefault.java index 58c0fa21..78d41756 100644 --- a/src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/SenderPsMixinDefault.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.entity.Player; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.IdUtil; public class SenderPsMixinDefault extends SenderPsMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/TeleportMixin.java b/src/com/massivecraft/massivecore/mixin/TeleportMixin.java similarity index 91% rename from src/com/massivecraft/mcore/mixin/TeleportMixin.java rename to src/com/massivecraft/massivecore/mixin/TeleportMixin.java index 93bc32ac..578be54d 100644 --- a/src/com/massivecraft/mcore/mixin/TeleportMixin.java +++ b/src/com/massivecraft/massivecore/mixin/TeleportMixin.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.teleport.PSGetter; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.teleport.PSGetter; public interface TeleportMixin { diff --git a/src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/TeleportMixinAbstract.java similarity index 88% rename from src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/TeleportMixinAbstract.java index 57a24742..2ae0c9b3 100644 --- a/src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/TeleportMixinAbstract.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.MCoreConf; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.teleport.PSGetter; -import com.massivecraft.mcore.teleport.PSGetterPS; -import com.massivecraft.mcore.teleport.PSGetterPlayer; +import com.massivecraft.massivecore.MassiveCoreMConf; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.teleport.PSGetter; +import com.massivecraft.massivecore.teleport.PSGetterPS; +import com.massivecraft.massivecore.teleport.PSGetterPlayer; public abstract class TeleportMixinAbstract implements TeleportMixin { @@ -19,7 +19,7 @@ public abstract class TeleportMixinAbstract implements TeleportMixin public static int getTpdelay(Permissible delayPermissible) { - return MCoreConf.get().getTpdelay(delayPermissible); + return MassiveCoreMConf.get().getTpdelay(delayPermissible); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java b/src/com/massivecraft/massivecore/mixin/TeleportMixinDefault.java similarity index 82% rename from src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/TeleportMixinDefault.java index 15543d75..b6b28ec6 100644 --- a/src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/TeleportMixinDefault.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import com.massivecraft.mcore.event.MCorePlayerPSTeleportEvent; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.teleport.PSGetter; -import com.massivecraft.mcore.teleport.ScheduledTeleport; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerPSTeleport; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.teleport.PSGetter; +import com.massivecraft.massivecore.teleport.ScheduledTeleport; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.Txt; public class TeleportMixinDefault extends TeleportMixinAbstract { @@ -98,7 +98,7 @@ public class TeleportMixinDefault extends TeleportMixinAbstract PS to = toGetter.getPS(); // Run event - MCorePlayerPSTeleportEvent event = new MCorePlayerPSTeleportEvent(teleporteeId, Mixin.getSenderPs(teleporteeId), to, desc); + EventMassiveCorePlayerPSTeleport event = new EventMassiveCorePlayerPSTeleport(teleporteeId, Mixin.getSenderPs(teleporteeId), to, desc); event.run(); if (event.isCancelled()) return; if (event.getTo() == null) return; diff --git a/src/com/massivecraft/mcore/mixin/TeleporterException.java b/src/com/massivecraft/massivecore/mixin/TeleporterException.java similarity index 88% rename from src/com/massivecraft/mcore/mixin/TeleporterException.java rename to src/com/massivecraft/massivecore/mixin/TeleporterException.java index 784d675d..c95c4464 100644 --- a/src/com/massivecraft/mcore/mixin/TeleporterException.java +++ b/src/com/massivecraft/massivecore/mixin/TeleporterException.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public class TeleporterException extends Exception { diff --git a/src/com/massivecraft/mcore/mixin/VisibilityMixin.java b/src/com/massivecraft/massivecore/mixin/VisibilityMixin.java similarity index 67% rename from src/com/massivecraft/mcore/mixin/VisibilityMixin.java rename to src/com/massivecraft/massivecore/mixin/VisibilityMixin.java index 13218d9e..63c169cd 100644 --- a/src/com/massivecraft/mcore/mixin/VisibilityMixin.java +++ b/src/com/massivecraft/massivecore/mixin/VisibilityMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public interface VisibilityMixin { diff --git a/src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/VisibilityMixinAbstract.java similarity index 61% rename from src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/VisibilityMixinAbstract.java index 7fd76740..5cabc361 100644 --- a/src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/VisibilityMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; public abstract class VisibilityMixinAbstract implements VisibilityMixin { diff --git a/src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java b/src/com/massivecraft/massivecore/mixin/VisibilityMixinDefault.java similarity index 86% rename from src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/VisibilityMixinDefault.java index 87a5d54b..e9caff92 100644 --- a/src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/VisibilityMixinDefault.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import org.bukkit.entity.Player; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class VisibilityMixinDefault extends VisibilityMixinAbstract { diff --git a/src/com/massivecraft/mcore/mixin/WorldMixin.java b/src/com/massivecraft/massivecore/mixin/WorldMixin.java similarity index 86% rename from src/com/massivecraft/mcore/mixin/WorldMixin.java rename to src/com/massivecraft/massivecore/mixin/WorldMixin.java index 600ca07f..26f2aabe 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixin.java +++ b/src/com/massivecraft/massivecore/mixin/WorldMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.List; @@ -6,7 +6,7 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public interface WorldMixin { diff --git a/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/WorldMixinAbstract.java similarity index 91% rename from src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java rename to src/com/massivecraft/massivecore/mixin/WorldMixinAbstract.java index b50a4369..66acd3e2 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/WorldMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.ArrayList; import java.util.List; diff --git a/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java b/src/com/massivecraft/massivecore/mixin/WorldMixinDefault.java similarity index 90% rename from src/com/massivecraft/mcore/mixin/WorldMixinDefault.java rename to src/com/massivecraft/massivecore/mixin/WorldMixinDefault.java index 4055cb49..5227ed01 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/WorldMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.mixin; +package com.massivecraft.massivecore.mixin; import java.util.ArrayList; import java.util.List; @@ -10,9 +10,9 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.ps.PSFormatDesc; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSFormatDesc; +import com.massivecraft.massivecore.util.MUtil; public class WorldMixinDefault extends WorldMixinAbstract { diff --git a/src/com/massivecraft/mcore/money/Money.java b/src/com/massivecraft/massivecore/money/Money.java similarity index 95% rename from src/com/massivecraft/mcore/money/Money.java rename to src/com/massivecraft/massivecore/money/Money.java index ff544b0b..24d95b7d 100644 --- a/src/com/massivecraft/mcore/money/Money.java +++ b/src/com/massivecraft/massivecore/money/Money.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.money; +package com.massivecraft.massivecore.money; import java.util.Collection; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; public class Money { diff --git a/src/com/massivecraft/mcore/money/MoneyMixin.java b/src/com/massivecraft/massivecore/money/MoneyMixin.java similarity index 96% rename from src/com/massivecraft/mcore/money/MoneyMixin.java rename to src/com/massivecraft/massivecore/money/MoneyMixin.java index fb99e76d..ec7ad7f8 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixin.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.money; +package com.massivecraft.massivecore.money; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/money/MoneyMixinAbstract.java b/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java similarity index 96% rename from src/com/massivecraft/mcore/money/MoneyMixinAbstract.java rename to src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java index d6e9c586..28e8ef16 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixinAbstract.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.money; +package com.massivecraft.massivecore.money; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/money/MoneyMixinVault.java b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java similarity index 93% rename from src/com/massivecraft/mcore/money/MoneyMixinVault.java rename to src/com/massivecraft/massivecore/money/MoneyMixinVault.java index a1e469ee..bb7a9cea 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixinVault.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java @@ -1,11 +1,12 @@ -package com.massivecraft.mcore.money; +package com.massivecraft.massivecore.money; import java.util.Collection; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.util.MUtil; + diff --git a/src/com/massivecraft/mcore/pager/Pager.java b/src/com/massivecraft/massivecore/pager/Pager.java similarity index 91% rename from src/com/massivecraft/mcore/pager/Pager.java rename to src/com/massivecraft/massivecore/pager/Pager.java index 01d0ec5e..cd5cb7ad 100644 --- a/src/com/massivecraft/mcore/pager/Pager.java +++ b/src/com/massivecraft/massivecore/pager/Pager.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.pager; +package com.massivecraft.massivecore.pager; import java.util.Collection; import java.util.List; diff --git a/src/com/massivecraft/mcore/pager/PagerAbstract.java b/src/com/massivecraft/massivecore/pager/PagerAbstract.java similarity index 91% rename from src/com/massivecraft/mcore/pager/PagerAbstract.java rename to src/com/massivecraft/massivecore/pager/PagerAbstract.java index bc7d1494..f475141e 100644 --- a/src/com/massivecraft/mcore/pager/PagerAbstract.java +++ b/src/com/massivecraft/massivecore/pager/PagerAbstract.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.pager; +package com.massivecraft.massivecore.pager; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public abstract class PagerAbstract implements Pager { diff --git a/src/com/massivecraft/mcore/pager/PagerSimple.java b/src/com/massivecraft/massivecore/pager/PagerSimple.java similarity index 89% rename from src/com/massivecraft/mcore/pager/PagerSimple.java rename to src/com/massivecraft/massivecore/pager/PagerSimple.java index 82156e2f..c3c51167 100644 --- a/src/com/massivecraft/mcore/pager/PagerSimple.java +++ b/src/com/massivecraft/massivecore/pager/PagerSimple.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.pager; +package com.massivecraft.massivecore.pager; import java.util.Collection; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class PagerSimple extends PagerAbstract { diff --git a/src/com/massivecraft/mcore/pager/Stringifier.java b/src/com/massivecraft/massivecore/pager/Stringifier.java similarity index 58% rename from src/com/massivecraft/mcore/pager/Stringifier.java rename to src/com/massivecraft/massivecore/pager/Stringifier.java index fbf2553f..14fff685 100644 --- a/src/com/massivecraft/mcore/pager/Stringifier.java +++ b/src/com/massivecraft/massivecore/pager/Stringifier.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.pager; +package com.massivecraft.massivecore.pager; public interface Stringifier { diff --git a/src/com/massivecraft/mcore/particleeffect/BlockCrackData.java b/src/com/massivecraft/massivecore/particleeffect/BlockCrackData.java similarity index 93% rename from src/com/massivecraft/mcore/particleeffect/BlockCrackData.java rename to src/com/massivecraft/massivecore/particleeffect/BlockCrackData.java index 721c35fe..8873fff4 100644 --- a/src/com/massivecraft/mcore/particleeffect/BlockCrackData.java +++ b/src/com/massivecraft/massivecore/particleeffect/BlockCrackData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/mcore/particleeffect/BlockDustData.java b/src/com/massivecraft/massivecore/particleeffect/BlockDustData.java similarity index 93% rename from src/com/massivecraft/mcore/particleeffect/BlockDustData.java rename to src/com/massivecraft/massivecore/particleeffect/BlockDustData.java index 27ee06a5..2e87162d 100644 --- a/src/com/massivecraft/mcore/particleeffect/BlockDustData.java +++ b/src/com/massivecraft/massivecore/particleeffect/BlockDustData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/mcore/particleeffect/IconCrackData.java b/src/com/massivecraft/massivecore/particleeffect/IconCrackData.java similarity index 93% rename from src/com/massivecraft/mcore/particleeffect/IconCrackData.java rename to src/com/massivecraft/massivecore/particleeffect/IconCrackData.java index 852dee5c..87538251 100644 --- a/src/com/massivecraft/mcore/particleeffect/IconCrackData.java +++ b/src/com/massivecraft/massivecore/particleeffect/IconCrackData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/mcore/particleeffect/NormalEffectData.java b/src/com/massivecraft/massivecore/particleeffect/NormalEffectData.java similarity index 94% rename from src/com/massivecraft/mcore/particleeffect/NormalEffectData.java rename to src/com/massivecraft/massivecore/particleeffect/NormalEffectData.java index b487db76..a1d0489f 100644 --- a/src/com/massivecraft/mcore/particleeffect/NormalEffectData.java +++ b/src/com/massivecraft/massivecore/particleeffect/NormalEffectData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/mcore/particleeffect/ParticleEffect.java b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java similarity index 96% rename from src/com/massivecraft/mcore/particleeffect/ParticleEffect.java rename to src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java index 0dc62bf0..f4e58830 100644 --- a/src/com/massivecraft/mcore/particleeffect/ParticleEffect.java +++ b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -15,9 +15,9 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.mcore.particleeffect.ReflectionHandler.PackageType; -import com.massivecraft.mcore.particleeffect.ReflectionHandler.PacketType; -import com.massivecraft.mcore.particleeffect.ReflectionHandler.SubPackageType; +import com.massivecraft.massivecore.particleeffect.ReflectionHandler.PackageType; +import com.massivecraft.massivecore.particleeffect.ReflectionHandler.PacketType; +import com.massivecraft.massivecore.particleeffect.ReflectionHandler.SubPackageType; /** * ParticleEffect Library v1.4 diff --git a/src/com/massivecraft/mcore/particleeffect/ParticleEffectData.java b/src/com/massivecraft/massivecore/particleeffect/ParticleEffectData.java similarity index 91% rename from src/com/massivecraft/mcore/particleeffect/ParticleEffectData.java rename to src/com/massivecraft/massivecore/particleeffect/ParticleEffectData.java index 3905fc0f..1e548bb2 100644 --- a/src/com/massivecraft/mcore/particleeffect/ParticleEffectData.java +++ b/src/com/massivecraft/massivecore/particleeffect/ParticleEffectData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/mcore/particleeffect/ReflectionHandler.java b/src/com/massivecraft/massivecore/particleeffect/ReflectionHandler.java similarity index 97% rename from src/com/massivecraft/mcore/particleeffect/ReflectionHandler.java rename to src/com/massivecraft/massivecore/particleeffect/ReflectionHandler.java index 2603aeae..5259b9a3 100644 --- a/src/com/massivecraft/mcore/particleeffect/ReflectionHandler.java +++ b/src/com/massivecraft/massivecore/particleeffect/ReflectionHandler.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.particleeffect; +package com.massivecraft.massivecore.particleeffect; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore/ps/PS.java b/src/com/massivecraft/massivecore/ps/PS.java similarity index 96% rename from src/com/massivecraft/mcore/ps/PS.java rename to src/com/massivecraft/massivecore/ps/PS.java index c1e3ab10..d4fc72b8 100644 --- a/src/com/massivecraft/mcore/ps/PS.java +++ b/src/com/massivecraft/massivecore/ps/PS.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; import java.io.Serializable; import java.util.Map.Entry; @@ -11,13 +11,13 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.util.MUtil; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; /** * # Introduction @@ -651,7 +651,7 @@ public final class PS implements Cloneable, Serializable, Comparable { if (world == null) throw new NullPointerException(NAME_FULL_WORLD + SPACE_WASNT_SET); World ret = Bukkit.getWorld(world); - if (ret == null) throw new IllegalStateException("the world "+world+" does not exist on "+MCore.getServerId()); + if (ret == null) throw new IllegalStateException("the world "+world+" does not exist on "+MassiveCore.getServerId()); return ret; } diff --git a/src/com/massivecraft/mcore/ps/PSAdapter.java b/src/com/massivecraft/massivecore/ps/PSAdapter.java similarity index 70% rename from src/com/massivecraft/mcore/ps/PSAdapter.java rename to src/com/massivecraft/massivecore/ps/PSAdapter.java index f2099d18..8d4f021a 100644 --- a/src/com/massivecraft/mcore/ps/PSAdapter.java +++ b/src/com/massivecraft/massivecore/ps/PSAdapter.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; 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; public class PSAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/mcore/ps/PSBuilder.java b/src/com/massivecraft/massivecore/ps/PSBuilder.java similarity index 96% rename from src/com/massivecraft/mcore/ps/PSBuilder.java rename to src/com/massivecraft/massivecore/ps/PSBuilder.java index 4fc35fea..f1749488 100644 --- a/src/com/massivecraft/mcore/ps/PSBuilder.java +++ b/src/com/massivecraft/massivecore/ps/PSBuilder.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; import org.bukkit.World; diff --git a/src/com/massivecraft/mcore/ps/PSFormat.java b/src/com/massivecraft/massivecore/ps/PSFormat.java similarity index 56% rename from src/com/massivecraft/mcore/ps/PSFormat.java rename to src/com/massivecraft/massivecore/ps/PSFormat.java index 49b662af..94133b96 100644 --- a/src/com/massivecraft/mcore/ps/PSFormat.java +++ b/src/com/massivecraft/massivecore/ps/PSFormat.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; public interface PSFormat { diff --git a/src/com/massivecraft/mcore/ps/PSFormatAbstract.java b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java similarity index 93% rename from src/com/massivecraft/mcore/ps/PSFormatAbstract.java rename to src/com/massivecraft/massivecore/ps/PSFormatAbstract.java index 66e477a1..52197ce9 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatAbstract.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.Txt; public class PSFormatAbstract implements PSFormat { diff --git a/src/com/massivecraft/mcore/ps/PSFormatDesc.java b/src/com/massivecraft/massivecore/ps/PSFormatDesc.java similarity index 92% rename from src/com/massivecraft/mcore/ps/PSFormatDesc.java rename to src/com/massivecraft/massivecore/ps/PSFormatDesc.java index 6924c95e..5b21c1b6 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatDesc.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatDesc.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class PSFormatDesc extends PSFormatAbstract { diff --git a/src/com/massivecraft/mcore/ps/PSFormatFormal.java b/src/com/massivecraft/massivecore/ps/PSFormatFormal.java similarity index 92% rename from src/com/massivecraft/mcore/ps/PSFormatFormal.java rename to src/com/massivecraft/massivecore/ps/PSFormatFormal.java index b0bfd8ca..5cc2e0ab 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatFormal.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatFormal.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; public class PSFormatFormal extends PSFormatAbstract { diff --git a/src/com/massivecraft/mcore/ps/PSFormatHumanComma.java b/src/com/massivecraft/massivecore/ps/PSFormatHumanComma.java similarity index 86% rename from src/com/massivecraft/mcore/ps/PSFormatHumanComma.java rename to src/com/massivecraft/massivecore/ps/PSFormatHumanComma.java index 00a3d24a..e073b74a 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatHumanComma.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatHumanComma.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class PSFormatHumanComma extends PSFormatAbstract { diff --git a/src/com/massivecraft/mcore/ps/PSFormatHumanSpace.java b/src/com/massivecraft/massivecore/ps/PSFormatHumanSpace.java similarity index 86% rename from src/com/massivecraft/mcore/ps/PSFormatHumanSpace.java rename to src/com/massivecraft/massivecore/ps/PSFormatHumanSpace.java index d6b2d7b5..b603ddca 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatHumanSpace.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatHumanSpace.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class PSFormatHumanSpace extends PSFormatAbstract { diff --git a/src/com/massivecraft/mcore/ps/PSFormatSlug.java b/src/com/massivecraft/massivecore/ps/PSFormatSlug.java similarity index 92% rename from src/com/massivecraft/mcore/ps/PSFormatSlug.java rename to src/com/massivecraft/massivecore/ps/PSFormatSlug.java index f0b72d4c..3152ae71 100644 --- a/src/com/massivecraft/mcore/ps/PSFormatSlug.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatSlug.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.ps; +package com.massivecraft.massivecore.ps; -import com.massivecraft.mcore.util.Txt; +import com.massivecraft.massivecore.util.Txt; public class PSFormatSlug extends PSFormatAbstract { diff --git a/src/com/massivecraft/mcore/sender/BasicCommandSender.java b/src/com/massivecraft/massivecore/sender/BasicCommandSender.java similarity index 81% rename from src/com/massivecraft/mcore/sender/BasicCommandSender.java rename to src/com/massivecraft/massivecore/sender/BasicCommandSender.java index c6374b00..2af1c9d3 100644 --- a/src/com/massivecraft/mcore/sender/BasicCommandSender.java +++ b/src/com/massivecraft/massivecore/sender/BasicCommandSender.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.sender; +package com.massivecraft.massivecore.sender; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissibleBase; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.util.IdUtil; public class BasicCommandSender extends PermissibleBase implements CommandSender { @@ -60,7 +60,7 @@ public class BasicCommandSender extends PermissibleBase implements CommandSender final BasicCommandSender ME = this; // register later - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() diff --git a/src/com/massivecraft/mcore/sender/BasicServerOperator.java b/src/com/massivecraft/massivecore/sender/BasicServerOperator.java similarity index 88% rename from src/com/massivecraft/mcore/sender/BasicServerOperator.java rename to src/com/massivecraft/massivecore/sender/BasicServerOperator.java index 69779227..eea2d2be 100644 --- a/src/com/massivecraft/mcore/sender/BasicServerOperator.java +++ b/src/com/massivecraft/massivecore/sender/BasicServerOperator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.sender; +package com.massivecraft.massivecore.sender; import org.bukkit.permissions.ServerOperator; diff --git a/src/com/massivecraft/mcore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java similarity index 90% rename from src/com/massivecraft/mcore/store/Coll.java rename to src/com/massivecraft/massivecore/store/Coll.java index a6559f7b..a71becec 100644 --- a/src/com/massivecraft/mcore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Collection; import java.util.Collections; @@ -14,16 +14,16 @@ import java.util.concurrent.ConcurrentSkipListSet; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.HashCodeComparator; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.MPlugin; -import com.massivecraft.mcore.NaturalOrderComparator; -import com.massivecraft.mcore.Predictate; -import com.massivecraft.mcore.store.accessor.Accessor; -import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.HashCodeComparator; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassivePlugin; +import com.massivecraft.massivecore.NaturalOrderComparator; +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.store.accessor.Accessor; +import com.massivecraft.massivecore.util.Txt; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonObject; public class Coll implements CollInterface { @@ -68,13 +68,13 @@ public class Coll implements CollInterface @Override public Plugin getPlugin() { return this.plugin; } public Gson getGson() { - if (this.getPlugin() instanceof MPlugin) + if (this.getPlugin() instanceof MassivePlugin) { - return ((MPlugin)this.getPlugin()).gson; + return ((MassivePlugin)this.getPlugin()).gson; } else { - return MCore.gson; + return MassiveCore.gson; } } @@ -451,7 +451,7 @@ public class Coll implements CollInterface this.lastDefault.remove(id); } - // Log database syncronization for display in the "/mcore mstore stats" command. + // Log database syncronization for display in the "/massivecore mstore stats" command. private Map id2out = new TreeMap(); private Map id2in = new TreeMap(); @@ -556,10 +556,10 @@ public class Coll implements CollInterface } catch (Exception e) { - MCore.get().log(Txt.parse("Database could not load entity. You edited a file manually and made wrong JSON?")); - MCore.get().log(Txt.parse("Error: %s", e.getMessage())); - MCore.get().log(Txt.parse("Entity: %s", id)); - MCore.get().log(Txt.parse("Collection: %s", this.getName())); + MassiveCore.get().log(Txt.parse("Database could not load entity. You edited a file manually and made wrong JSON?")); + MassiveCore.get().log(Txt.parse("Error: %s", e.getMessage())); + MassiveCore.get().log(Txt.parse("Entity: %s", id)); + MassiveCore.get().log(Txt.parse("Collection: %s", this.getName())); return; } if (entry == null) return; @@ -676,10 +676,10 @@ public class Coll implements CollInterface } catch (Exception e) { - MCore.get().log(Txt.parse("Database examineHasLocalAlter failed convert current entity to JSON tree.")); - MCore.get().log(Txt.parse("Error: %s", e.getMessage())); - MCore.get().log(Txt.parse("Entity: %s", id)); - MCore.get().log(Txt.parse("Collection: %s", this.getName())); + MassiveCore.get().log(Txt.parse("Database examineHasLocalAlter failed convert current entity to JSON tree.")); + MassiveCore.get().log(Txt.parse("Error: %s", e.getMessage())); + MassiveCore.get().log(Txt.parse("Entity: %s", id)); + MassiveCore.get().log(Txt.parse("Collection: %s", this.getName())); throw e; } @@ -742,7 +742,7 @@ public class Coll implements CollInterface @Override public void syncSuspects() { - /*if (MCore.get().doderp) + /*if (MassiveCore.get().doderp) { if (this.changedIds.size() > 0) { diff --git a/src/com/massivecraft/mcore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java similarity index 95% rename from src/com/massivecraft/mcore/store/CollInterface.java rename to src/com/massivecraft/massivecore/store/CollInterface.java index 5094dc7a..3880d595 100644 --- a/src/com/massivecraft/mcore/store/CollInterface.java +++ b/src/com/massivecraft/massivecore/store/CollInterface.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Collection; import java.util.Comparator; @@ -6,7 +6,7 @@ import java.util.Map; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.Predictate; +import com.massivecraft.massivecore.Predictate; public interface CollInterface { diff --git a/src/com/massivecraft/mcore/store/Colls.java b/src/com/massivecraft/massivecore/store/Colls.java similarity index 89% rename from src/com/massivecraft/mcore/store/Colls.java rename to src/com/massivecraft/massivecore/store/Colls.java index 61fea78e..f0bdfae7 100644 --- a/src/com/massivecraft/mcore/store/Colls.java +++ b/src/com/massivecraft/massivecore/store/Colls.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.Aspect; +import com.massivecraft.massivecore.Multiverse; +import com.massivecraft.massivecore.util.MUtil; public abstract class Colls, E> { diff --git a/src/com/massivecraft/mcore/store/Db.java b/src/com/massivecraft/massivecore/store/Db.java similarity index 78% rename from src/com/massivecraft/mcore/store/Db.java rename to src/com/massivecraft/massivecore/store/Db.java index 54f0b18b..0847aa3e 100644 --- a/src/com/massivecraft/mcore/store/Db.java +++ b/src/com/massivecraft/massivecore/store/Db.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore/store/DbAbstract.java b/src/com/massivecraft/massivecore/store/DbAbstract.java similarity index 75% rename from src/com/massivecraft/mcore/store/DbAbstract.java rename to src/com/massivecraft/massivecore/store/DbAbstract.java index 2d66ef8f..e73745df 100644 --- a/src/com/massivecraft/mcore/store/DbAbstract.java +++ b/src/com/massivecraft/massivecore/store/DbAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore/store/DbFlatfile.java b/src/com/massivecraft/massivecore/store/DbFlatfile.java similarity index 86% rename from src/com/massivecraft/mcore/store/DbFlatfile.java rename to src/com/massivecraft/massivecore/store/DbFlatfile.java index 1e81933b..37eb8e1a 100644 --- a/src/com/massivecraft/mcore/store/DbFlatfile.java +++ b/src/com/massivecraft/massivecore/store/DbFlatfile.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.io.File; -import com.massivecraft.mcore.util.DiscUtil; +import com.massivecraft.massivecore.util.DiscUtil; public class DbFlatfile extends DbAbstract { diff --git a/src/com/massivecraft/mcore/store/DbMongo.java b/src/com/massivecraft/massivecore/store/DbMongo.java similarity index 85% rename from src/com/massivecraft/mcore/store/DbMongo.java rename to src/com/massivecraft/massivecore/store/DbMongo.java index 5c554699..55e0e496 100644 --- a/src/com/massivecraft/mcore/store/DbMongo.java +++ b/src/com/massivecraft/massivecore/store/DbMongo.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; -import com.massivecraft.mcore.xlib.mongodb.DB; +import com.massivecraft.massivecore.xlib.mongodb.DB; public class DbMongo extends DbAbstract { diff --git a/src/com/massivecraft/mcore/store/Driver.java b/src/com/massivecraft/massivecore/store/Driver.java similarity index 88% rename from src/com/massivecraft/mcore/store/Driver.java rename to src/com/massivecraft/massivecore/store/Driver.java index cbd1e312..b30ab812 100644 --- a/src/com/massivecraft/mcore/store/Driver.java +++ b/src/com/massivecraft/massivecore/store/Driver.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonElement; public interface Driver { diff --git a/src/com/massivecraft/mcore/store/DriverAbstract.java b/src/com/massivecraft/massivecore/store/DriverAbstract.java similarity index 87% rename from src/com/massivecraft/mcore/store/DriverAbstract.java rename to src/com/massivecraft/massivecore/store/DriverAbstract.java index bd7d361e..376e41c3 100644 --- a/src/com/massivecraft/mcore/store/DriverAbstract.java +++ b/src/com/massivecraft/massivecore/store/DriverAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; public abstract class DriverAbstract implements Driver { diff --git a/src/com/massivecraft/mcore/store/DriverFlatfile.java b/src/com/massivecraft/massivecore/store/DriverFlatfile.java similarity index 91% rename from src/com/massivecraft/mcore/store/DriverFlatfile.java rename to src/com/massivecraft/massivecore/store/DriverFlatfile.java index 6ee39098..f23fe737 100644 --- a/src/com/massivecraft/mcore/store/DriverFlatfile.java +++ b/src/com/massivecraft/massivecore/store/DriverFlatfile.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.io.File; import java.util.AbstractMap.SimpleEntry; @@ -11,9 +11,9 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.massivecraft.mcore.util.DiscUtil; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonParser; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonParser; public class DriverFlatfile extends DriverAbstract { diff --git a/src/com/massivecraft/mcore/store/DriverMongo.java b/src/com/massivecraft/massivecore/store/DriverMongo.java similarity index 84% rename from src/com/massivecraft/mcore/store/DriverMongo.java rename to src/com/massivecraft/massivecore/store/DriverMongo.java index e7903b2e..f2cceecf 100644 --- a/src/com/massivecraft/mcore/store/DriverMongo.java +++ b/src/com/massivecraft/massivecore/store/DriverMongo.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.Collection; @@ -9,14 +9,14 @@ import java.util.Set; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore.MCoreConf; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore.xlib.mongodb.DB; -import com.massivecraft.mcore.xlib.mongodb.DBCollection; -import com.massivecraft.mcore.xlib.mongodb.DBCursor; -import com.massivecraft.mcore.xlib.mongodb.MongoClient; -import com.massivecraft.mcore.xlib.mongodb.MongoClientURI; +import com.massivecraft.massivecore.MassiveCoreMConf; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; +import com.massivecraft.massivecore.xlib.mongodb.DB; +import com.massivecraft.massivecore.xlib.mongodb.DBCollection; +import com.massivecraft.massivecore.xlib.mongodb.DBCursor; +import com.massivecraft.massivecore.xlib.mongodb.MongoClient; +import com.massivecraft.massivecore.xlib.mongodb.MongoClientURI; public class DriverMongo extends DriverAbstract { @@ -169,7 +169,7 @@ public class DriverMongo extends DriverAbstract GsonMongoConverter.gson2MongoObject(data, dbo); - dbcoll.save(dbo, MCoreConf.get().getMongoDbWriteConcernSave()); + dbcoll.save(dbo, MassiveCoreMConf.get().getMongoDbWriteConcernSave()); return mtime; } @@ -178,7 +178,7 @@ public class DriverMongo extends DriverAbstract public void delete(Coll coll, String id) { DBCollection dbcoll = fixColl(coll); - dbcoll.remove(new BasicDBObject(ID_FIELD, id), MCoreConf.get().getMongoDbWriteConcernDelete()); + dbcoll.remove(new BasicDBObject(ID_FIELD, id), MassiveCoreMConf.get().getMongoDbWriteConcernDelete()); } //----------------------------------------------// diff --git a/src/com/massivecraft/mcore/store/Entity.java b/src/com/massivecraft/massivecore/store/Entity.java similarity index 88% rename from src/com/massivecraft/mcore/store/Entity.java rename to src/com/massivecraft/massivecore/store/Entity.java index f4cf93dd..f629455b 100644 --- a/src/com/massivecraft/mcore/store/Entity.java +++ b/src/com/massivecraft/massivecore/store/Entity.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.NaturalOrderComparator; -import com.massivecraft.mcore.store.accessor.Accessor; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.NaturalOrderComparator; +import com.massivecraft.massivecore.store.accessor.Accessor; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.JsonObject; /** * Usage of this class is highly optional. You may persist anything. If you are @@ -185,7 +185,7 @@ public abstract class Entity> implements Comparable @Override public String toString() { - Gson gson = MCore.gson; + Gson gson = MassiveCore.gson; Coll coll = this.getColl(); if (coll != null) gson = coll.getGson(); diff --git a/src/com/massivecraft/mcore/store/ExamineThread.java b/src/com/massivecraft/massivecore/store/ExamineThread.java similarity index 90% rename from src/com/massivecraft/mcore/store/ExamineThread.java rename to src/com/massivecraft/massivecore/store/ExamineThread.java index e07968b7..fbe95c64 100644 --- a/src/com/massivecraft/mcore/store/ExamineThread.java +++ b/src/com/massivecraft/massivecore/store/ExamineThread.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; public class ExamineThread extends Thread { @@ -50,7 +50,7 @@ public class ExamineThread extends Thread this.lastDurationMillis = duration; //String message = Txt.parse("ExamineThread iteration took %dms.", after-before); - //MCore.get().log(message); + //MassiveCore.get().log(message); Thread.sleep(5000); } diff --git a/src/com/massivecraft/mcore/store/GsonCloner.java b/src/com/massivecraft/massivecore/store/GsonCloner.java similarity index 77% rename from src/com/massivecraft/mcore/store/GsonCloner.java rename to src/com/massivecraft/massivecore/store/GsonCloner.java index 143572b4..de4bb8b8 100644 --- a/src/com/massivecraft/mcore/store/GsonCloner.java +++ b/src/com/massivecraft/massivecore/store/GsonCloner.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Iterator; import java.util.Map.Entry; -import com.massivecraft.mcore.xlib.gson.JsonArray; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonNull; -import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +import com.massivecraft.massivecore.xlib.gson.JsonObject; public class GsonCloner { diff --git a/src/com/massivecraft/mcore/store/GsonEqualsChecker.java b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java similarity index 88% rename from src/com/massivecraft/mcore/store/GsonEqualsChecker.java rename to src/com/massivecraft/massivecore/store/GsonEqualsChecker.java index 98fa259f..84ae15e5 100644 --- a/src/com/massivecraft/mcore/store/GsonEqualsChecker.java +++ b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Map.Entry; import org.apache.commons.lang.StringUtils; -import com.massivecraft.mcore.xlib.gson.JsonArray; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonNull; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; public class GsonEqualsChecker { diff --git a/src/com/massivecraft/mcore/store/GsonMongoConverter.java b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java similarity index 85% rename from src/com/massivecraft/mcore/store/GsonMongoConverter.java rename to src/com/massivecraft/massivecore/store/GsonMongoConverter.java index 3c5aee84..e9f066b4 100644 --- a/src/com/massivecraft/mcore/store/GsonMongoConverter.java +++ b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java @@ -1,19 +1,19 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Map.Entry; import org.apache.commons.lang.StringUtils; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; -import com.massivecraft.mcore.xlib.gson.JsonArray; -import com.massivecraft.mcore.xlib.gson.JsonElement; -import com.massivecraft.mcore.xlib.gson.JsonNull; -import com.massivecraft.mcore.xlib.gson.JsonObject; -import com.massivecraft.mcore.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber; -import com.massivecraft.mcore.xlib.mongodb.BasicDBList; -import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore.xlib.mongodb.DBObject; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; +import com.massivecraft.massivecore.xlib.mongodb.BasicDBList; +import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; +import com.massivecraft.massivecore.xlib.mongodb.DBObject; public final class GsonMongoConverter { diff --git a/src/com/massivecraft/mcore/store/IndexUniqueField.java b/src/com/massivecraft/massivecore/store/IndexUniqueField.java similarity index 92% rename from src/com/massivecraft/mcore/store/IndexUniqueField.java rename to src/com/massivecraft/massivecore/store/IndexUniqueField.java index 035d1bfc..8329947e 100644 --- a/src/com/massivecraft/mcore/store/IndexUniqueField.java +++ b/src/com/massivecraft/massivecore/store/IndexUniqueField.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore/store/JsonFileFilter.java b/src/com/massivecraft/massivecore/store/JsonFileFilter.java similarity index 90% rename from src/com/massivecraft/mcore/store/JsonFileFilter.java rename to src/com/massivecraft/massivecore/store/JsonFileFilter.java index 98fd1a8a..996f27c3 100644 --- a/src/com/massivecraft/mcore/store/JsonFileFilter.java +++ b/src/com/massivecraft/massivecore/store/JsonFileFilter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.io.File; import java.io.FileFilter; diff --git a/src/com/massivecraft/mcore/store/MStore.java b/src/com/massivecraft/massivecore/store/MStore.java similarity index 89% rename from src/com/massivecraft/mcore/store/MStore.java rename to src/com/massivecraft/massivecore/store/MStore.java index 1910350b..77088bf3 100644 --- a/src/com/massivecraft/mcore/store/MStore.java +++ b/src/com/massivecraft/massivecore/store/MStore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.net.URI; import java.net.URISyntaxException; @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import com.massivecraft.mcore.ConfServer; -import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.ConfServer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; public class MStore { diff --git a/src/com/massivecraft/mcore/store/MStoreUtil.java b/src/com/massivecraft/massivecore/store/MStoreUtil.java similarity index 87% rename from src/com/massivecraft/mcore/store/MStoreUtil.java rename to src/com/massivecraft/massivecore/store/MStoreUtil.java index 9e2cfc6d..df1baf7d 100644 --- a/src/com/massivecraft/mcore/store/MStoreUtil.java +++ b/src/com/massivecraft/massivecore/store/MStoreUtil.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import com.massivecraft.mcore.Predictate; +import com.massivecraft.massivecore.Predictate; public class MStoreUtil { diff --git a/src/com/massivecraft/mcore/store/ModificationState.java b/src/com/massivecraft/massivecore/store/ModificationState.java similarity index 89% rename from src/com/massivecraft/mcore/store/ModificationState.java rename to src/com/massivecraft/massivecore/store/ModificationState.java index 95e9b6b4..593a6ecd 100644 --- a/src/com/massivecraft/mcore/store/ModificationState.java +++ b/src/com/massivecraft/massivecore/store/ModificationState.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; public enum ModificationState { diff --git a/src/com/massivecraft/mcore/store/SenderColl.java b/src/com/massivecraft/massivecore/store/SenderColl.java similarity index 92% rename from src/com/massivecraft/mcore/store/SenderColl.java rename to src/com/massivecraft/massivecore/store/SenderColl.java index f9abdeb3..633babed 100644 --- a/src/com/massivecraft/mcore/store/SenderColl.java +++ b/src/com/massivecraft/massivecore/store/SenderColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.Collection; @@ -8,8 +8,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.Predictate; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.Predictate; +import com.massivecraft.massivecore.util.IdUtil; public class SenderColl> extends Coll implements SenderIdSource { diff --git a/src/com/massivecraft/mcore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java similarity index 91% rename from src/com/massivecraft/mcore/store/SenderEntity.java rename to src/com/massivecraft/massivecore/store/SenderEntity.java index ac0689d5..5d6401d2 100644 --- a/src/com/massivecraft/mcore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Collection; import java.util.UUID; @@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.IdUtil; public abstract class SenderEntity> extends Entity { diff --git a/src/com/massivecraft/mcore/store/SenderIdSource.java b/src/com/massivecraft/massivecore/store/SenderIdSource.java similarity index 71% rename from src/com/massivecraft/mcore/store/SenderIdSource.java rename to src/com/massivecraft/massivecore/store/SenderIdSource.java index 641521e1..17f22fa8 100644 --- a/src/com/massivecraft/mcore/store/SenderIdSource.java +++ b/src/com/massivecraft/massivecore/store/SenderIdSource.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/store/SenderIdSourceCombined.java b/src/com/massivecraft/massivecore/store/SenderIdSourceCombined.java similarity index 92% rename from src/com/massivecraft/mcore/store/SenderIdSourceCombined.java rename to src/com/massivecraft/massivecore/store/SenderIdSourceCombined.java index 6e8c81e8..88e89e76 100644 --- a/src/com/massivecraft/mcore/store/SenderIdSourceCombined.java +++ b/src/com/massivecraft/massivecore/store/SenderIdSourceCombined.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java similarity index 86% rename from src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java rename to src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java index e6f1a468..ca917b8b 100644 --- a/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java +++ b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore.store; +package com.massivecraft.massivecore.store; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.util.IdUtil; public class SenderIdSourceMixinAllSenderIds implements SenderIdSource { diff --git a/src/com/massivecraft/mcore/store/accessor/Accessor.java b/src/com/massivecraft/massivecore/store/accessor/Accessor.java similarity index 85% rename from src/com/massivecraft/mcore/store/accessor/Accessor.java rename to src/com/massivecraft/massivecore/store/accessor/Accessor.java index ccc3c307..65fe423a 100644 --- a/src/com/massivecraft/mcore/store/accessor/Accessor.java +++ b/src/com/massivecraft/massivecore/store/accessor/Accessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore/store/accessor/AccessorUtil.java b/src/com/massivecraft/massivecore/store/accessor/AccessorUtil.java similarity index 95% rename from src/com/massivecraft/mcore/store/accessor/AccessorUtil.java rename to src/com/massivecraft/massivecore/store/accessor/AccessorUtil.java index 00108cf8..2d29b9de 100644 --- a/src/com/massivecraft/mcore/store/accessor/AccessorUtil.java +++ b/src/com/massivecraft/massivecore/store/accessor/AccessorUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore/store/accessor/EntityAccessor.java b/src/com/massivecraft/massivecore/store/accessor/EntityAccessor.java similarity index 59% rename from src/com/massivecraft/mcore/store/accessor/EntityAccessor.java rename to src/com/massivecraft/massivecore/store/accessor/EntityAccessor.java index ae359ef2..48fd78a3 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntityAccessor.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntityAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface EntityAccessor extends EntitySetter, EntityGetter, EntityGlue { diff --git a/src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java b/src/com/massivecraft/massivecore/store/accessor/EntityAccessorAbstract.java similarity index 92% rename from src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java rename to src/com/massivecraft/massivecore/store/accessor/EntityAccessorAbstract.java index dee4b766..c092a0b6 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntityAccessorAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java b/src/com/massivecraft/massivecore/store/accessor/EntityAccessorPerProperty.java similarity index 93% rename from src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java rename to src/com/massivecraft/massivecore/store/accessor/EntityAccessorPerProperty.java index 3d2f1914..e096a125 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntityAccessorPerProperty.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.util.Collection; import java.util.HashMap; diff --git a/src/com/massivecraft/mcore/store/accessor/EntityGetter.java b/src/com/massivecraft/massivecore/store/accessor/EntityGetter.java similarity index 59% rename from src/com/massivecraft/mcore/store/accessor/EntityGetter.java rename to src/com/massivecraft/massivecore/store/accessor/EntityGetter.java index 266b6038..9d42f7d2 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntityGetter.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntityGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface EntityGetter { diff --git a/src/com/massivecraft/mcore/store/accessor/EntityGlue.java b/src/com/massivecraft/massivecore/store/accessor/EntityGlue.java similarity index 88% rename from src/com/massivecraft/mcore/store/accessor/EntityGlue.java rename to src/com/massivecraft/massivecore/store/accessor/EntityGlue.java index ab0e2aa3..8a8953da 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntityGlue.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntityGlue.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/store/accessor/EntitySetter.java b/src/com/massivecraft/massivecore/store/accessor/EntitySetter.java similarity index 62% rename from src/com/massivecraft/mcore/store/accessor/EntitySetter.java rename to src/com/massivecraft/massivecore/store/accessor/EntitySetter.java index 16b09b1c..8f1194e7 100644 --- a/src/com/massivecraft/mcore/store/accessor/EntitySetter.java +++ b/src/com/massivecraft/massivecore/store/accessor/EntitySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface EntitySetter { diff --git a/src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java b/src/com/massivecraft/massivecore/store/accessor/PropertyAccessor.java similarity index 57% rename from src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java rename to src/com/massivecraft/massivecore/store/accessor/PropertyAccessor.java index 4bdc4400..c28440b9 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertyAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface PropertyAccessor extends PropertySetter, PropertyGetter { diff --git a/src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java b/src/com/massivecraft/massivecore/store/accessor/PropertyAccessorComposite.java similarity index 85% rename from src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java rename to src/com/massivecraft/massivecore/store/accessor/PropertyAccessorComposite.java index 772474f7..5168bc5a 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertyAccessorComposite.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public class PropertyAccessorComposite implements PropertyAccessor { diff --git a/src/com/massivecraft/mcore/store/accessor/PropertyGetter.java b/src/com/massivecraft/massivecore/store/accessor/PropertyGetter.java similarity index 54% rename from src/com/massivecraft/mcore/store/accessor/PropertyGetter.java rename to src/com/massivecraft/massivecore/store/accessor/PropertyGetter.java index fbe45b9f..b9bd34cf 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertyGetter.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertyGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface PropertyGetter { diff --git a/src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java b/src/com/massivecraft/massivecore/store/accessor/PropertyGetterFieldReflection.java similarity index 83% rename from src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java rename to src/com/massivecraft/massivecore/store/accessor/PropertyGetterFieldReflection.java index 2300d329..7f9d6749 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertyGetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java b/src/com/massivecraft/massivecore/store/accessor/PropertyGetterMethodReflection.java similarity index 84% rename from src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java rename to src/com/massivecraft/massivecore/store/accessor/PropertyGetterMethodReflection.java index 19226e97..8678987e 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertyGetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore/store/accessor/PropertySetter.java b/src/com/massivecraft/massivecore/store/accessor/PropertySetter.java similarity index 58% rename from src/com/massivecraft/mcore/store/accessor/PropertySetter.java rename to src/com/massivecraft/massivecore/store/accessor/PropertySetter.java index ca3b0409..073cfca0 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertySetter.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; public interface PropertySetter { diff --git a/src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java b/src/com/massivecraft/massivecore/store/accessor/PropertySetterFieldReflection.java similarity index 83% rename from src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java rename to src/com/massivecraft/massivecore/store/accessor/PropertySetterFieldReflection.java index cf535095..561ae218 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertySetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java b/src/com/massivecraft/massivecore/store/accessor/PropertySetterMethodReflection.java similarity index 84% rename from src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java rename to src/com/massivecraft/massivecore/store/accessor/PropertySetterMethodReflection.java index df74c547..081a08cf 100644 --- a/src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java +++ b/src/com/massivecraft/massivecore/store/accessor/PropertySetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.store.accessor; +package com.massivecraft.massivecore.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore/teleport/EngineScheduledTeleport.java b/src/com/massivecraft/massivecore/teleport/EngineScheduledTeleport.java similarity index 86% rename from src/com/massivecraft/mcore/teleport/EngineScheduledTeleport.java rename to src/com/massivecraft/massivecore/teleport/EngineScheduledTeleport.java index 0ace92c6..2ce738dc 100644 --- a/src/com/massivecraft/mcore/teleport/EngineScheduledTeleport.java +++ b/src/com/massivecraft/massivecore/teleport/EngineScheduledTeleport.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -8,11 +8,11 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.EngineAbstract; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.util.IdUtil; -import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.massivecore.EngineAbstract; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; public class EngineScheduledTeleport extends EngineAbstract { @@ -62,7 +62,7 @@ public class EngineScheduledTeleport extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } @Override diff --git a/src/com/massivecraft/mcore/teleport/PSGetter.java b/src/com/massivecraft/massivecore/teleport/PSGetter.java similarity index 50% rename from src/com/massivecraft/mcore/teleport/PSGetter.java rename to src/com/massivecraft/massivecore/teleport/PSGetter.java index a77e0c1a..9126d05c 100644 --- a/src/com/massivecraft/mcore/teleport/PSGetter.java +++ b/src/com/massivecraft/massivecore/teleport/PSGetter.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; import java.io.Serializable; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public interface PSGetter extends Serializable { diff --git a/src/com/massivecraft/mcore/teleport/PSGetterAbstract.java b/src/com/massivecraft/massivecore/teleport/PSGetterAbstract.java similarity index 75% rename from src/com/massivecraft/mcore/teleport/PSGetterAbstract.java rename to src/com/massivecraft/massivecore/teleport/PSGetterAbstract.java index 6c287f10..7816a892 100644 --- a/src/com/massivecraft/mcore/teleport/PSGetterAbstract.java +++ b/src/com/massivecraft/massivecore/teleport/PSGetterAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; public abstract class PSGetterAbstract implements PSGetter { diff --git a/src/com/massivecraft/mcore/teleport/PSGetterPS.java b/src/com/massivecraft/massivecore/teleport/PSGetterPS.java similarity index 85% rename from src/com/massivecraft/mcore/teleport/PSGetterPS.java rename to src/com/massivecraft/massivecore/teleport/PSGetterPS.java index 95915508..c3eece5a 100644 --- a/src/com/massivecraft/mcore/teleport/PSGetterPS.java +++ b/src/com/massivecraft/massivecore/teleport/PSGetterPS.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.massivecore.ps.PS; public final class PSGetterPS extends PSGetterAbstract { diff --git a/src/com/massivecraft/mcore/teleport/PSGetterPlayer.java b/src/com/massivecraft/massivecore/teleport/PSGetterPlayer.java similarity index 80% rename from src/com/massivecraft/mcore/teleport/PSGetterPlayer.java rename to src/com/massivecraft/massivecore/teleport/PSGetterPlayer.java index 7c1cd643..1686ccfd 100644 --- a/src/com/massivecraft/mcore/teleport/PSGetterPlayer.java +++ b/src/com/massivecraft/massivecore/teleport/PSGetterPlayer.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.util.IdUtil; public final class PSGetterPlayer extends PSGetterAbstract { diff --git a/src/com/massivecraft/mcore/teleport/ScheduledTeleport.java b/src/com/massivecraft/massivecore/teleport/ScheduledTeleport.java similarity index 89% rename from src/com/massivecraft/mcore/teleport/ScheduledTeleport.java rename to src/com/massivecraft/massivecore/teleport/ScheduledTeleport.java index c103d8c7..a1c6c1ac 100644 --- a/src/com/massivecraft/mcore/teleport/ScheduledTeleport.java +++ b/src/com/massivecraft/massivecore/teleport/ScheduledTeleport.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore.teleport; +package com.massivecraft.massivecore.teleport; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.mixin.TeleporterException; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.mixin.TeleporterException; public class ScheduledTeleport implements Runnable { diff --git a/src/com/massivecraft/mcore/util/DiscUtil.java b/src/com/massivecraft/massivecore/util/DiscUtil.java similarity index 94% rename from src/com/massivecraft/mcore/util/DiscUtil.java rename to src/com/massivecraft/massivecore/util/DiscUtil.java index dc87b51c..1b996fcc 100644 --- a/src/com/massivecraft/mcore/util/DiscUtil.java +++ b/src/com/massivecraft/massivecore/util/DiscUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.io.*; diff --git a/src/com/massivecraft/mcore/util/EventUtil.java b/src/com/massivecraft/massivecore/util/EventUtil.java similarity index 95% rename from src/com/massivecraft/mcore/util/EventUtil.java rename to src/com/massivecraft/massivecore/util/EventUtil.java index 682df166..af986a1e 100644 --- a/src/com/massivecraft/mcore/util/EventUtil.java +++ b/src/com/massivecraft/massivecore/util/EventUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.lang.reflect.Field; import java.util.logging.Level; diff --git a/src/com/massivecraft/mcore/util/IdData.java b/src/com/massivecraft/massivecore/util/IdData.java similarity index 93% rename from src/com/massivecraft/mcore/util/IdData.java rename to src/com/massivecraft/massivecore/util/IdData.java index fd891a80..b929b86c 100644 --- a/src/com/massivecraft/mcore/util/IdData.java +++ b/src/com/massivecraft/massivecore/util/IdData.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; public class IdData { diff --git a/src/com/massivecraft/mcore/util/IdUpdateUtil.java b/src/com/massivecraft/massivecore/util/IdUpdateUtil.java similarity index 81% rename from src/com/massivecraft/mcore/util/IdUpdateUtil.java rename to src/com/massivecraft/massivecore/util/IdUpdateUtil.java index 293717e1..4a2b3951 100644 --- a/src/com/massivecraft/mcore/util/IdUpdateUtil.java +++ b/src/com/massivecraft/massivecore/util/IdUpdateUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.ArrayList; import java.util.Collection; @@ -6,9 +6,9 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.Entity; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.Entity; public class IdUpdateUtil { @@ -68,7 +68,7 @@ public class IdUpdateUtil public static > void update(Coll coll, boolean force) { long pre = System.currentTimeMillis(); - MCore.get().log(Txt.parse("Pre update %s.", coll.getName())); + MassiveCore.get().log(Txt.parse("Pre update %s.", coll.getName())); int countTotal = coll.getAll().size(); int countUpdate = 0; @@ -79,7 +79,7 @@ public class IdUpdateUtil long post = System.currentTimeMillis(); long delta = post - pre; - MCore.get().log(Txt.parse("Post update %s. Took %dms. %d/%d changed.", coll.getName(), delta, countUpdate, countTotal)); + MassiveCore.get().log(Txt.parse("Post update %s. Took %dms. %d/%d changed.", coll.getName(), delta, countUpdate, countTotal)); } public static > boolean update(Coll coll, E entity, boolean force) diff --git a/src/com/massivecraft/mcore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java similarity index 88% rename from src/com/massivecraft/mcore/util/IdUtil.java rename to src/com/massivecraft/massivecore/util/IdUtil.java index e5667d4e..86509d4c 100644 --- a/src/com/massivecraft/mcore/util/IdUtil.java +++ b/src/com/massivecraft/massivecore/util/IdUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.io.File; import java.io.FileInputStream; @@ -34,17 +34,17 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore.event.MCoreSenderRegisterEvent; -import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent; -import com.massivecraft.mcore.fetcher.Fetcher; -import com.massivecraft.mcore.fetcher.IdAndName; -import com.massivecraft.mcore.mixin.Mixin; -import com.massivecraft.mcore.store.Coll; -import com.massivecraft.mcore.store.SenderColl; -import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderRegister; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderUnregister; +import com.massivecraft.massivecore.fetcher.Fetcher; +import com.massivecraft.massivecore.fetcher.IdAndName; +import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.store.SenderColl; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; /** * Identification of a CommandSender can be done in 4 different ways. @@ -95,8 +95,8 @@ public class IdUtil implements Listener, Runnable // This is lock object is used when reading from and saving to this file. // Useful since saving might happen async. private final static Object CACHEFILE_LOCK = new Object(); - public final static File CACHEFILE = new File(MCore.get().getDataFolder(), "idnamecache.json"); - public final static File CACHEFILE_TEMP = new File(MCore.get().getDataFolder(), "idnamecache.json.temp"); + public final static File CACHEFILE = new File(MassiveCore.get().getDataFolder(), "idnamecache.json"); + public final static File CACHEFILE_TEMP = new File(MassiveCore.get().getDataFolder(), "idnamecache.json.temp"); public final static Type CACHEFILE_TYPE = new TypeToken>() {}.getType(); // -------------------------------------------- // @@ -156,7 +156,7 @@ public class IdUtil implements Listener, Runnable // Update data before the event is ran so that data is available. update(id, name, true); - MCoreSenderRegisterEvent event = new MCoreSenderRegisterEvent(sender, data); + EventMassiveCoreSenderRegister event = new EventMassiveCoreSenderRegister(sender, data); event.run(); } @@ -174,7 +174,7 @@ public class IdUtil implements Listener, Runnable // Update data before the event is ran so that data is available. update(id, name, false); - MCoreSenderUnregisterEvent event = new MCoreSenderUnregisterEvent(sender, data); + EventMassiveCoreSenderUnregister event = new EventMassiveCoreSenderUnregister(sender, data); event.run(); } @@ -352,7 +352,7 @@ public class IdUtil implements Listener, Runnable loadDatas(); // Since Console initially does not exist we schedule the register. - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() @@ -363,14 +363,14 @@ public class IdUtil implements Listener, Runnable // Cachefile long ticks = 20*60; // 5min - Bukkit.getScheduler().scheduleAsyncRepeatingTask(MCore.get(), get(), ticks, ticks); + Bukkit.getScheduler().scheduleAsyncRepeatingTask(MassiveCore.get(), get(), ticks, ticks); // Register Event Listeners - Bukkit.getPluginManager().registerEvents(get(), MCore.get()); + Bukkit.getPluginManager().registerEvents(get(), MassiveCore.get()); // Time: End long end = System.currentTimeMillis(); - MCore.get().log(Txt.parse("Setup of IdUtil took %dms.", end-start)); + MassiveCore.get().log(Txt.parse("Setup of IdUtil took %dms.", end-start)); } // -------------------------------------------- // @@ -415,7 +415,7 @@ public class IdUtil implements Listener, Runnable // Can't be cancelled @EventHandler(priority = EventPriority.HIGHEST) - public void playerLeaveMonitor(MCorePlayerLeaveEvent event) + public void playerLeaveMonitor(EventMassiveCorePlayerLeave event) { Player player = event.getPlayer(); UUID uuid = player.getUniqueId(); @@ -783,25 +783,25 @@ public class IdUtil implements Listener, Runnable public static void loadDatas() { - MCore.get().log(Txt.parse("Loading Playerdat datas...")); + MassiveCore.get().log(Txt.parse("Loading Playerdat datas...")); for (IdData data : getPlayerdatDatas()) { update(data.getId(), data.getName(), data.getMillis(), false); } - MCore.get().log(Txt.parse("Loading Cachefile datas...")); + MassiveCore.get().log(Txt.parse("Loading Cachefile datas...")); for (IdData data : getCachefileDatas()) { update(data.getId(), data.getName(), data.getMillis(), false); } - MCore.get().log(Txt.parse("Loading Onlineplayer datas...")); + MassiveCore.get().log(Txt.parse("Loading Onlineplayer datas...")); for (IdData data : getOnlineplayerDatas()) { update(data.getId(), data.getName(), data.getMillis(), true); } - MCore.get().log(Txt.parse("Loading Registry datas...")); + MassiveCore.get().log(Txt.parse("Loading Registry datas...")); for (String id : registryIdToSender.keySet()) { String name = id; @@ -810,7 +810,7 @@ public class IdUtil implements Listener, Runnable if (Bukkit.getServer().getOnlineMode()) { - MCore.get().log(Txt.parse("Loading Dbmojangapi datas...")); + MassiveCore.get().log(Txt.parse("Loading Dbmojangapi datas...")); for (IdData data : getDbmojangapiDatas()) { update(data.getId(), data.getName(), data.getMillis()); @@ -818,11 +818,11 @@ public class IdUtil implements Listener, Runnable } else { - MCore.get().log(Txt.parse("Skipping Dbmojangapi datas since offline mode...")); + MassiveCore.get().log(Txt.parse("Skipping Dbmojangapi datas since offline mode...")); } - MCore.get().log(Txt.parse("Saving Cachefile...")); + MassiveCore.get().log(Txt.parse("Saving Cachefile...")); saveCachefileDatas(); } @@ -834,7 +834,7 @@ public class IdUtil implements Listener, Runnable { synchronized (CACHEFILE_LOCK) { - String content = MCore.gson.toJson(datas, CACHEFILE_TYPE); + String content = MassiveCore.gson.toJson(datas, CACHEFILE_TYPE); DiscUtil.writeCatch(CACHEFILE_TEMP, content); if (!CACHEFILE_TEMP.exists()) return; CACHEFILE.delete(); @@ -848,7 +848,7 @@ public class IdUtil implements Listener, Runnable { String content = DiscUtil.readCatch(CACHEFILE); if (content == null) return new HashSet(); - Set ret = MCore.gson.fromJson(content, CACHEFILE_TYPE); + Set ret = MassiveCore.gson.fromJson(content, CACHEFILE_TYPE); return ret; } } @@ -864,7 +864,7 @@ public class IdUtil implements Listener, Runnable // -------------------------------------------- // // This data source is based on the player.dat files. // It extracts relevant NBT contents. - // NOTE: The reason this section contains some NMS is because MCore loads at startup. Some of the Bukkit API is broken then and I could not use it. + // NOTE: The reason this section contains some NMS is because MassiveCore loads at startup. Some of the Bukkit API is broken then and I could not use it. public static File getBaseworldDirectory() { @@ -959,7 +959,7 @@ public class IdUtil implements Listener, Runnable catch (Exception e) { String message = Txt.parse("NBT file couldn't be loaded: %s. Error: %s.", file.toString(), e.getMessage()); - MCore.get().log(message); + MassiveCore.get().log(message); return null; } } @@ -1018,7 +1018,7 @@ public class IdUtil implements Listener, Runnable } } } - MCore.get().log(Txt.parse("Player Strings Found: %d", strings.size())); + MassiveCore.get().log(Txt.parse("Player Strings Found: %d", strings.size())); // Remove Cached Iterator iter = strings.iterator(); @@ -1032,11 +1032,11 @@ public class IdUtil implements Listener, Runnable iter.remove(); } } - MCore.get().log(Txt.parse("Player Strings Cached: %d", cached)); - MCore.get().log(Txt.parse("Player Strings Remaining: %d", strings.size())); + MassiveCore.get().log(Txt.parse("Player Strings Cached: %d", cached)); + MassiveCore.get().log(Txt.parse("Player Strings Remaining: %d", strings.size())); // Fetch - MCore.get().log(Txt.parse("Now fetching the remaining players from Mojang API ...")); + MassiveCore.get().log(Txt.parse("Now fetching the remaining players from Mojang API ...")); Collection idAndNames = null; try { @@ -1047,7 +1047,7 @@ public class IdUtil implements Listener, Runnable e.printStackTrace(); return null; } - MCore.get().log(Txt.parse(" ... done!")); + MassiveCore.get().log(Txt.parse(" ... done!")); long millis = System.currentTimeMillis(); // Add diff --git a/src/com/massivecraft/mcore/util/IntervalUtil.java b/src/com/massivecraft/massivecore/util/IntervalUtil.java similarity index 90% rename from src/com/massivecraft/mcore/util/IntervalUtil.java rename to src/com/massivecraft/massivecore/util/IntervalUtil.java index 506b00fa..6abe37bf 100644 --- a/src/com/massivecraft/mcore/util/IntervalUtil.java +++ b/src/com/massivecraft/massivecore/util/IntervalUtil.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore.MCore; +import com.massivecraft.massivecore.MassiveCore; public class IntervalUtil { @@ -94,7 +94,7 @@ public class IntervalUtil public static int randomIntegerFromInterval(int min, int max) { - return min+MCore.random.nextInt(max-min+1); + return min+MassiveCore.random.nextInt(max-min+1); } public static int randomIntegerFromInterval(Entry interval) @@ -106,7 +106,7 @@ public class IntervalUtil public static double randomDoubleFromInterval(double min, double max) { - return min+MCore.random.nextDouble()*(max-min); + return min+MassiveCore.random.nextDouble()*(max-min); } public static double randomDoubleFromInterval(Entry interval) diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/massivecore/util/InventoryUtil.java similarity index 92% rename from src/com/massivecraft/mcore/util/InventoryUtil.java rename to src/com/massivecraft/massivecore/util/InventoryUtil.java index 8fb3147b..244f4e06 100644 --- a/src/com/massivecraft/mcore/util/InventoryUtil.java +++ b/src/com/massivecraft/massivecore/util/InventoryUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.HashMap; @@ -16,8 +16,8 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.inventory.MCorePlayerInventory; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.inventory.MassiveCorePlayerInventory; public class InventoryUtil { @@ -35,7 +35,7 @@ public class InventoryUtil public static void updateSoon(final HumanEntity human) { - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() @@ -47,7 +47,7 @@ public class InventoryUtil public static void updateLater(final HumanEntity human) { - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() @@ -167,7 +167,7 @@ public class InventoryUtil public static PlayerInventory createPlayerInventory() { - return new CraftInventoryPlayer(new MCorePlayerInventory()); + return new CraftInventoryPlayer(new MassiveCorePlayerInventory()); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/massivecore/util/LightUtil.java similarity index 93% rename from src/com/massivecraft/mcore/util/LightUtil.java rename to src/com/massivecraft/massivecore/util/LightUtil.java index 4d6cd7de..24734e18 100644 --- a/src/com/massivecraft/mcore/util/LightUtil.java +++ b/src/com/massivecraft/massivecore/util/LightUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import net.minecraft.server.v1_7_R3.WorldServer; diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java similarity index 91% rename from src/com/massivecraft/mcore/util/MUtil.java rename to src/com/massivecraft/massivecore/util/MUtil.java index b1db96af..b9ba3d0e 100644 --- a/src/com/massivecraft/mcore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -48,17 +48,17 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -import com.massivecraft.mcore.MCoreEngineMain; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.MCoreEngineWorldNameSet; -import com.massivecraft.mcore.util.extractor.Extractor; -import com.massivecraft.mcore.util.extractor.ExtractorPlayer; -import com.massivecraft.mcore.util.extractor.ExtractorPlayerName; -import com.massivecraft.mcore.util.extractor.ExtractorSender; -import com.massivecraft.mcore.util.extractor.ExtractorSenderId; -import com.massivecraft.mcore.util.extractor.ExtractorSenderName; -import com.massivecraft.mcore.util.extractor.ExtractorWorld; -import com.massivecraft.mcore.util.extractor.ExtractorWorldName; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveCoreEngineMain; +import com.massivecraft.massivecore.MassiveCoreEngineWorldNameSet; +import com.massivecraft.massivecore.util.extractor.Extractor; +import com.massivecraft.massivecore.util.extractor.ExtractorPlayer; +import com.massivecraft.massivecore.util.extractor.ExtractorPlayerName; +import com.massivecraft.massivecore.util.extractor.ExtractorSender; +import com.massivecraft.massivecore.util.extractor.ExtractorSenderId; +import com.massivecraft.massivecore.util.extractor.ExtractorSenderName; +import com.massivecraft.massivecore.util.extractor.ExtractorWorld; +import com.massivecraft.massivecore.util.extractor.ExtractorWorldName; public class MUtil { @@ -454,7 +454,7 @@ public class MUtil public static String kickReason(PlayerQuitEvent event) { - return MCoreEngineMain.kickedPlayerReasons.get(event.getPlayer().getName()); + return MassiveCoreEngineMain.kickedPlayerReasons.get(event.getPlayer().getName()); } public static boolean causedByKick(PlayerQuitEvent event) @@ -558,7 +558,7 @@ public class MUtil public static Set getLoadedWorldNames() { - return MCoreEngineWorldNameSet.get().getWorldNames(); + return MassiveCoreEngineWorldNameSet.get().getWorldNames(); } // -------------------------------------------- // @@ -650,7 +650,7 @@ public class MUtil { if (coll.size() == 0) return null; if (coll.size() == 1) return coll.iterator().next(); - int index = MCore.random.nextInt(coll.size()); + int index = MassiveCore.random.nextInt(coll.size()); List list = null; if (coll instanceof List) { @@ -669,7 +669,7 @@ public class MUtil if (count < 0) count = 0; while (ret.size() > count) { - int index = MCore.random.nextInt(ret.size()); + int index = MassiveCore.random.nextInt(ret.size()); ret.remove(index); } return ret; @@ -764,7 +764,7 @@ public class MUtil { long ret = (long) Math.floor(val); double prob = val % 1; - if (MCore.random.nextDouble() < prob) ret += 1; + if (MassiveCore.random.nextDouble() < prob) ret += 1; return ret; } diff --git a/src/com/massivecraft/mcore/util/PeriodUtil.java b/src/com/massivecraft/massivecore/util/PeriodUtil.java similarity index 94% rename from src/com/massivecraft/mcore/util/PeriodUtil.java rename to src/com/massivecraft/massivecore/util/PeriodUtil.java index e5346dda..c8a9d41d 100644 --- a/src/com/massivecraft/mcore/util/PeriodUtil.java +++ b/src/com/massivecraft/massivecore/util/PeriodUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore/util/PermUtil.java b/src/com/massivecraft/massivecore/util/PermUtil.java similarity index 92% rename from src/com/massivecraft/mcore/util/PermUtil.java rename to src/com/massivecraft/massivecore/util/PermUtil.java index 156cc0c8..51f6b168 100644 --- a/src/com/massivecraft/mcore/util/PermUtil.java +++ b/src/com/massivecraft/massivecore/util/PermUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.Map; import java.util.Map.Entry; @@ -9,9 +9,9 @@ import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -import com.massivecraft.mcore.Lang; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.event.MCorePermissionDeniedFormatEvent; +import com.massivecraft.massivecore.Lang; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; public class PermUtil { @@ -70,7 +70,7 @@ public class PermUtil public static String getDeniedFormat(String perm) { - MCorePermissionDeniedFormatEvent event = new MCorePermissionDeniedFormatEvent(perm); + EventMassiveCorePermissionDeniedFormat event = new EventMassiveCorePermissionDeniedFormat(perm); event.run(); String ret = event.getFormat(); if (ret == null) ret = Lang.PERM_DEFAULT_DENIED_FORMAT; @@ -120,7 +120,7 @@ public class PermUtil } else { - permissible.addAttachment(MCore.get(), permissionName, true); + permissible.addAttachment(MassiveCore.get(), permissionName, true); } } diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/massivecore/util/PlayerUtil.java similarity index 92% rename from src/com/massivecraft/mcore/util/PlayerUtil.java rename to src/com/massivecraft/massivecore/util/PlayerUtil.java index ab7335e1..db11830b 100644 --- a/src/com/massivecraft/mcore/util/PlayerUtil.java +++ b/src/com/massivecraft/massivecore/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.HashMap; import java.util.Map; @@ -25,11 +25,11 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore.EngineAbstract; -import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.event.EventMCorePlayerUpdate; -import com.massivecraft.mcore.event.MCoreAfterPlayerRespawnEvent; -import com.massivecraft.mcore.event.MCoreAfterPlayerTeleportEvent; +import com.massivecraft.massivecore.EngineAbstract; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerUpdate; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerTeleport; public class PlayerUtil extends EngineAbstract { @@ -65,7 +65,7 @@ public class PlayerUtil extends EngineAbstract @Override public Plugin getPlugin() { - return MCore.get(); + return MassiveCore.get(); } @Override @@ -92,7 +92,7 @@ public class PlayerUtil extends EngineAbstract public void isJoined(PlayerJoinEvent event) { final UUID id = event.getPlayer().getUniqueId(); - Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() { @Override public void run() @@ -358,7 +358,7 @@ public class PlayerUtil extends EngineAbstract public static void update(Player player) { - EventMCorePlayerUpdate event = new EventMCorePlayerUpdate(player); + EventMassiveCorePlayerUpdate event = new EventMassiveCorePlayerUpdate(player); event.run(); setMaxHealth(player, event.getMaxHealth()); @@ -392,7 +392,7 @@ public class PlayerUtil extends EngineAbstract } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void update(MCoreAfterPlayerTeleportEvent event) + public void update(EventMassiveCoreAfterPlayerTeleport event) { // If we have a player ... Player player = event.getPlayer(); @@ -405,7 +405,7 @@ public class PlayerUtil extends EngineAbstract } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void update(MCoreAfterPlayerRespawnEvent event) + public void update(EventMassiveCoreAfterPlayerRespawn event) { // If we have a player ... Player player = event.getPlayer(); diff --git a/src/com/massivecraft/mcore/util/SignUtil.java b/src/com/massivecraft/massivecore/util/SignUtil.java similarity index 95% rename from src/com/massivecraft/mcore/util/SignUtil.java rename to src/com/massivecraft/massivecore/util/SignUtil.java index 11ab17dc..6a062c87 100644 --- a/src/com/massivecraft/mcore/util/SignUtil.java +++ b/src/com/massivecraft/massivecore/util/SignUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.security.InvalidParameterException; import java.util.ArrayList; diff --git a/src/com/massivecraft/mcore/util/SmokeUtil.java b/src/com/massivecraft/massivecore/util/SmokeUtil.java similarity index 94% rename from src/com/massivecraft/mcore/util/SmokeUtil.java rename to src/com/massivecraft/massivecore/util/SmokeUtil.java index 370519c0..59d7a299 100644 --- a/src/com/massivecraft/mcore/util/SmokeUtil.java +++ b/src/com/massivecraft/massivecore/util/SmokeUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.Collection; import java.util.Random; diff --git a/src/com/massivecraft/mcore/util/TimeDiffUtil.java b/src/com/massivecraft/massivecore/util/TimeDiffUtil.java similarity index 95% rename from src/com/massivecraft/mcore/util/TimeDiffUtil.java rename to src/com/massivecraft/massivecore/util/TimeDiffUtil.java index f4a89597..5ad53ec9 100644 --- a/src/com/massivecraft/mcore/util/TimeDiffUtil.java +++ b/src/com/massivecraft/massivecore/util/TimeDiffUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/com/massivecraft/mcore/util/TimeUnit.java b/src/com/massivecraft/massivecore/util/TimeUnit.java similarity index 96% rename from src/com/massivecraft/mcore/util/TimeUnit.java rename to src/com/massivecraft/massivecore/util/TimeUnit.java index 9411b9c6..78ff1fbe 100644 --- a/src/com/massivecraft/mcore/util/TimeUnit.java +++ b/src/com/massivecraft/massivecore/util/TimeUnit.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/util/Txt.java b/src/com/massivecraft/massivecore/util/Txt.java similarity index 96% rename from src/com/massivecraft/mcore/util/Txt.java rename to src/com/massivecraft/massivecore/util/Txt.java index eb089e49..23ad382d 100644 --- a/src/com/massivecraft/mcore/util/Txt.java +++ b/src/com/massivecraft/massivecore/util/Txt.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.util.*; import java.util.AbstractMap.SimpleEntry; diff --git a/src/com/massivecraft/mcore/util/WebUtil.java b/src/com/massivecraft/massivecore/util/WebUtil.java similarity index 90% rename from src/com/massivecraft/mcore/util/WebUtil.java rename to src/com/massivecraft/massivecore/util/WebUtil.java index 610b280e..1c70f45b 100644 --- a/src/com/massivecraft/mcore/util/WebUtil.java +++ b/src/com/massivecraft/massivecore/util/WebUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util; +package com.massivecraft.massivecore.util; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/massivecraft/mcore/util/extractor/Extractor.java b/src/com/massivecraft/massivecore/util/extractor/Extractor.java similarity index 52% rename from src/com/massivecraft/mcore/util/extractor/Extractor.java rename to src/com/massivecraft/massivecore/util/extractor/Extractor.java index 0f486360..a561cd0e 100644 --- a/src/com/massivecraft/mcore/util/extractor/Extractor.java +++ b/src/com/massivecraft/massivecore/util/extractor/Extractor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public interface Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java similarity index 95% rename from src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java index 5f3b1083..842c8374 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; import org.bukkit.Location; import org.bukkit.World; @@ -25,8 +25,8 @@ import org.bukkit.event.vehicle.VehicleEnterEvent; import org.bukkit.event.vehicle.VehicleEvent; import org.bukkit.event.vehicle.VehicleExitEvent; -import com.massivecraft.mcore.ps.PS; -import com.massivecraft.mcore.util.IdUtil; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.IdUtil; public class ExtractorLogic { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorPlayer.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorPlayer.java index 7177ac79..784f01b7 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorPlayer implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorPlayerName.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorPlayerName.java index eff739cc..3eaaac9e 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorPlayerName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorPlayerName implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorSender.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorSender.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorSender.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorSender.java index 3b8a1056..3f9164d2 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorSender.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorSender.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorSender implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorSenderId.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorSenderId.java index 83339d4b..d67f5605 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorSenderId.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorSenderId implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorSenderName.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorSenderName.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorSenderName.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorSenderName.java index b0c76494..763e78be 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorSenderName.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorSenderName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorSenderName implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorWorld.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorWorld.java index 2fda8d85..cfd5b9ad 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorWorld.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorWorld implements Extractor { diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorWorldName.java similarity index 87% rename from src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java rename to src/com/massivecraft/massivecore/util/extractor/ExtractorWorldName.java index 37cd40a9..9cb7f5ba 100644 --- a/src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorWorldName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore.util.extractor; +package com.massivecraft.massivecore.util.extractor; public class ExtractorWorldName implements Extractor { diff --git a/src/com/massivecraft/mcore/xlib/bson/BSON.java b/src/com/massivecraft/massivecore/xlib/bson/BSON.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/BSON.java rename to src/com/massivecraft/massivecore/xlib/bson/BSON.java index bb202956..b97e74bb 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSON.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSON.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.nio.charset.Charset; import java.util.HashMap; @@ -26,7 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import java.util.regex.Pattern; -import com.massivecraft.mcore.xlib.bson.util.ClassMap; +import com.massivecraft.massivecore.xlib.bson.util.ClassMap; @SuppressWarnings({"rawtypes"}) public class BSON { diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONCallback.java b/src/com/massivecraft/massivecore/xlib/bson/BSONCallback.java similarity index 94% rename from src/com/massivecraft/mcore/xlib/bson/BSONCallback.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONCallback.java index 79af97f3..ea22cb32 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONCallback.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONCallback.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; public interface BSONCallback { diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java index d2050006..2abf1bd2 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java b/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java similarity index 88% rename from src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java index 5454a3e2..39be9e4e 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java @@ -11,9 +11,9 @@ * specific language governing permissions and limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.*; +import com.massivecraft.massivecore.xlib.bson.io.*; public interface BSONEncoder { diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONException.java b/src/com/massivecraft/massivecore/xlib/bson/BSONException.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/BSONException.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONException.java index 5adcc178..a0412bf6 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONException.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; /** * A general runtime exception raised in BSON processing. diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/BSONLazyDecoder.java similarity index 93% rename from src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONLazyDecoder.java index 6d3bb8d9..533825ce 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONLazyDecoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; /** * diff --git a/src/com/massivecraft/mcore/xlib/bson/BSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/BSONObject.java rename to src/com/massivecraft/massivecore/xlib/bson/BSONObject.java index 89a1d0af..6a414a55 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BSONObject.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.util.Map; import java.util.Set; diff --git a/src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java rename to src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java index bdecd29d..e13bf1a6 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.util.*; import java.util.regex.Pattern; -import com.massivecraft.mcore.xlib.bson.types.*; +import com.massivecraft.massivecore.xlib.bson.types.*; public class BasicBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONDecoder.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java rename to src/com/massivecraft/massivecore/xlib/bson/BasicBSONDecoder.java index 87afecfd..e39b3922 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONDecoder.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import static com.massivecraft.mcore.xlib.bson.BSON.*; +import static com.massivecraft.massivecore.xlib.bson.BSON.*; import java.io.*; -import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.io.PoolOutputBuffer; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; /** @@ -338,17 +338,17 @@ public class BasicBSONDecoder implements BSONDecoder { public int readInt() throws IOException { - return com.massivecraft.mcore.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); + return com.massivecraft.massivecore.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); } public int readIntBE() throws IOException { - return com.massivecraft.mcore.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); + return com.massivecraft.massivecore.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); } public long readLong() throws IOException { - return com.massivecraft.mcore.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); + return com.massivecraft.massivecore.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); } public double readDouble() diff --git a/src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONEncoder.java similarity index 85% rename from src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java rename to src/com/massivecraft/massivecore/xlib/bson/BasicBSONEncoder.java index a4e993bd..f5264521 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONEncoder.java @@ -16,32 +16,32 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import static com.massivecraft.mcore.xlib.bson.BSON.ARRAY; -import static com.massivecraft.mcore.xlib.bson.BSON.BINARY; -import static com.massivecraft.mcore.xlib.bson.BSON.BOOLEAN; -import static com.massivecraft.mcore.xlib.bson.BSON.B_BINARY; -import static com.massivecraft.mcore.xlib.bson.BSON.B_GENERAL; -import static com.massivecraft.mcore.xlib.bson.BSON.B_UUID; -import static com.massivecraft.mcore.xlib.bson.BSON.CODE; -import static com.massivecraft.mcore.xlib.bson.BSON.CODE_W_SCOPE; -import static com.massivecraft.mcore.xlib.bson.BSON.DATE; -import static com.massivecraft.mcore.xlib.bson.BSON.EOO; -import static com.massivecraft.mcore.xlib.bson.BSON.MAXKEY; -import static com.massivecraft.mcore.xlib.bson.BSON.MINKEY; -import static com.massivecraft.mcore.xlib.bson.BSON.NULL; -import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER; -import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_INT; -import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_LONG; -import static com.massivecraft.mcore.xlib.bson.BSON.OBJECT; -import static com.massivecraft.mcore.xlib.bson.BSON.OID; -import static com.massivecraft.mcore.xlib.bson.BSON.REGEX; -import static com.massivecraft.mcore.xlib.bson.BSON.STRING; -import static com.massivecraft.mcore.xlib.bson.BSON.SYMBOL; -import static com.massivecraft.mcore.xlib.bson.BSON.TIMESTAMP; -import static com.massivecraft.mcore.xlib.bson.BSON.UNDEFINED; -import static com.massivecraft.mcore.xlib.bson.BSON.regexFlags; +import static com.massivecraft.massivecore.xlib.bson.BSON.ARRAY; +import static com.massivecraft.massivecore.xlib.bson.BSON.BINARY; +import static com.massivecraft.massivecore.xlib.bson.BSON.BOOLEAN; +import static com.massivecraft.massivecore.xlib.bson.BSON.B_BINARY; +import static com.massivecraft.massivecore.xlib.bson.BSON.B_GENERAL; +import static com.massivecraft.massivecore.xlib.bson.BSON.B_UUID; +import static com.massivecraft.massivecore.xlib.bson.BSON.CODE; +import static com.massivecraft.massivecore.xlib.bson.BSON.CODE_W_SCOPE; +import static com.massivecraft.massivecore.xlib.bson.BSON.DATE; +import static com.massivecraft.massivecore.xlib.bson.BSON.EOO; +import static com.massivecraft.massivecore.xlib.bson.BSON.MAXKEY; +import static com.massivecraft.massivecore.xlib.bson.BSON.MINKEY; +import static com.massivecraft.massivecore.xlib.bson.BSON.NULL; +import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER; +import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER_INT; +import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER_LONG; +import static com.massivecraft.massivecore.xlib.bson.BSON.OBJECT; +import static com.massivecraft.massivecore.xlib.bson.BSON.OID; +import static com.massivecraft.massivecore.xlib.bson.BSON.REGEX; +import static com.massivecraft.massivecore.xlib.bson.BSON.STRING; +import static com.massivecraft.massivecore.xlib.bson.BSON.SYMBOL; +import static com.massivecraft.massivecore.xlib.bson.BSON.TIMESTAMP; +import static com.massivecraft.massivecore.xlib.bson.BSON.UNDEFINED; +import static com.massivecraft.massivecore.xlib.bson.BSON.regexFlags; import java.lang.reflect.Array; import java.nio.Buffer; @@ -55,18 +55,17 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; - -import com.massivecraft.mcore.xlib.bson.io.BasicOutputBuffer; -import com.massivecraft.mcore.xlib.bson.io.OutputBuffer; -import com.massivecraft.mcore.xlib.bson.types.BSONTimestamp; -import com.massivecraft.mcore.xlib.bson.types.Binary; -import com.massivecraft.mcore.xlib.bson.types.Code; -import com.massivecraft.mcore.xlib.bson.types.CodeWScope; -import com.massivecraft.mcore.xlib.bson.types.MaxKey; -import com.massivecraft.mcore.xlib.bson.types.MinKey; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; -import com.massivecraft.mcore.xlib.bson.types.Symbol; -import com.massivecraft.mcore.xlib.mongodb.DBRefBase; +import com.massivecraft.massivecore.xlib.bson.io.BasicOutputBuffer; +import com.massivecraft.massivecore.xlib.bson.io.OutputBuffer; +import com.massivecraft.massivecore.xlib.bson.types.BSONTimestamp; +import com.massivecraft.massivecore.xlib.bson.types.Binary; +import com.massivecraft.massivecore.xlib.bson.types.Code; +import com.massivecraft.massivecore.xlib.bson.types.CodeWScope; +import com.massivecraft.massivecore.xlib.bson.types.MaxKey; +import com.massivecraft.massivecore.xlib.bson.types.MinKey; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.types.Symbol; +import com.massivecraft.massivecore.xlib.mongodb.DBRefBase; /** * this is meant to be pooled or cached @@ -396,7 +395,7 @@ public class BasicBSONEncoder implements BSONEncoder { int before = _buf.getPosition(); _buf.write( data ); int after = _buf.getPosition(); - com.massivecraft.mcore.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); + com.massivecraft.massivecore.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); } protected void putUUID( String name , UUID val ){ diff --git a/src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java rename to src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java index d048d82a..6784413c 100644 --- a/src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java +++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java @@ -16,10 +16,11 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; // BSON -import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; + // Java import java.util.Map; @@ -308,7 +309,7 @@ public class BasicBSONObject extends LinkedHashMap implements BSO * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.massivecore.xlib.mongodb.util.JSON.serialize( this ); } public boolean equals( Object o ){ diff --git a/src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java b/src/com/massivecraft/massivecore/xlib/bson/EmptyBSONCallback.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java rename to src/com/massivecraft/massivecore/xlib/bson/EmptyBSONCallback.java index f5f2826a..52544a72 100644 --- a/src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java +++ b/src/com/massivecraft/massivecore/xlib/bson/EmptyBSONCallback.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; public class EmptyBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java rename to src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java index ecd9b7f4..f23b4e12 100644 --- a/src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java +++ b/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.util.HashMap; -import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer; /** * @author brendan diff --git a/src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONCallback.java similarity index 93% rename from src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java rename to src/com/massivecraft/massivecore/xlib/bson/LazyBSONCallback.java index 284173da..b6221f69 100644 --- a/src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java +++ b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONCallback.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; import java.util.List; import java.util.logging.Logger; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; -import com.massivecraft.mcore.xlib.mongodb.LazyDBObject; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.mongodb.LazyDBObject; /** diff --git a/src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONDecoder.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java rename to src/com/massivecraft/massivecore/xlib/bson/LazyBSONDecoder.java index 5857f768..9131b9b6 100644 --- a/src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONDecoder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.Bits; +import com.massivecraft.massivecore.xlib.bson.io.Bits; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONList.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java rename to src/com/massivecraft/massivecore/xlib/bson/LazyBSONList.java index 583de43b..4c404a5f 100644 --- a/src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java +++ b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONList.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer; import java.util.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java rename to src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java index 0d7f31e2..40157bd6 100644 --- a/src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java +++ b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore.xlib.bson.types.*; +import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.massivecore.xlib.bson.types.*; import java.io.IOException; import java.io.OutputStream; @@ -665,7 +665,7 @@ public class LazyBSONObject implements BSONObject { * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.massivecore.xlib.mongodb.util.JSON.serialize( this ); } /** diff --git a/src/com/massivecraft/mcore/xlib/bson/LazyDBList.java b/src/com/massivecraft/massivecore/xlib/bson/LazyDBList.java similarity index 81% rename from src/com/massivecraft/mcore/xlib/bson/LazyDBList.java rename to src/com/massivecraft/massivecore/xlib/bson/LazyDBList.java index e1a38314..fd8c54fa 100644 --- a/src/com/massivecraft/mcore/xlib/bson/LazyDBList.java +++ b/src/com/massivecraft/massivecore/xlib/bson/LazyDBList.java @@ -1,12 +1,12 @@ /** * */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore.xlib.mongodb.DBObject; -import com.massivecraft.mcore.xlib.mongodb.util.JSON; +import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.massivecore.xlib.mongodb.DBObject; +import com.massivecraft.massivecore.xlib.mongodb.util.JSON; /** * @author scotthernandez diff --git a/src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/NewBSONDecoder.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java rename to src/com/massivecraft/massivecore/xlib/bson/NewBSONDecoder.java index d71887d8..46b2db10 100644 --- a/src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java +++ b/src/com/massivecraft/massivecore/xlib/bson/NewBSONDecoder.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; -import com.massivecraft.mcore.xlib.bson.io.Bits; -import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.massivecore.xlib.bson.io.Bits; +import com.massivecraft.massivecore.xlib.bson.types.ObjectId; + +import static com.massivecraft.massivecore.xlib.bson.BSON.*; -import static com.massivecraft.mcore.xlib.bson.BSON.*; // Java import java.io.IOException; diff --git a/src/com/massivecraft/mcore/xlib/bson/Transformer.java b/src/com/massivecraft/massivecore/xlib/bson/Transformer.java similarity index 94% rename from src/com/massivecraft/mcore/xlib/bson/Transformer.java rename to src/com/massivecraft/massivecore/xlib/bson/Transformer.java index 25de8aac..29204d5e 100644 --- a/src/com/massivecraft/mcore/xlib/bson/Transformer.java +++ b/src/com/massivecraft/massivecore/xlib/bson/Transformer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson; +package com.massivecraft.massivecore.xlib.bson; public interface Transformer { diff --git a/src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java b/src/com/massivecraft/massivecore/xlib/bson/io/BSONByteBuffer.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java rename to src/com/massivecraft/massivecore/xlib/bson/io/BSONByteBuffer.java index f12e0cfb..52ad5641 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/BSONByteBuffer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; -import com.massivecraft.mcore.xlib.bson.*; +import com.massivecraft.massivecore.xlib.bson.*; import java.io.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java b/src/com/massivecraft/massivecore/xlib/bson/io/BasicOutputBuffer.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java rename to src/com/massivecraft/massivecore/xlib/bson/io/BasicOutputBuffer.java index c9028a6e..81dda29f 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/BasicOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/io/Bits.java b/src/com/massivecraft/massivecore/xlib/bson/io/Bits.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/io/Bits.java rename to src/com/massivecraft/massivecore/xlib/bson/io/Bits.java index c97be2e5..c3260446 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/Bits.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/Bits.java @@ -17,7 +17,7 @@ */ -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java b/src/com/massivecraft/massivecore/xlib/bson/io/OutputBuffer.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java rename to src/com/massivecraft/massivecore/xlib/bson/io/OutputBuffer.java index 41605424..496b25dc 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/OutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; import java.io.*; import java.security.*; @@ -114,7 +114,7 @@ public abstract class OutputBuffer extends OutputStream { throw new RuntimeException( "impossible" ); } - return com.massivecraft.mcore.xlib.mongodb.util.Util.toHex( md5.digest() ); + return com.massivecraft.massivecore.xlib.mongodb.util.Util.toHex( md5.digest() ); } public void writeInt( int x ){ diff --git a/src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java b/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java rename to src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java index 336cc7a6..d65cbbe4 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; import java.io.*; import java.util.*; @@ -227,8 +227,8 @@ public class PoolOutputBuffer extends OutputBuffer { private final Position _cur = new Position(); private final Position _end = new Position(); - private static com.massivecraft.mcore.xlib.bson.util.SimplePool _extra = - new com.massivecraft.mcore.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ + private static com.massivecraft.massivecore.xlib.bson.util.SimplePool _extra = + new com.massivecraft.massivecore.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ protected byte[] createNew(){ return new byte[BUF_SIZE]; diff --git a/src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java b/src/com/massivecraft/massivecore/xlib/bson/io/UTF8Encoding.java similarity index 99% rename from src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java rename to src/com/massivecraft/massivecore/xlib/bson/io/UTF8Encoding.java index 89742d24..45628c9b 100644 --- a/src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java +++ b/src/com/massivecraft/massivecore/xlib/bson/io/UTF8Encoding.java @@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. */ //package org.postgresql.core; -package com.massivecraft.mcore.xlib.bson.io; +package com.massivecraft.massivecore.xlib.bson.io; import java.io.IOException; import java.text.MessageFormat; diff --git a/src/com/massivecraft/mcore/xlib/bson/io/package.html b/src/com/massivecraft/massivecore/xlib/bson/io/package.html similarity index 100% rename from src/com/massivecraft/mcore/xlib/bson/io/package.html rename to src/com/massivecraft/massivecore/xlib/bson/io/package.html diff --git a/src/com/massivecraft/mcore/xlib/bson/package.html b/src/com/massivecraft/massivecore/xlib/bson/package.html similarity index 100% rename from src/com/massivecraft/mcore/xlib/bson/package.html rename to src/com/massivecraft/massivecore/xlib/bson/package.html diff --git a/src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java b/src/com/massivecraft/massivecore/xlib/bson/types/BSONTimestamp.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java rename to src/com/massivecraft/massivecore/xlib/bson/types/BSONTimestamp.java index 1c9d9535..24cda031 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/BSONTimestamp.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.io.Serializable; import java.util.Date; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java b/src/com/massivecraft/massivecore/xlib/bson/types/BasicBSONList.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java rename to src/com/massivecraft/massivecore/xlib/bson/types/BasicBSONList.java index 6e3ace34..c1a2389c 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/BasicBSONList.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; -import com.massivecraft.mcore.xlib.bson.*; -import com.massivecraft.mcore.xlib.bson.util.StringRangeSet; +import com.massivecraft.massivecore.xlib.bson.*; +import com.massivecraft.massivecore.xlib.bson.util.StringRangeSet; import java.util.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/Binary.java b/src/com/massivecraft/massivecore/xlib/bson/types/Binary.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/types/Binary.java rename to src/com/massivecraft/massivecore/xlib/bson/types/Binary.java index 1c59d18e..3f9a4550 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/Binary.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/Binary.java @@ -19,9 +19,9 @@ * under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; -import com.massivecraft.mcore.xlib.bson.BSON; +import com.massivecraft.massivecore.xlib.bson.BSON; import java.io.Serializable; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/Code.java b/src/com/massivecraft/massivecore/xlib/bson/types/Code.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/types/Code.java rename to src/com/massivecraft/massivecore/xlib/bson/types/Code.java index 5ee86c94..f05b53a6 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/Code.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/Code.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java b/src/com/massivecraft/massivecore/xlib/bson/types/CodeWScope.java similarity index 92% rename from src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java rename to src/com/massivecraft/massivecore/xlib/bson/types/CodeWScope.java index cd6047f1..282655cc 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/CodeWScope.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; -import com.massivecraft.mcore.xlib.bson.*; +import com.massivecraft.massivecore.xlib.bson.*; /** * for using the CodeWScope type diff --git a/src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java b/src/com/massivecraft/massivecore/xlib/bson/types/MaxKey.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java rename to src/com/massivecraft/massivecore/xlib/bson/types/MaxKey.java index fbe9a7c4..0e79c6d9 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/MaxKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/MinKey.java b/src/com/massivecraft/massivecore/xlib/bson/types/MinKey.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/types/MinKey.java rename to src/com/massivecraft/massivecore/xlib/bson/types/MinKey.java index b18bfa0f..17a3e270 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/MinKey.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/MinKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java b/src/com/massivecraft/massivecore/xlib/bson/types/ObjectId.java similarity index 99% rename from src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java rename to src/com/massivecraft/massivecore/xlib/bson/types/ObjectId.java index d7390121..e9d5a962 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/ObjectId.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.net.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/Symbol.java b/src/com/massivecraft/massivecore/xlib/bson/types/Symbol.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/types/Symbol.java rename to src/com/massivecraft/massivecore/xlib/bson/types/Symbol.java index 9357d701..e8d271b2 100644 --- a/src/com/massivecraft/mcore/xlib/bson/types/Symbol.java +++ b/src/com/massivecraft/massivecore/xlib/bson/types/Symbol.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.types; +package com.massivecraft.massivecore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore/xlib/bson/types/package.html b/src/com/massivecraft/massivecore/xlib/bson/types/package.html similarity index 100% rename from src/com/massivecraft/mcore/xlib/bson/types/package.html rename to src/com/massivecraft/massivecore/xlib/bson/types/package.html diff --git a/src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java rename to src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java index 8eeb2aca..69bfc88b 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; -import static com.massivecraft.mcore.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.massivecore.xlib.bson.util.Assertions.notNull; import static java.util.Collections.unmodifiableCollection; import static java.util.Collections.unmodifiableSet; -import com.massivecraft.mcore.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.massivecore.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.massivecore.xlib.bson.util.annotations.ThreadSafe; import java.io.Serializable; import java.util.Collection; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/Assertions.java b/src/com/massivecraft/massivecore/xlib/bson/util/Assertions.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/util/Assertions.java rename to src/com/massivecraft/massivecore/xlib/bson/util/Assertions.java index 727c993d..097cd165 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/Assertions.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/Assertions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; /** * Design by contract assertions. diff --git a/src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java b/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java similarity index 94% rename from src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java rename to src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java index 272c2620..9f9d86ba 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; -import static com.massivecraft.mcore.xlib.bson.util.CopyOnWriteMap.newHashMap; +import static com.massivecraft.massivecore.xlib.bson.util.CopyOnWriteMap.newHashMap; import static java.util.Collections.unmodifiableList; import java.util.ArrayList; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java rename to src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java index e0367c3c..f1d38c7c 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; import java.util.List; import java.util.Map; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java similarity index 94% rename from src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java rename to src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java index 8954ce00..1965b5d5 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; -import static com.massivecraft.mcore.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.massivecore.xlib.bson.util.Assertions.notNull; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java rename to src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java index 6dd42466..936e1df9 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; import java.util.Collections; import java.util.HashMap; @@ -23,10 +23,9 @@ import java.util.Map; import java.util.TreeMap; import java.util.WeakHashMap; - -import com.massivecraft.mcore.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; -import com.massivecraft.mcore.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.massivecore.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; +import com.massivecraft.massivecore.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.massivecore.xlib.bson.util.annotations.ThreadSafe; /** * A thread-safe variant of {@link Map} in which all mutative operations (the diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/Function.java b/src/com/massivecraft/massivecore/xlib/bson/util/Function.java new file mode 100644 index 00000000..c4b2d2ea --- /dev/null +++ b/src/com/massivecraft/massivecore/xlib/bson/util/Function.java @@ -0,0 +1,5 @@ +package com.massivecraft.massivecore.xlib.bson.util; + +interface Function { + B apply(A a); +} diff --git a/src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java b/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java rename to src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java index 2dae4776..9b03233a 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; import java.util.*; import java.util.concurrent.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java b/src/com/massivecraft/massivecore/xlib/bson/util/StringRangeSet.java similarity index 98% rename from src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java rename to src/com/massivecraft/massivecore/xlib/bson/util/StringRangeSet.java index 4bc6d646..fccacbaa 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/StringRangeSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore.xlib.bson.util; +package com.massivecraft.massivecore.xlib.bson.util; import java.util.Collection; import java.util.Iterator; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/GuardedBy.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java rename to src/com/massivecraft/massivecore/xlib/bson/util/annotations/GuardedBy.java index 66fde85b..84dbf155 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/GuardedBy.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore.xlib.bson.util.annotations; +package com.massivecraft.massivecore.xlib.bson.util.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/Immutable.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java rename to src/com/massivecraft/massivecore/xlib/bson/util/annotations/Immutable.java index 12ac413a..f24b1c8c 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/Immutable.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore.xlib.bson.util.annotations; +package com.massivecraft.massivecore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/NotThreadSafe.java similarity index 92% rename from src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java rename to src/com/massivecraft/massivecore/xlib/bson/util/annotations/NotThreadSafe.java index b41ed388..066d4766 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/NotThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore.xlib.bson.util.annotations; +package com.massivecraft.massivecore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/ThreadSafe.java similarity index 92% rename from src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java rename to src/com/massivecraft/massivecore/xlib/bson/util/annotations/ThreadSafe.java index 970a5e20..97e862e0 100644 --- a/src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java +++ b/src/com/massivecraft/massivecore/xlib/bson/util/annotations/ThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore.xlib.bson.util.annotations; +package com.massivecraft.massivecore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore/xlib/bson/util/package.html b/src/com/massivecraft/massivecore/xlib/bson/util/package.html similarity index 100% rename from src/com/massivecraft/mcore/xlib/bson/util/package.html rename to src/com/massivecraft/massivecore/xlib/bson/util/package.html diff --git a/src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/DefaultDateTypeAdapter.java similarity index 86% rename from src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java rename to src/com/massivecraft/massivecore/xlib/gson/DefaultDateTypeAdapter.java index b4d4cefe..8374d10c 100644 --- a/src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java +++ b/src/com/massivecraft/massivecore/xlib/gson/DefaultDateTypeAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; import java.lang.reflect.Type; import java.sql.Timestamp; @@ -25,15 +25,15 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import com.massivecraft.mcore.xlib.gson.DefaultDateTypeAdapter; -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.JsonPrimitive; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; -import com.massivecraft.mcore.xlib.gson.JsonSyntaxException; +import com.massivecraft.massivecore.xlib.gson.DefaultDateTypeAdapter; +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.JsonPrimitive; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException; /** * This type adapter supports three subclasses of date: Date, Timestamp, and diff --git a/src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java b/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java similarity index 94% rename from src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java rename to src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java index 97e0707b..0a1926a7 100644 --- a/src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java +++ b/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; -import com.massivecraft.mcore.xlib.gson.ExclusionStrategy; -import com.massivecraft.mcore.xlib.gson.FieldAttributes; -import com.massivecraft.mcore.xlib.gson.GsonBuilder; +import com.massivecraft.massivecore.xlib.gson.ExclusionStrategy; +import com.massivecraft.massivecore.xlib.gson.FieldAttributes; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; /** * A strategy (or policy) definition that is used to decide whether or not a field or top-level diff --git a/src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java b/src/com/massivecraft/massivecore/xlib/gson/FieldAttributes.java similarity index 97% rename from src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java rename to src/com/massivecraft/massivecore/xlib/gson/FieldAttributes.java index cb0085ae..d81de7dd 100644 --- a/src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java +++ b/src/com/massivecraft/massivecore/xlib/gson/FieldAttributes.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; -import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions; +import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingPolicy.java similarity index 95% rename from src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java rename to src/com/massivecraft/massivecore/xlib/gson/FieldNamingPolicy.java index 837cf0b1..da02ecec 100644 --- a/src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java +++ b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingPolicy.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; import java.lang.reflect.Field; -import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy; +import com.massivecraft.massivecore.xlib.gson.FieldNamingStrategy; /** * An enumeration that defines a few standard naming conventions for JSON field names. - * This enumeration should be used in conjunction with {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} - * to configure a {@link com.massivecraft.mcore.xlib.gson.Gson} instance to properly translate Java field + * This enumeration should be used in conjunction with {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder} + * to configure a {@link com.massivecraft.massivecore.xlib.gson.Gson} instance to properly translate Java field * names into the desired JSON field names. * * @author Inderjeet Singh diff --git a/src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java similarity index 96% rename from src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java rename to src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java index e3942d8a..6fda689f 100644 --- a/src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java +++ b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore/xlib/gson/Gson.java b/src/com/massivecraft/massivecore/xlib/gson/Gson.java similarity index 90% rename from src/com/massivecraft/mcore/xlib/gson/Gson.java rename to src/com/massivecraft/massivecore/xlib/gson/Gson.java index 21676e07..ce5514ed 100644 --- a/src/com/massivecraft/mcore/xlib/gson/Gson.java +++ b/src/com/massivecraft/massivecore/xlib/gson/Gson.java @@ -14,48 +14,48 @@ * limitations under the License. */ -package com.massivecraft.mcore.xlib.gson; +package com.massivecraft.massivecore.xlib.gson; -import com.massivecraft.mcore.xlib.gson.FieldNamingPolicy; -import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy; -import com.massivecraft.mcore.xlib.gson.Gson; -import com.massivecraft.mcore.xlib.gson.GsonBuilder; -import com.massivecraft.mcore.xlib.gson.InstanceCreator; -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.JsonIOException; -import com.massivecraft.mcore.xlib.gson.JsonNull; -import com.massivecraft.mcore.xlib.gson.JsonParseException; -import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore.xlib.gson.JsonSerializer; -import com.massivecraft.mcore.xlib.gson.JsonSyntaxException; -import com.massivecraft.mcore.xlib.gson.LongSerializationPolicy; -import com.massivecraft.mcore.xlib.gson.TypeAdapter; -import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory; -import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor; -import com.massivecraft.mcore.xlib.gson.internal.Excluder; -import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess; -import com.massivecraft.mcore.xlib.gson.internal.Primitives; -import com.massivecraft.mcore.xlib.gson.internal.Streams; -import com.massivecraft.mcore.xlib.gson.internal.bind.ArrayTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.BigDecimalTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.BigIntegerTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.CollectionTypeAdapterFactory; -import com.massivecraft.mcore.xlib.gson.internal.bind.DateTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader; -import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter; -import com.massivecraft.mcore.xlib.gson.internal.bind.MapTypeAdapterFactory; -import com.massivecraft.mcore.xlib.gson.internal.bind.ObjectTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; -import com.massivecraft.mcore.xlib.gson.internal.bind.SqlDateTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.TimeTypeAdapter; -import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters; -import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; -import com.massivecraft.mcore.xlib.gson.stream.JsonReader; -import com.massivecraft.mcore.xlib.gson.stream.JsonToken; -import com.massivecraft.mcore.xlib.gson.stream.JsonWriter; -import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException; +import com.massivecraft.massivecore.xlib.gson.FieldNamingPolicy; +import com.massivecraft.massivecore.xlib.gson.FieldNamingStrategy; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; +import com.massivecraft.massivecore.xlib.gson.InstanceCreator; +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.JsonIOException; +import com.massivecraft.massivecore.xlib.gson.JsonNull; +import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; +import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException; +import com.massivecraft.massivecore.xlib.gson.LongSerializationPolicy; +import com.massivecraft.massivecore.xlib.gson.TypeAdapter; +import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.internal.ConstructorConstructor; +import com.massivecraft.massivecore.xlib.gson.internal.Excluder; +import com.massivecraft.massivecore.xlib.gson.internal.GsonInternalAccess; +import com.massivecraft.massivecore.xlib.gson.internal.Primitives; +import com.massivecraft.massivecore.xlib.gson.internal.Streams; +import com.massivecraft.massivecore.xlib.gson.internal.bind.ArrayTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.BigDecimalTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.BigIntegerTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.CollectionTypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.internal.bind.DateTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeReader; +import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeWriter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.MapTypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.internal.bind.ObjectTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.internal.bind.SqlDateTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.TimeTypeAdapter; +import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; +import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; +import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException; import java.io.EOFException; import java.io.IOException; @@ -109,7 +109,7 @@ import java.util.Map; *

See the Gson User Guide * for a more complete set of examples.

* - * @see com.massivecraft.mcore.xlib.gson.reflect.TypeToken + * @see com.massivecraft.massivecore.xlib.gson.reflect.TypeToken * * @author Inderjeet Singh * @author Joel Leitch @@ -180,10 +180,10 @@ public final class Gson { * ignores the millisecond portion of the date during serialization. You can change * this by invoking {@link GsonBuilder#setDateFormat(int)} or * {@link GsonBuilder#setDateFormat(String)}. - *
  • By default, Gson ignores the {@link com.massivecraft.mcore.xlib.gson.annotations.Expose} annotation. + *
  • By default, Gson ignores the {@link com.massivecraft.massivecore.xlib.gson.annotations.Expose} annotation. * You can enable Gson to serialize/deserialize only those fields marked with this annotation * through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}.
    • - *
  • By default, Gson ignores the {@link com.massivecraft.mcore.xlib.gson.annotations.Since} annotation. You + *
  • By default, Gson ignores the {@link com.massivecraft.massivecore.xlib.gson.annotations.Since} annotation. You * can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.
    • *
  • The default field naming policy for the output Json is same as in Java. So, a Java class * field versionNumber will be output as "versionNumber@quot; in @@ -444,7 +444,7 @@ public final class Gson { * * @param src the object for which JSON representation is to be created * @param typeOfSrc The specific genericized type of src. You can obtain - * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, + * this type by using the {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example, * to get the type for {@code Collection}, you should use: * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -486,7 +486,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -528,7 +528,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -670,7 +670,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the string from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -723,7 +723,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the reader producing Json from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -820,7 +820,7 @@ public final class Gson {
    * @param json the root of the parse tree of {@link JsonElement}s from which the object is to
    * be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.massivecore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
diff --git a/src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java
rename to src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
index 8cc1b902..aaefe674 100644
--- a/src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -26,25 +26,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.massivecraft.mcore.xlib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore.xlib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore.xlib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.DefaultDateTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.ExclusionStrategy;
+import com.massivecraft.massivecore.xlib.gson.FieldNamingPolicy;
+import com.massivecraft.massivecore.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
+import com.massivecraft.massivecore.xlib.gson.InstanceCreator;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.LongSerializationPolicy;
+import com.massivecraft.massivecore.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.internal.Excluder;
+import com.massivecraft.massivecore.xlib.gson.internal.Primitives;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 /**
  * 
    Use this builder to construct a {@link Gson} instance when you need to set configuration
@@ -152,7 +152,7 @@ public final class GsonBuilder {
 
   /**
    * Configures Gson to exclude all fields from consideration for serialization or deserialization
-   * that do not have the {@link com.massivecraft.mcore.xlib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.massivecore.xlib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java b/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java
rename to src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
index fe5e2d63..209e86bc 100644
--- a/src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore.xlib.gson.GsonBuilder;
+import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
 
 /**
  * This interface is implemented to create instances of a class that does not define a no-args
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonArray.java b/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/JsonArray.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
index 0f9d7d3e..5339b8e7 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonArray.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -22,10 +22,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 
 /**
  * A class representing an array type in Json. An array is a list of {@link JsonElement}s each of
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
index 21539ab7..dafb4977 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 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;
 
 /**
  * Context for deserialization that is passed to a custom deserializer during invocation of its
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
similarity index 90%
rename from src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
index d0dacc07..0d03f96e 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
 
 /**
  * 
    Interface representing a custom deserializer for Json. You should write a custom
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonElement.java b/src/com/massivecraft/massivecore/xlib/gson/JsonElement.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/JsonElement.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonElement.java
index 646d2622..9e743119 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonElement.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonElement.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.internal.Streams;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.internal.Streams;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonIOException.java b/src/com/massivecraft/massivecore/xlib/gson/JsonIOException.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/gson/JsonIOException.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonIOException.java
index 4e8082e7..eaec202b 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonIOException.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonIOException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonNull.java b/src/com/massivecraft/massivecore/xlib/gson/JsonNull.java
similarity index 86%
rename from src/com/massivecraft/mcore/xlib/gson/JsonNull.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonNull.java
index fa3b58a6..7d286017 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonNull.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonNull.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
 
 /**
  * A class representing a Json {@code null} value.
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonObject.java b/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/gson/JsonObject.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
index 03859a54..72a339b2 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonObject.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonParseException.java b/src/com/massivecraft/massivecore/xlib/gson/JsonParseException.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/gson/JsonParseException.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonParseException.java
index 8f81423b..d08e9c9f 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonParseException.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonParseException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonParser.java b/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java
similarity index 80%
rename from src/com/massivecraft/mcore/xlib/gson/JsonParser.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonParser.java
index 88b1fec8..c06fd91e 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonParser.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.internal.Streams;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.internal.Streams;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java b/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java
index 3447752f..7e35d69d 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
similarity index 88%
rename from src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
index a9dd404b..fd36c2b6 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
 /**
  * Context for serialization that is passed to a custom serializer during invocation of its
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
similarity index 90%
rename from src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
index bea9b938..efa5f99d 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
 
 /**
  * Interface representing a custom serializer for Json. You should write a custom serializer, if
  * you are not happy with the default serialization done by Gson. You will also need to register
- * this serializer through {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * 
    Let us look at example where defining a serializer will be useful. The {@code Id} class
  * defined below has two fields: {@code clazz} and {@code value}.
    
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java b/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java
similarity index 86%
rename from src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java
index 81736899..3467a15d 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,14 +22,14 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.internal.Streams;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.internal.Streams;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java b/src/com/massivecraft/massivecore/xlib/gson/JsonSyntaxException.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java
rename to src/com/massivecraft/massivecore/xlib/gson/JsonSyntaxException.java
index a69e7a1a..0b6dfc24 100644
--- a/src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonSyntaxException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java b/src/com/massivecraft/massivecore/xlib/gson/LongSerializationPolicy.java
similarity index 91%
rename from src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/massivecore/xlib/gson/LongSerializationPolicy.java
index 542724bb..d77ff2ec 100644
--- a/src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/LongSerializationPolicy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
index 250602c4..1c2a220f 100644
--- a/src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore.xlib.gson.internal.Streams;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import com.massivecraft.massivecore.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.internal.Streams;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/TypeAdapter.java
similarity index 91%
rename from src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/TypeAdapter.java
index ee7a9866..4a53ffbf 100644
--- a/src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/TypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -138,7 +138,7 @@ public abstract class TypeAdapter {
    * Unlike Gson's similar {@link Gson#toJson(JsonElement, Appendable) toJson}
    * method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.massivecore.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
@@ -211,7 +211,7 @@ public abstract class TypeAdapter {
    * Converts {@code value} to a JSON document. Unlike Gson's similar {@link
    * Gson#toJson(Object) toJson} method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.massivecore.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
diff --git a/src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/TypeAdapterFactory.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java
rename to src/com/massivecraft/massivecore/xlib/gson/TypeAdapterFactory.java
index 1cb8299a..723cb4be 100644
--- a/src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/TypeAdapterFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson;
+package com.massivecraft.massivecore.xlib.gson;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 /**
  * Creates type adapters for set of related types. Type adapter factories are
@@ -82,7 +82,7 @@ import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
  * mapping from lowercase name to enum value is computed eagerly.
  *
  * 
    As with type adapters, factories must be registered with a {@link
- * com.massivecraft.mcore.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
+ * com.massivecraft.massivecore.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
  *
  *  GsonBuilder builder = new GsonBuilder();
  *  builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
diff --git a/src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java
rename to src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
index ecb724a0..ec24a2ba 100644
--- a/src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.annotations;
+package com.massivecraft.massivecore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be exposed for JSON
  * serialization or deserialization.
  *
- * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson}
- * with a {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * 
    This annotation has no effect unless you build {@link com.massivecraft.massivecore.xlib.gson.Gson}
+ * with a {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/SerializedName.java
similarity index 85%
rename from src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/massivecore/xlib/gson/annotations/SerializedName.java
index 6afdd34b..57049e2a 100644
--- a/src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.annotations;
+package com.massivecraft.massivecore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
  *
- * 
    This annotation will override any {@link com.massivecraft.mcore.xlib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore.xlib.gson.Gson}
+ * 
    This annotation will override any {@link com.massivecraft.massivecore.xlib.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.massivecore.xlib.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore.xlib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.massivecore.xlib.gson.FieldNamingPolicy)}
  * for more information.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * 
    NOTE: The value you specify in this annotation must be a valid JSON field name.
    
  *
- * @see com.massivecraft.mcore.xlib.gson.FieldNamingPolicy
+ * @see com.massivecraft.massivecore.xlib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/massivecraft/mcore/xlib/gson/annotations/Since.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/Since.java
similarity index 88%
rename from src/com/massivecraft/mcore/xlib/gson/annotations/Since.java
rename to src/com/massivecraft/massivecore/xlib/gson/annotations/Since.java
index 15d1010c..b2a3005a 100644
--- a/src/com/massivecraft/mcore/xlib/gson/annotations/Since.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.annotations;
+package com.massivecraft.massivecore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,9 +26,9 @@ import java.lang.annotation.Target;
  * This annotation is useful to manage versioning of your Json classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.massivecore.xlib.gson.Gson} with a
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore/xlib/gson/annotations/Until.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/Until.java
similarity index 89%
rename from src/com/massivecraft/mcore/xlib/gson/annotations/Until.java
rename to src/com/massivecraft/massivecore/xlib/gson/annotations/Until.java
index 45c47cef..9686f1ee 100644
--- a/src/com/massivecraft/mcore/xlib/gson/annotations/Until.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.annotations;
+package com.massivecraft.massivecore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
  * is useful to manage versioning of your JSON classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.massivecore.xlib.gson.Gson} with a
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/package-info.java
similarity index 52%
rename from src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java
rename to src/com/massivecraft/massivecore/xlib/gson/annotations/package-info.java
index 8aed3f73..14ad1187 100644
--- a/src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore.xlib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.massivecore.xlib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore.xlib.gson.annotations;
\ No newline at end of file
+package com.massivecraft.massivecore.xlib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Preconditions.java
similarity index 91%
rename from src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Preconditions.java
index e93c2139..795b9ddc 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java
index b554b2d7..88cc003d 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import static com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
index 8ca24b1c..69b45f32 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.UnsafeAllocator;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.InstanceCreator;
+import com.massivecraft.massivecore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
similarity index 88%
rename from src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
index 349d2b7d..631aa7e5 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore.xlib.gson.FieldAttributes;
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.annotations.Expose;
-import com.massivecraft.mcore.xlib.gson.annotations.Since;
-import com.massivecraft.mcore.xlib.gson.annotations.Until;
-import com.massivecraft.mcore.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.ExclusionStrategy;
+import com.massivecraft.massivecore.xlib.gson.FieldAttributes;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.annotations.Expose;
+import com.massivecraft.massivecore.xlib.gson.annotations.Since;
+import com.massivecraft.massivecore.xlib.gson.annotations.Until;
+import com.massivecraft.massivecore.xlib.gson.internal.Excluder;
+import com.massivecraft.massivecore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java b/src/com/massivecraft/massivecore/xlib/gson/internal/GsonInternalAccess.java
similarity index 75%
rename from src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/GsonInternalAccess.java
index f0129d50..b78c7096 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/GsonInternalAccess.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 /**
  * Internal-only APIs of Gson available only to other classes in Gson.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java b/src/com/massivecraft/massivecore/xlib/gson/internal/JsonReaderInternalAccess.java
similarity index 82%
rename from src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/JsonReaderInternalAccess.java
index 1ae830c7..c905a090 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/JsonReaderInternalAccess.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/massivecore/xlib/gson/internal/LazilyParsedNumber.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/LazilyParsedNumber.java
index 29bc3485..ca52f2ec 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/LazilyParsedNumber.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
 import java.math.BigInteger;
 
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
index 91794ee2..a6978aab 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
 /**
  * Defines a generic object construction factory.  The purpose of this class
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/Pair.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Pair.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/gson/internal/Pair.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/Pair.java
index 08eac0a0..f75acdcf 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/Pair.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Pair.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.internal.Pair;
+import com.massivecraft.massivecore.xlib.gson.internal.Pair;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
index 7127c3be..23d94356 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
 
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/Streams.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Streams.java
similarity index 82%
rename from src/com/massivecraft/mcore/xlib/gson/internal/Streams.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/Streams.java
index cc2e3c33..a3029fa8 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/Streams.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonParseException;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
-import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/massivecore/xlib/gson/internal/UnsafeAllocator.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/UnsafeAllocator.java
index 6fa45af7..31194392 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/UnsafeAllocator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal;
+package com.massivecraft.massivecore.xlib.gson.internal;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import com.massivecraft.mcore.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.massivecore.xlib.gson.internal.UnsafeAllocator;
 
 /**
  * Do sneaky things to allocate objects without invoking their constructors.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 79%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
index 250ddd90..56aa0190 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -23,16 +23,16 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore.xlib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.ArrayTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 /**
  * Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 76%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
index 6e4778ca..6f8dad26 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 76%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
index a361c7d2..bf3e35dd 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 78%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
index af55458b..f5ec6135 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.massivecore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/DateTypeAdapter.java
similarity index 81%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/DateTypeAdapter.java
index eb90e853..85e4bd46 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/DateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.DateTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
index 20198d75..83f59361 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
index dc5c5324..741ce4d0 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
index 21290314..219fc65c 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.Streams;
-import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.massivecore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.Streams;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -65,9 +65,9 @@ import java.util.Map;
  * But GSON is unable to deserialize this value because the JSON string name is
  * just the {@link Object#toString() toString()} of the map key. Attempting to
  * convert the above JSON to an object fails with a parse exception:
- * 
    com.massivecraft.mcore2.lib.gson.JsonParseException: Expecting object found: "(5,6)"
- *   at com.massivecraft.mcore2.lib.gson.JsonObjectDeserializationVisitor.visitFieldUsingCustomHandler
- *   at com.massivecraft.mcore2.lib.gson.ObjectNavigator.navigateClassFields
+ * 
    com.massivecraft.massivecore.xlib.gson.JsonParseException: Expecting object found: "(5,6)"
+ *   at com.massivecraft.massivecore.xlib.gson.JsonObjectDeserializationVisitor.visitFieldUsingCustomHandler
+ *   at com.massivecraft.massivecore.xlib.gson.ObjectNavigator.navigateClassFields
  *   ...
    
  *
  * 
    Maps as JSON arrays
    
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 82%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
index 42b73aaa..ea18c4ee 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.ObjectTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 082e88c3..cf344843 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.massivecore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.Excluder;
+import com.massivecraft.massivecore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.massivecore.xlib.gson.internal.Primitives;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 76%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
index 1da275a3..f946e815 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.SqlDateTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TimeTypeAdapter.java
similarity index 76%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/TimeTypeAdapter.java
index e022ee57..b9911a2d 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.TimeTypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.sql.Time;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 83%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 83a4d2f5..11a848b6 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
index ef77b108..4695c67a 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.internal.bind;
+package com.massivecraft.massivecore.xlib.gson.internal.bind;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -32,22 +32,22 @@ import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import com.massivecraft.mcore.xlib.gson.Gson;
-import com.massivecraft.mcore.xlib.gson.JsonArray;
-import com.massivecraft.mcore.xlib.gson.JsonElement;
-import com.massivecraft.mcore.xlib.gson.JsonIOException;
-import com.massivecraft.mcore.xlib.gson.JsonNull;
-import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.massivecraft.massivecore.xlib.gson.JsonArray;
+import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.massivecraft.massivecore.xlib.gson.JsonIOException;
+import com.massivecraft.massivecore.xlib.gson.JsonNull;
+import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapter;
+import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
+import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 /**
  * Type adapters for basic types.
diff --git a/src/com/massivecraft/mcore/xlib/gson/internal/package-info.java b/src/com/massivecraft/massivecore/xlib/gson/internal/package-info.java
similarity index 81%
rename from src/com/massivecraft/mcore/xlib/gson/internal/package-info.java
rename to src/com/massivecraft/massivecore/xlib/gson/internal/package-info.java
index c937dc07..d4e12421 100644
--- a/src/com/massivecraft/mcore/xlib/gson/internal/package-info.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package com.massivecraft.mcore.xlib.gson.internal;
\ No newline at end of file
+package com.massivecraft.massivecore.xlib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/massivecore/xlib/gson/package-info.java b/src/com/massivecraft/massivecore/xlib/gson/package-info.java
new file mode 100644
index 00000000..62e9c8b5
--- /dev/null
+++ b/src/com/massivecraft/massivecore/xlib/gson/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This package provides the {@link com.massivecraft.massivecore.xlib.gson.Gson} class to convert Json to Java and
+ * vice-versa.
+ *
+ * 
    The primary class to use is {@link com.massivecraft.massivecore.xlib.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.massivecore.xlib.gson.GsonBuilder}
+ * (to configure various options such as using versioning and so on).
    
+ *
+ * @author Inderjeet Singh, Joel Leitch
+ */
+package com.massivecraft.massivecore.xlib.gson;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java b/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java
rename to src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
index 517bcccb..81c0f6f6 100644
--- a/src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.reflect;
+package com.massivecraft.massivecore.xlib.gson.reflect;
 
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java b/src/com/massivecraft/massivecore/xlib/gson/reflect/package-info.java
similarity index 72%
rename from src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java
rename to src/com/massivecraft/massivecore/xlib/gson/reflect/package-info.java
index 81c1dffd..fc075675 100644
--- a/src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore.xlib.gson.reflect;
\ No newline at end of file
+package com.massivecraft.massivecore.xlib.gson.reflect;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonReader.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/JsonReader.java
index 467ad586..3ba033b5 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
-import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
-import com.massivecraft.mcore.xlib.gson.stream.StringPool;
+import com.massivecraft.massivecore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.massivecore.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonScope;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonToken;
+import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.massivecore.xlib.gson.stream.StringPool;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonScope.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/JsonScope.java
index 9552948d..98d146b5 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonToken.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/JsonToken.java
index f40c5960..11c5d3b6 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonWriter.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/JsonWriter.java
index 90ded3e2..5d6e95bf 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -22,8 +22,8 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonScope;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter;
 
 /**
  * Writes a JSON (RFC 4627)
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java b/src/com/massivecraft/massivecore/xlib/gson/stream/MalformedJsonException.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/MalformedJsonException.java
index b8657e4e..6f3bc2b5 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/MalformedJsonException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
 import java.io.IOException;
 
-import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.massivecore.xlib.gson.stream.JsonReader;
 
 /**
  * Thrown when a reader encounters malformed JSON. Some syntax errors can be
diff --git a/src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java b/src/com/massivecraft/massivecore/xlib/gson/stream/StringPool.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java
rename to src/com/massivecraft/massivecore/xlib/gson/stream/StringPool.java
index 3423c718..fa02cf94 100644
--- a/src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/stream/StringPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.gson.stream;
+package com.massivecraft.massivecore.xlib.gson.stream;
 
 /**
  * A pool of string instances. Unlike the {@link String#intern() VM's
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/AggregationOutput.java b/src/com/massivecraft/massivecore/xlib/mongodb/AggregationOutput.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/AggregationOutput.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/AggregationOutput.java
index ddb06391..8a43fb28 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/AggregationOutput.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/AggregationOutput.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 public class AggregationOutput {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBList.java
similarity index 90%
rename from src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/BasicDBList.java
index 189bbd6d..fe7019d6 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBList.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 
-import com.massivecraft.mcore.xlib.bson.types.BasicBSONList;
-import com.massivecraft.mcore.xlib.mongodb.util.JSON;
+import com.massivecraft.massivecore.xlib.bson.types.BasicBSONList;
+import com.massivecraft.massivecore.xlib.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson list that is mongo specific 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObject.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObject.java
index a91dd843..5d0c2942 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObject.java
@@ -16,11 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
-
-import com.massivecraft.mcore.xlib.bson.BasicBSONObject;
-import com.massivecraft.mcore.xlib.mongodb.util.JSON;
+package com.massivecraft.massivecore.xlib.mongodb;
 
+import com.massivecraft.massivecore.xlib.bson.BasicBSONObject;
+import com.massivecraft.massivecore.xlib.mongodb.util.JSON;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
index 8710c240..73430256 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/Bytes.java b/src/com/massivecraft/massivecore/xlib/mongodb/Bytes.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/Bytes.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/Bytes.java
index 9e96d749..31ce1ef9 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/Bytes.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Bytes.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -24,11 +24,11 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore.xlib.bson.BSON;
-import com.massivecraft.mcore.xlib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore.xlib.bson.types.Code;
-import com.massivecraft.mcore.xlib.bson.types.CodeWScope;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.BSON;
+import com.massivecraft.massivecore.xlib.bson.types.BSONTimestamp;
+import com.massivecraft.massivecore.xlib.bson.types.Code;
+import com.massivecraft.massivecore.xlib.bson.types.CodeWScope;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 /**
  * Class that hold definitions of the wire protocol
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/CommandFailureException.java b/src/com/massivecraft/massivecore/xlib/mongodb/CommandFailureException.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/CommandFailureException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/CommandFailureException.java
index 508b462c..d27dc5c5 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/CommandFailureException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/CommandFailureException.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * An exception indicating a failed command.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java b/src/com/massivecraft/massivecore/xlib/mongodb/CommandResult.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/CommandResult.java
index 969108cd..637aad6d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/CommandResult.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ConnectionStatus.java b/src/com/massivecraft/massivecore/xlib/mongodb/ConnectionStatus.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/ConnectionStatus.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ConnectionStatus.java
index 062c6c13..060918c2 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ConnectionStatus.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ConnectionStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DB.java b/src/com/massivecraft/massivecore/xlib/mongodb/DB.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/DB.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DB.java
index 4577c115..42a9d4cd 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DB.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DB.java
@@ -16,12 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
-
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.mongodb.DBApiLayer.Result;
-import com.massivecraft.mcore.xlib.mongodb.util.Util;
+package com.massivecraft.massivecore.xlib.mongodb;
 
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.massivecore.xlib.mongodb.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -68,7 +67,7 @@ public abstract class DB {
      * @param command the DBObject representing the command
      * @param requestedPreference the preference requested by the client.
      * @return the read preference to use for the given command.  It will never return null.
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference
      */
     ReadPreference getCommandReadPreference(DBObject command, ReadPreference requestedPreference){
         String comString = command.keySet().iterator().next();
@@ -188,7 +187,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int) } with 0 as query option.
+     * This method calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject, int) } with 0 as query option.
      * @see List of Commands
      * @param cmd dbobject representing the command to execute
      * @return result of command from the database
@@ -202,7 +201,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int, com.massivecraft.mcore.xlib.mongodb.DBEncoder) } with 0 as query option.
+     * This method calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject, int, com.massivecraft.massivecore.xlib.mongodb.DBEncoder) } with 0 as query option.
      * @see List of Commands
      * @param cmd dbobject representing the command to execute
      * @param encoder 
@@ -216,7 +215,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int, com.massivecraft.mcore.xlib.mongodb.ReadPreference, com.massivecraft.mcore.xlib.mongodb.DBEncoder) } with a null readPrefs.
+     * This method calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject, int, com.massivecraft.massivecore.xlib.mongodb.ReadPreference, com.massivecraft.massivecore.xlib.mongodb.DBEncoder) } with a null readPrefs.
      * @see List of Commands
      * @param cmd dbobject representing the command to execute
      * @param options query options to use
@@ -231,7 +230,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int, com.massivecraft.mcore.xlib.mongodb.ReadPreference, com.massivecraft.mcore.xlib.mongodb.DBEncoder) } with a default encoder.
+     * This method calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject, int, com.massivecraft.massivecore.xlib.mongodb.ReadPreference, com.massivecraft.massivecore.xlib.mongodb.DBEncoder) } with a default encoder.
      * @see List of Commands
      * @param cmd dbobject representing the command to execute
      * @param options query options to use
@@ -303,7 +302,7 @@ public abstract class DB {
     
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject) }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject) }
      * @see List of Commands
      * @param cmd command to execute
      * @return result of command from the database
@@ -316,7 +315,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int)  }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.massivecore.xlib.mongodb.DBObject, int)  }
      * @see List of Commands
      * @param cmd command to execute
      * @param options query options to use
@@ -489,12 +488,12 @@ public abstract class DB {
      * @return
      * @throws MongoException
      */
-    public CommandResult getLastError( com.massivecraft.mcore.xlib.mongodb.WriteConcern concern ){
+    public CommandResult getLastError( com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern ){
         return command( concern.getCommand() );
     }
 
     /**
-     * @see {@link DB#getLastError(com.massivecraft.mcore.xlib.mongodb.WriteConcern) }
+     * @see {@link DB#getLastError(com.massivecraft.massivecore.xlib.mongodb.WriteConcern) }
      * @param w
      * @param wtimeout
      * @param fsync
@@ -502,7 +501,7 @@ public abstract class DB {
      * @throws MongoException
      */
     public CommandResult getLastError( int w , int wtimeout , boolean fsync ){
-        return command( (new com.massivecraft.mcore.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
+        return command( (new com.massivecraft.massivecore.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
     }
 
 
@@ -512,7 +511,7 @@ public abstract class DB {
      * documentation for {@link WriteConcern} for more information.
      * @param concern write concern to use
      */
-    public void setWriteConcern( com.massivecraft.mcore.xlib.mongodb.WriteConcern concern ){
+    public void setWriteConcern( com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern ){
         if (concern == null) throw new IllegalArgumentException();
         _concern = concern;
     }
@@ -521,7 +520,7 @@ public abstract class DB {
      * Gets the write concern for this database.
      * @return
      */
-    public com.massivecraft.mcore.xlib.mongodb.WriteConcern getWriteConcern(){
+    public com.massivecraft.massivecore.xlib.mongodb.WriteConcern getWriteConcern(){
         if ( _concern != null )
             return _concern;
         return _mongo.getWriteConcern();
@@ -813,8 +812,8 @@ public abstract class DB {
     final String _name;
 
     protected boolean _readOnly = false;
-    private com.massivecraft.mcore.xlib.mongodb.WriteConcern _concern;
-    private com.massivecraft.mcore.xlib.mongodb.ReadPreference _readPref;
+    private com.massivecraft.massivecore.xlib.mongodb.WriteConcern _concern;
+    private com.massivecraft.massivecore.xlib.mongodb.ReadPreference _readPref;
     final Bytes.OptionHolder _options;
 
     // cached authentication command result, to return in case of multiple calls to authenticateCommand with the
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBAddress.java
index e93eb607..657e5a82 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
index d20d678e..dc5e77a0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
@@ -16,12 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
-
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore.xlib.mongodb.util.JSON;
+package com.massivecraft.massivecore.xlib.mongodb;
 
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.mongodb.util.JSON;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -167,13 +166,13 @@ public class DBApiLayer extends DB {
             soFar++;
 
             if ( soFar >= NUM_CURSORS_PER_BATCH ){
-                _connector.say( this , om ,com.massivecraft.mcore.xlib.mongodb.WriteConcern.NONE );
+                _connector.say( this , om ,com.massivecraft.massivecore.xlib.mongodb.WriteConcern.NONE );
                 om = OutMessage.killCursors(_mongo, Math.min( NUM_CURSORS_PER_BATCH , all.size() - totalSoFar));
                 soFar = 0;
             }
         }
 
-        _connector.say( this , om ,com.massivecraft.mcore.xlib.mongodb.WriteConcern.NONE , addr );
+        _connector.say( this , om ,com.massivecraft.massivecore.xlib.mongodb.WriteConcern.NONE , addr );
     }
 
     @Override
@@ -196,7 +195,7 @@ public class DBApiLayer extends DB {
             super.drop();
         }
 
-        public WriteResult insert(List list, com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
+        public WriteResult insert(List list, com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
 
             if (concern == null) {
                 throw new IllegalArgumentException("Write concern can not be null");
@@ -205,7 +204,7 @@ public class DBApiLayer extends DB {
             return insert(list, true, concern, encoder);
         }
 
-        protected WriteResult insert(List list, boolean shouldApply , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
+        protected WriteResult insert(List list, boolean shouldApply , com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
 
             if (encoder == null)
                 encoder = DefaultDBEncoder.FACTORY.create();
@@ -252,7 +251,7 @@ public class DBApiLayer extends DB {
             return last;
         }
 
-        public WriteResult remove( DBObject o , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
+        public WriteResult remove( DBObject o , com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
 
             if (concern == null) {
                 throw new IllegalArgumentException("Write concern can not be null");
@@ -299,7 +298,7 @@ public class DBApiLayer extends DB {
         }
 
         @Override
-        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
+        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.massivecore.xlib.mongodb.WriteConcern concern, DBEncoder encoder ){
 
             if (o == null) {
                 throw new IllegalArgumentException("update can not be null");
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallback.java
similarity index 86%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBCallback.java
index 6c810651..ecfb56cc 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallback.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 
-import com.massivecraft.mcore.xlib.bson.BSONCallback;
+import com.massivecraft.massivecore.xlib.bson.BSONCallback;
 
 /**
  * The DB callback interface.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
index 2a379544..b8d41e0e 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * The DBCallback factory interface.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
index 48e9824f..af44bf6c 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 // Mongo
 
-import com.massivecraft.mcore.xlib.bson.LazyDBList;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.LazyDBList;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -195,7 +195,7 @@ public abstract class DBCollection {
     public abstract WriteResult update( DBObject q , DBObject o , boolean upsert , boolean multi , WriteConcern concern, DBEncoder encoder );
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with default WriteConcern.
+     * calls {@link DBCollection#update(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.massivecore.xlib.mongodb.WriteConcern)} with default WriteConcern.
      * @param q search query for old object to update
      * @param o object with which to update q
      * @param upsert if the database should create the element if it does not exist
@@ -210,7 +210,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
+     * calls {@link DBCollection#update(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
      * @param q search query for old object to update
      * @param o object with which to update q
      * @return
@@ -222,7 +222,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
+     * calls {@link DBCollection#update(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
      * @param q search query for old object to update
      * @param o object with which to update q
      * @return
@@ -263,7 +263,7 @@ public abstract class DBCollection {
     public abstract WriteResult remove( DBObject o , WriteConcern concern, DBEncoder encoder );
 
     /**
-     * calls {@link DBCollection#remove(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with the default WriteConcern
+     * calls {@link DBCollection#remove(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.WriteConcern)} with the default WriteConcern
      * @param o the object that documents to be removed must match
      * @return
      * @throws MongoException
@@ -284,7 +284,7 @@ public abstract class DBCollection {
 
 
     /**
-     * Calls {@link DBCollection#find(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, int, int)} and applies the query options
+     * Calls {@link DBCollection#find(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, int, int)} and applies the query options
      * @param query query used to search
      * @param fields the fields of matching objects to return
      * @param numToSkip number of objects to skip
@@ -429,7 +429,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param sort
@@ -442,7 +442,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param update
@@ -454,7 +454,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=true, returnNew=false, upsert=false
      * @param query
      * @return the removed document
@@ -467,7 +467,7 @@ public abstract class DBCollection {
     // --- START INDEX CODE ---
 
     /**
-     * calls {@link DBCollection#createIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with default index options
+     * calls {@link DBCollection#createIndex(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject)} with default index options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -504,7 +504,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with default options
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject)} with default options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -513,7 +513,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.massivecore.xlib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
      * @param keys fields to use for index
      * @param name an identifier for the index
      * @throws MongoException
@@ -748,7 +748,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#apply(com.massivecraft.mcore.xlib.mongodb.DBObject, boolean)} with ensureID=true
+     * calls {@link DBCollection#apply(com.massivecraft.massivecore.xlib.mongodb.DBObject, boolean)} with ensureID=true
      * @param o DBObject to which to add fields
      * @return the modified parameter object
      */
@@ -757,7 +757,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#doapply(com.massivecraft.mcore.xlib.mongodb.DBObject)}, optionally adding an automatic _id field
+     * calls {@link DBCollection#doapply(com.massivecraft.massivecore.xlib.mongodb.DBObject)}, optionally adding an automatic _id field
      * @param jo object to add fields to
      * @param ensureID whether to add an _id field
      * @return the modified object o
@@ -776,7 +776,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#save(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with default WriteConcern
+     * calls {@link DBCollection#save(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.WriteConcern)} with default WriteConcern
      * @param jo the DBObject to save
      *        will add _id field to jo if needed
      * @return
@@ -891,7 +891,7 @@ public abstract class DBCollection {
 
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with an empty query and null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject)} with an empty query and null fields.
      *  @return number of documents that match query
      *  @throws MongoException
      */
@@ -900,7 +900,7 @@ public abstract class DBCollection {
     }
     
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.ReadPreference)} with empty query and null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.ReadPreference)} with empty query and null fields.
      *  @param readPrefs ReadPreferences for this command
      *  @return number of documents that match query
      *  @throws MongoException
@@ -910,7 +910,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject)} with null fields.
      *  @param query query to match
      *  @return
      *  @throws MongoException
@@ -921,7 +921,7 @@ public abstract class DBCollection {
 
     
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
      *  @param query query to match
      *  @param fields fields to return
      *  @return
@@ -932,7 +932,7 @@ public abstract class DBCollection {
     }
     
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, long, long, com.massivecraft.mcore.xlib.mongodb.ReadPreference)} with limit=0 and skip=0
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, long, long, com.massivecraft.massivecore.xlib.mongodb.ReadPreference)} with limit=0 and skip=0
      *  @param query query to match
      *  @param fields fields to return
      *  @param readPrefs ReadPreferences for this command
@@ -944,7 +944,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, long, long, com.massivecraft.mcore.xlib.mongodb.ReadPreference)} with the DBCollection's ReadPreference
+     *  calls {@link DBCollection#getCount(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, long, long, com.massivecraft.massivecore.xlib.mongodb.ReadPreference)} with the DBCollection's ReadPreference
      *  @param query query to match
      *  @param fields fields to return
      *  @param limit limit the count to this value
@@ -1033,7 +1033,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#group(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
+     * calls {@link DBCollection#group(com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, com.massivecraft.massivecore.xlib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
      * @param key - { a : true }
      * @param cond - optional condition on query
      * @param reduce javascript reduce function
@@ -1105,7 +1105,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore.xlib.mongodb.GroupCommand)} which is more standard
+     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.massivecore.xlib.mongodb.GroupCommand)} which is more standard
      * Applies a group operation
      * @param args object representing the arguments to the group function
      * @return
@@ -1616,7 +1616,7 @@ public abstract class DBCollection {
      * makes this query ok to run on a slave node
      *
      * @deprecated Replaced with {@code ReadPreference.secondaryPreferred()}
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference#secondaryPreferred()
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference#secondaryPreferred()
      */
     @Deprecated
     public void slaveOk(){
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
index 0597ab04..b1a6d070 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
index e9eab866..3554c192 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.massivecore.xlib.mongodb.DBApiLayer.Result;
 
 import java.io.Closeable;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
similarity index 89%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
index 84eba43d..a8915237 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore.xlib.bson.BSONDecoder;
+import com.massivecraft.massivecore.xlib.bson.BSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
index ae36e511..6be74c7f 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
similarity index 82%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
index 5cb0b340..17f8852a 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
@@ -11,10 +11,10 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.*;
-import com.massivecraft.mcore.xlib.bson.io.*;
+import com.massivecraft.massivecore.xlib.bson.*;
+import com.massivecraft.massivecore.xlib.bson.io.*;
 
 public interface DBEncoder {
     public int writeObject( OutputBuffer buf, BSONObject o );
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
index 8ab22bc7..5cebe450 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
similarity index 91%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
index 7de77dde..44cf8255 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
 
 /**
  * A key-value map that can be saved to the database.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBPointer.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBPointer.java
index f49ada40..7a883b4a 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBPointer.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 /**
  * @deprecated
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBPort.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBPort.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
index 22d514bc..81a325be 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBPort.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.util.ThreadUtil;
+import com.massivecraft.massivecore.xlib.mongodb.util.ThreadUtil;
 
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
@@ -34,6 +34,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
+
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBPortPool.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBPortPool.java
index b68f3b36..1dcfe476 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBPortPool.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.util.ConnectionPoolStatisticsBean;
-import com.massivecraft.mcore.xlib.mongodb.util.SimplePool;
-import com.massivecraft.mcore.xlib.mongodb.util.management.JMException;
-import com.massivecraft.mcore.xlib.mongodb.util.management.MBeanServerFactory;
+import com.massivecraft.massivecore.xlib.mongodb.util.ConnectionPoolStatisticsBean;
+import com.massivecraft.massivecore.xlib.mongodb.util.SimplePool;
+import com.massivecraft.massivecore.xlib.mongodb.util.management.JMException;
+import com.massivecraft.massivecore.xlib.mongodb.util.management.MBeanServerFactory;
 
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBRef.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBRef.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBRef.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBRef.java
index 45ad2fc4..18a184aa 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBRef.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBRef.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
 
 /**
  * overrides DBRefBase to understand a BSONObject representation of a reference.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBRefBase.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBRefBase.java
index bab14c18..f582549d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBRefBase.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * represents a database reference, which points to an object stored in the database
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
index 662adbf7..43e97928 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
index f306fa08..39b1208c 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 // Bson
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BasicBSONCallback;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBDecoder.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBDecoder.java
index b99212e6..56ff4127 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBDecoder.java
@@ -13,9 +13,9 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BasicBSONDecoder;
+import com.massivecraft.massivecore.xlib.bson.BasicBSONDecoder;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBEncoder.java
similarity index 87%
rename from src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBEncoder.java
index 321caa56..3b977405 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBEncoder.java
@@ -10,14 +10,14 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.BasicBSONEncoder;
-import com.massivecraft.mcore.xlib.bson.io.OutputBuffer;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BasicBSONEncoder;
+import com.massivecraft.massivecore.xlib.bson.io.OutputBuffer;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
-import static com.massivecraft.mcore.xlib.bson.BSON.*;
+import static com.massivecraft.massivecore.xlib.bson.BSON.*;
 
 
 public class DefaultDBEncoder extends BasicBSONEncoder implements DBEncoder {
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/DynamicConnectionStatus.java b/src/com/massivecraft/massivecore/xlib/mongodb/DynamicConnectionStatus.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/DynamicConnectionStatus.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/DynamicConnectionStatus.java
index 8918e954..0ba60c89 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/DynamicConnectionStatus.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DynamicConnectionStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java b/src/com/massivecraft/massivecore/xlib/mongodb/GroupCommand.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/GroupCommand.java
index d611f51c..1ca01494 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/GroupCommand.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * This class groups the argument for a group operation and can build the underlying command object
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/InUseConnectionBean.java b/src/com/massivecraft/massivecore/xlib/mongodb/InUseConnectionBean.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/InUseConnectionBean.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/InUseConnectionBean.java
index 4541efb5..7ae94651 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/InUseConnectionBean.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/InUseConnectionBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPool.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPool.java
index 8348bd7d..3a7e417f 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPool.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * This class exists only so that on Java 5 the driver can create instances of a standard MBean,
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPoolMBean.java b/src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPoolMBean.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPoolMBean.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPoolMBean.java
index 1be76964..d76d11d3 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/Java5MongoConnectionPoolMBean.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Java5MongoConnectionPoolMBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * A standard MBean interface for a Mongo connection pool, for use on Java 5 virtual machines.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBCallback.java
similarity index 90%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyDBCallback.java
index d5f139db..3313e6ef 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBCallback.java
@@ -13,13 +13,13 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBDecoder.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyDBDecoder.java
index 7907b6b4..9cce58ce 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore.xlib.bson.LazyBSONDecoder;
+import com.massivecraft.massivecore.xlib.bson.LazyBSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBEncoder.java
similarity index 89%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyDBEncoder.java
index 245f7d55..f511874e 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBEncoder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.io.OutputBuffer;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.io.OutputBuffer;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBObject.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyDBObject.java
index ad0a163b..b40353b6 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyDBObject.java
@@ -13,11 +13,11 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore.xlib.bson.LazyBSONObject;
-import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.massivecore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.massivecore.xlib.bson.LazyBSONObject;
+import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer;
 
 public class LazyDBObject extends LazyBSONObject implements DBObject {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBCallback.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBCallback.java
index dba5aa6e..e060a1cf 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBCallback.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBDecoder.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBDecoder.java
index 66a86100..1d55b8cb 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBDecoder.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
index e8eda191..4029031d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
@@ -13,16 +13,16 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.massivecore.xlib.bson.io.BSONByteBuffer;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class LazyWriteableDBObject extends LazyDBObject {
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
index 1a61ec1d..f7535c8d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceOutput.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MapReduceOutput.java
index c20aefb6..8260672d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceOutput.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * Represents the result of a map/reduce operation
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/Mongo.java b/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/Mongo.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
index fc11738f..a3561e74 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/Mongo.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.massivecore.xlib.bson.io.PoolOutputBuffer;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -191,7 +191,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongodb node
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @throws MongoException
      *
@@ -205,7 +205,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @param options default query options
      * @throws MongoException
@@ -223,7 +223,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @throws MongoException
@@ -238,7 +238,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @param options
@@ -258,7 +258,7 @@ public class Mongo {
      * If this is a list of mongos servers, it will pick the closest (lowest ping time) one to send all requests to,
      * and automatically fail over to the next server if the closest is down.
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can
      *              either be a list of mongod servers in the same replica set or a list of mongos servers in the same
      *              sharded cluster.
@@ -281,7 +281,7 @@ public class Mongo {
      * If this is a list of mongos servers, it will pick the closest (lowest ping time) one to send all requests to,
      * and automatically fail over to the next server if the closest is down.
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can
      *              either be a list of mongod servers in the same replica set or a list of mongos servers in the same
      *              sharded cluster.
@@ -641,8 +641,8 @@ public class Mongo {
     final MongoAuthority _authority;
 
 
-    com.massivecraft.mcore.xlib.bson.util.SimplePool _bufferPool =
-        new com.massivecraft.mcore.xlib.bson.util.SimplePool( 1000 ){
+    com.massivecraft.massivecore.xlib.bson.util.SimplePool _bufferPool =
+        new com.massivecraft.massivecore.xlib.bson.util.SimplePool( 1000 ){
 
         protected PoolOutputBuffer createNew(){
             return new PoolOutputBuffer();
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoAuthority.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoAuthority.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
index fb5030ab..00bb1987 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoAuthority.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.Immutable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoClient.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClient.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoClient.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoClient.java
index 0ed891e5..7b55a475 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoClient.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClient.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.List;
@@ -63,7 +63,7 @@ import java.util.List;
  * default value of 10 used by the superseded {@code Mongo} class.
  *
  * @see ReadPreference#primary()
- * @see com.massivecraft.mcore.xlib.mongodb.WriteConcern#ACKNOWLEDGED
+ * @see com.massivecraft.massivecore.xlib.mongodb.WriteConcern#ACKNOWLEDGED
  * @see MongoClientOptions
  * @see MongoClientURI
  * @since 2.10.0
@@ -122,7 +122,7 @@ public class MongoClient extends Mongo {
      *
      * @param addr the database address
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      */
     public MongoClient(ServerAddress addr) {
         this(addr, new MongoClientOptions.Builder().build());
@@ -134,7 +134,7 @@ public class MongoClient extends Mongo {
      * @param addr the database address
      * @param credentialsList the list of credentials used to authenticate all connections
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @since 2.11.0
      */
     public MongoClient(ServerAddress addr, List credentialsList) {
@@ -147,7 +147,7 @@ public class MongoClient extends Mongo {
      * @param addr    the database address
      * @param options default options
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      */
     public MongoClient(ServerAddress addr, MongoClientOptions options) {
         this(addr, null, options);
@@ -160,7 +160,7 @@ public class MongoClient extends Mongo {
      * @param credentialsList the list of credentials used to authenticate all connections
      * @param options default options
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @since 2.11.0
      */
     @SuppressWarnings("deprecation")
@@ -182,7 +182,7 @@ public class MongoClient extends Mongo {
      *              either be a list of mongod servers in the same replica set or a list of mongos servers in the same
      *              sharded cluster.
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      */
     public MongoClient(List seeds) {
         this(seeds, null, new MongoClientOptions.Builder().build());
@@ -202,7 +202,7 @@ public class MongoClient extends Mongo {
      *              sharded cluster. \
      * @param credentialsList the list of credentials used to authenticate all connections
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @since 2.11.0
      */
     public MongoClient(List seeds, List credentialsList) {
@@ -224,7 +224,7 @@ public class MongoClient extends Mongo {
      *                sharded cluster.
      * @param options default options
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      */
     public MongoClient(List seeds, MongoClientOptions options) {
         this(seeds, null, options);
@@ -245,7 +245,7 @@ public class MongoClient extends Mongo {
      * @param credentialsList the list of credentials used to authenticate all connections
      * @param options default options
      * @throws MongoException
-     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.massivecore.xlib.mongodb.ServerAddress
      * @since 2.11.0
      */
     @SuppressWarnings("deprecation")
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoClientOptions.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientOptions.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoClientOptions.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoClientOptions.java
index 271441c4..abab9329 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoClientOptions.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientOptions.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.Immutable;
 
 import javax.net.SocketFactory;
 
@@ -62,7 +62,7 @@ public class MongoClientOptions {
          *
          * @param description the description of this MongoClient
          * @return {@code this}
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getDescription()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getDescription()
          */
         public Builder description(final String description) {
             this.description = description;
@@ -75,7 +75,7 @@ public class MongoClientOptions {
          * @param connectionsPerHost maximum number of connections
          * @return {@code this}
          * @throws IllegalArgumentException if connnectionsPerHost < 1
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getConnectionsPerHost()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getConnectionsPerHost()
          */
         public Builder connectionsPerHost(final int connectionsPerHost) {
             if (connectionsPerHost < 1) {
@@ -92,7 +92,7 @@ public class MongoClientOptions {
          *         the multiplier
          * @return {@code this}
          * @throws IllegalArgumentException if threadsAllowedToBlockForConnectionMultiplier < 1
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
          */
         public Builder threadsAllowedToBlockForConnectionMultiplier(final int threadsAllowedToBlockForConnectionMultiplier) {
             if (threadsAllowedToBlockForConnectionMultiplier < 1) {
@@ -108,7 +108,7 @@ public class MongoClientOptions {
          * @param maxWaitTime the maximum wait time
          * @return {@code this}
          * @throws IllegalArgumentException if maxWaitTime < 0
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getMaxWaitTime()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getMaxWaitTime()
          */
         public Builder maxWaitTime(final int maxWaitTime) {
             if (maxWaitTime < 0) {
@@ -123,7 +123,7 @@ public class MongoClientOptions {
          *
          * @param connectTimeout the connection timeout
          * @return {@code this}
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getConnectTimeout()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getConnectTimeout()
          */
         public Builder connectTimeout(final int connectTimeout) {
             if (connectTimeout < 0) {
@@ -138,7 +138,7 @@ public class MongoClientOptions {
          *
          * @param socketTimeout the socket timeout
          * @return {@code this}
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#getSocketTimeout()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#getSocketTimeout()
          */
         public Builder socketTimeout(final int socketTimeout) {
             if (socketTimeout < 0) {
@@ -153,7 +153,7 @@ public class MongoClientOptions {
          *
          * @param socketKeepAlive keep alive
          * @return {@code this}
-         * @see com.massivecraft.mcore.xlib.mongodb.MongoClientOptions#isSocketKeepAlive()
+         * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientOptions#isSocketKeepAlive()
          */
         public Builder socketKeepAlive(final boolean socketKeepAlive) {
             this.socketKeepAlive = socketKeepAlive;
@@ -438,7 +438,7 @@ public class MongoClientOptions {
      * Default is {@code ReadPreference.primary()}.
      *
      * @return the read preference
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference#primary()
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference#primary()
      */
     public ReadPreference getReadPreference() {
         return readPreference;
@@ -493,7 +493,7 @@ public class MongoClientOptions {
      *
      * @return whether finalizers are enabled on cursors
      * @see DBCursor
-     * @see com.massivecraft.mcore.xlib.mongodb.DBCursor#close()
+     * @see com.massivecraft.massivecore.xlib.mongodb.DBCursor#close()
      */
     public boolean isCursorFinalizerEnabled() {
         return cursorFinalizerEnabled;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoClientURI.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoClientURI.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
index 82f08124..f2d5e41e 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoClientURI.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import javax.net.ssl.SSLSocketFactory;
 import java.io.UnsupportedEncodingException;
@@ -165,7 +165,7 @@ public class MongoClientURI {
      *
      * @param uri  the URI
      * @param builder a Builder
-     * @see com.massivecraft.mcore.xlib.mongodb.MongoClientURI#getOptions()
+     * @see com.massivecraft.massivecore.xlib.mongodb.MongoClientURI#getOptions()
      * @since 2.11.0
      */
     public MongoClientURI(String uri, MongoClientOptions.Builder builder) {
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPool.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPool.java
index a60d975e..72d0cafa 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPool.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * This class exists only so that, on Java 6 and above, the driver can create instances of an MXBean.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPoolMXBean.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPoolMXBean.java
similarity index 92%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPoolMXBean.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPoolMXBean.java
index c82556d0..c23bbf9b 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoConnectionPoolMXBean.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoConnectionPoolMXBean.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.util.ConnectionPoolStatisticsBean;
+import com.massivecraft.massivecore.xlib.mongodb.util.ConnectionPoolStatisticsBean;
 
 /**
  * A standard MXBean interface for a Mongo connection pool, for use on Java 6 and above virtual machines.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoCredential.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoCredential.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
index 3828b9d5..8c9ba452 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoCredential.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.Immutable;
 
 import java.util.Arrays;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoCredentialsStore.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoCredentialsStore.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
index 91f0fbdb..aa8759be 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoCredentialsStore.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.ThreadSafe;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoException.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoException.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoException.java
index cda0ef56..a8909063 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoException.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
 
 /**
  * A general exception raised in Mongo
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoInternalException.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoInternalException.java
index b046122b..0ecd1a4b 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoInternalException.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * An Mongo exception internal to the driver, not carrying any error code
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoInterruptedException.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoInterruptedException.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoInterruptedException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoInterruptedException.java
index 265b0b03..7105b1a0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoInterruptedException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoInterruptedException.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * A non-checked exception indicating that the driver has been interrupted by a call to Thread.interrupt.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoOptions.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoOptions.java
index cef762cf..ad48d5c0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoOptions.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import javax.net.SocketFactory;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoURI.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongoURI.java
index f9740206..cddb2cf1 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoURI.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/MongosStatus.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongosStatus.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/MongosStatus.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/MongosStatus.java
index e45925e1..ab3a8ce6 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/MongosStatus.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongosStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/NativeAuthenticationHelper.java b/src/com/massivecraft/massivecore/xlib/mongodb/NativeAuthenticationHelper.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/NativeAuthenticationHelper.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/NativeAuthenticationHelper.java
index 9c4d3d72..d16c4963 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/NativeAuthenticationHelper.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/NativeAuthenticationHelper.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.util.Util;
+import com.massivecraft.massivecore.xlib.mongodb.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java b/src/com/massivecraft/massivecore/xlib/mongodb/OutMessage.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/OutMessage.java
index 35c6f234..a8181ef5 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/OutMessage.java
@@ -14,12 +14,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.BasicBSONEncoder;
-import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BasicBSONEncoder;
+import com.massivecraft.massivecore.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java b/src/com/massivecraft/massivecore/xlib/mongodb/QueryBuilder.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/QueryBuilder.java
index 5c56cd5e..c39ae6b3 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/QueryBuilder.java
@@ -20,7 +20,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/QueryOpBuilder.java b/src/com/massivecraft/massivecore/xlib/mongodb/QueryOpBuilder.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/QueryOpBuilder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/QueryOpBuilder.java
index ba5f5227..a91f8c1f 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/QueryOpBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/QueryOpBuilder.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * Utility for constructing Query operation command with query, orderby, hint, explain, snapshot.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java b/src/com/massivecraft/massivecore/xlib/mongodb/QueryOperators.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/QueryOperators.java
index 5a1489df..e31473e6 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/QueryOperators.java
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * MongoDB keywords for various query operations
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
similarity index 84%
rename from src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
index 5ad3f3f1..59f9838f 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
@@ -16,30 +16,30 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import static com.massivecraft.mcore.xlib.bson.BSON.ARRAY;
-import static com.massivecraft.mcore.xlib.bson.BSON.BINARY;
-import static com.massivecraft.mcore.xlib.bson.BSON.BOOLEAN;
-import static com.massivecraft.mcore.xlib.bson.BSON.CODE;
-import static com.massivecraft.mcore.xlib.bson.BSON.CODE_W_SCOPE;
-import static com.massivecraft.mcore.xlib.bson.BSON.DATE;
-import static com.massivecraft.mcore.xlib.bson.BSON.EOO;
-import static com.massivecraft.mcore.xlib.bson.BSON.MAXKEY;
-import static com.massivecraft.mcore.xlib.bson.BSON.MINKEY;
-import static com.massivecraft.mcore.xlib.bson.BSON.NULL;
-import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER;
-import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_INT;
-import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_LONG;
-import static com.massivecraft.mcore.xlib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore.xlib.bson.BSON.OID;
-import static com.massivecraft.mcore.xlib.bson.BSON.REF;
-import static com.massivecraft.mcore.xlib.bson.BSON.REGEX;
-import static com.massivecraft.mcore.xlib.bson.BSON.STRING;
-import static com.massivecraft.mcore.xlib.bson.BSON.SYMBOL;
-import static com.massivecraft.mcore.xlib.bson.BSON.TIMESTAMP;
-import static com.massivecraft.mcore.xlib.bson.BSON.UNDEFINED;
-import static com.massivecraft.mcore.xlib.mongodb.util.MyAsserts.assertEquals;
+import static com.massivecraft.massivecore.xlib.bson.BSON.ARRAY;
+import static com.massivecraft.massivecore.xlib.bson.BSON.BINARY;
+import static com.massivecraft.massivecore.xlib.bson.BSON.BOOLEAN;
+import static com.massivecraft.massivecore.xlib.bson.BSON.CODE;
+import static com.massivecraft.massivecore.xlib.bson.BSON.CODE_W_SCOPE;
+import static com.massivecraft.massivecore.xlib.bson.BSON.DATE;
+import static com.massivecraft.massivecore.xlib.bson.BSON.EOO;
+import static com.massivecraft.massivecore.xlib.bson.BSON.MAXKEY;
+import static com.massivecraft.massivecore.xlib.bson.BSON.MINKEY;
+import static com.massivecraft.massivecore.xlib.bson.BSON.NULL;
+import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER;
+import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER_INT;
+import static com.massivecraft.massivecore.xlib.bson.BSON.NUMBER_LONG;
+import static com.massivecraft.massivecore.xlib.bson.BSON.OBJECT;
+import static com.massivecraft.massivecore.xlib.bson.BSON.OID;
+import static com.massivecraft.massivecore.xlib.bson.BSON.REF;
+import static com.massivecraft.massivecore.xlib.bson.BSON.REGEX;
+import static com.massivecraft.massivecore.xlib.bson.BSON.STRING;
+import static com.massivecraft.massivecore.xlib.bson.BSON.SYMBOL;
+import static com.massivecraft.massivecore.xlib.bson.BSON.TIMESTAMP;
+import static com.massivecraft.massivecore.xlib.bson.BSON.UNDEFINED;
+import static com.massivecraft.massivecore.xlib.mongodb.util.MyAsserts.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.Date;
@@ -49,8 +49,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
 
 /**
  * This object wraps the binary object format ("BSON") used for the transport of serialized objects to / from the Mongo database.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java b/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
index d5e5697b..e0e2f0a0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
@@ -11,9 +11,9 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.mongodb.ReplicaSetStatus.ReplicaSetNode;
+import com.massivecraft.massivecore.xlib.mongodb.ReplicaSetStatus.ReplicaSetNode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -286,7 +286,7 @@ public abstract class ReadPreference {
     /**
      * A primary read preference.  Equivalent to calling {@code ReadPreference.primary()}.
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference#primary()
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference#primary()
      * @deprecated As of release 2.9.0, replaced by {@code ReadPreference.primary()}
      */
     @Deprecated
@@ -299,8 +299,8 @@ public abstract class ReadPreference {
      * between secondary and secondary-preferred, so for backwards compatibility, leaving the name as is with
      * the behavior as it was when it was created.
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference#secondary()
-     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference#secondaryPreferred()
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference#secondary()
+     * @see com.massivecraft.massivecore.xlib.mongodb.ReadPreference#secondaryPreferred()
      * @deprecated As of release 2.9.0, replaced by {@code ReadPreference.secondaryPreferred()}
      */
     @Deprecated
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
index 868abc28..95f44c10 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
 
 /**
  * This class enables to map simple Class fields to a BSON object fields
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java b/src/com/massivecraft/massivecore/xlib/mongodb/ReplicaSetStatus.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ReplicaSetStatus.java
index d8f5fddf..396364a0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ReplicaSetStatus.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.util.annotations.Immutable;
-import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.massivecore.xlib.bson.util.annotations.ThreadSafe;
 
 import java.net.UnknownHostException;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/Response.java b/src/com/massivecraft/massivecore/xlib/mongodb/Response.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/Response.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/Response.java
index 9c0e082e..146dff3f 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/Response.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Response.java
@@ -16,10 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 // Bson
-import com.massivecraft.mcore.xlib.bson.io.Bits;
+import com.massivecraft.massivecore.xlib.bson.io.Bits;
+
 
 // Java
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ServerAddress.java
index c4993a66..73c11ae4 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/ServerError.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerError.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/ServerError.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/ServerError.java
index 72fed251..63600074 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/ServerError.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerError.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
-import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
 
 /**
  * Represents a server error
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/TaggableReadPreference.java b/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/TaggableReadPreference.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
index cbdda63b..4f8ea482 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/TaggableReadPreference.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
index f41eed84..11c3a015 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/WriteConcernException.java b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcernException.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/WriteConcernException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/WriteConcernException.java
index 40bed2c4..46a4e49d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/WriteConcernException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcernException.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 /**
  * An exception representing an error reported due to a write failure.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java b/src/com/massivecraft/massivecore/xlib/mongodb/WriteResult.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/WriteResult.java
index bdd33b65..4d071bad 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/WriteResult.java
@@ -1,6 +1,6 @@
 // WriteResult.java
 
-package com.massivecraft.mcore.xlib.mongodb;
+package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/CLI.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/CLI.java
index d5557d93..cfb41647 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/CLI.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.gridfs;
+package com.massivecraft.massivecore.xlib.mongodb.gridfs;
 
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.Mongo;
-import com.massivecraft.mcore.xlib.mongodb.MongoClient;
-import com.massivecraft.mcore.xlib.mongodb.util.Util;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.Mongo;
+import com.massivecraft.massivecore.xlib.mongodb.MongoClient;
+import com.massivecraft.massivecore.xlib.mongodb.util.Util;
 
 import java.io.File;
 import java.security.DigestInputStream;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
index 265d3b1f..96480bb3 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.gridfs;
+package com.massivecraft.massivecore.xlib.mongodb.gridfs;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -26,14 +26,13 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore.xlib.mongodb.DB;
-import com.massivecraft.mcore.xlib.mongodb.DBCollection;
-import com.massivecraft.mcore.xlib.mongodb.DBCursor;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.massivecore.xlib.mongodb.DB;
+import com.massivecraft.massivecore.xlib.mongodb.DBCollection;
+import com.massivecraft.massivecore.xlib.mongodb.DBCursor;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
 
 /**
  *  Implementation of GridFS v1.0
@@ -66,7 +65,7 @@ public class GridFS {
     /**
      * Creates a GridFS instance for the default bucket "fs"
      * in the given database. Set the preferred WriteConcern on the give DB with DB.setWriteConcern
-     * @see com.massivecraft.mcore.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.massivecore.xlib.mongodb.WriteConcern
      * @param db database to work with
      * @throws MongoException 
      */
@@ -78,7 +77,7 @@ public class GridFS {
      * Creates a GridFS instance for the specified bucket
      * in the given database.  Set the preferred WriteConcern on the give DB with DB.setWriteConcern
      *
-     * @see com.massivecraft.mcore.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.massivecore.xlib.mongodb.WriteConcern
      * @param db database to work with
      * @param bucket bucket to use in the given database
      * @throws MongoException 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSDBFile.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSDBFile.java
index 8a829128..3ec7f5a0 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSDBFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.gridfs;
+package com.massivecraft.massivecore.xlib.mongodb.gridfs;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,10 +24,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.MongoException;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.MongoException;
 
 /**
  * This class enables to retrieve a GridFS file metadata and content.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSFile.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSFile.java
index 71e08839..a0541036 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.gridfs;
+package com.massivecraft.massivecore.xlib.mongodb.gridfs;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -26,12 +26,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.MongoException;
-import com.massivecraft.mcore.xlib.mongodb.util.JSON;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.MongoException;
+import com.massivecraft.massivecore.xlib.mongodb.util.JSON;
 
 /**
  * The abstract class representing a GridFS file
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSInputFile.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSInputFile.java
index 8aa9f75f..6e4feddc 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFSInputFile.java
@@ -16,14 +16,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.gridfs;
-
-import com.massivecraft.mcore.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.MongoException;
-import com.massivecraft.mcore.xlib.mongodb.util.Util;
+package com.massivecraft.massivecore.xlib.mongodb.gridfs;
 
+import com.massivecraft.massivecore.xlib.bson.types.ObjectId;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.MongoException;
+import com.massivecraft.massivecore.xlib.mongodb.util.Util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -185,7 +184,7 @@ public class GridFSInputFile extends GridFSFile {
     }
 
     /**
-     * @see com.massivecraft.mcore.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
+     * @see com.massivecraft.massivecore.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
      *
      * @return Number of the next chunk.
      * @throws IOException
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/gridfs/package.html b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/package.html
similarity index 100%
rename from src/com/massivecraft/mcore/xlib/mongodb/gridfs/package.html
rename to src/com/massivecraft/massivecore/xlib/mongodb/gridfs/package.html
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
index c05b2438..1de0265a 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.io;
+package com.massivecraft.massivecore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
index c9bf2021..700844ea 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.io;
+package com.massivecraft.massivecore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferInputStream.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferInputStream.java
index 1d32b9f8..b08c151e 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferInputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.io;
+package com.massivecraft.massivecore.xlib.mongodb.io;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
index a0b9e1c5..385faca8 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.io;
+package com.massivecraft.massivecore.xlib.mongodb.io;
 
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
index bd2671ec..1ffdf136 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.io;
+package com.massivecraft.massivecore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/package.html b/src/com/massivecraft/massivecore/xlib/mongodb/package.html
similarity index 100%
rename from src/com/massivecraft/mcore/xlib/mongodb/package.html
rename to src/com/massivecraft/massivecore/xlib/mongodb/package.html
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/tools/ConnectionPoolStat.java b/src/com/massivecraft/massivecore/xlib/mongodb/tools/ConnectionPoolStat.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/tools/ConnectionPoolStat.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/tools/ConnectionPoolStat.java
index 47fdb29f..fccd345c 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/tools/ConnectionPoolStat.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/tools/ConnectionPoolStat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.tools;
+package com.massivecraft.massivecore.xlib.mongodb.tools;
 
 import javax.management.AttributeNotFoundException;
 import javax.management.InstanceNotFoundException;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/AbstractObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/AbstractObjectSerializer.java
index 2f3354ed..8bea78c8 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/AbstractObjectSerializer.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 abstract class AbstractObjectSerializer implements ObjectSerializer {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/Args.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/Args.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
index 06e290c9..83a6ce36 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/Args.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/Base64Codec.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/Base64Codec.java
index 7ded4150..0915378c 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/Base64Codec.java
@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 /*
  *      Copyright (C) 2012 10gen Inc.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
index 8e7b70e5..e5af7c0d 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
@@ -15,11 +15,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
-
-import com.massivecraft.mcore.xlib.bson.util.ClassMap;
-import com.massivecraft.mcore.xlib.mongodb.Bytes;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
+import com.massivecraft.massivecore.xlib.bson.util.ClassMap;
+import com.massivecraft.massivecore.xlib.mongodb.Bytes;
 
 import java.util.List;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java
index 00a703f2..286c3644 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ConnectionPoolStatisticsBean.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
-import com.massivecraft.mcore.xlib.mongodb.InUseConnectionBean;
+import com.massivecraft.massivecore.xlib.mongodb.InUseConnectionBean;
 
 /**
  * A bean representing connection pool statistics.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
index 7b533a24..1265269c 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/Hash.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/Hash.java
index c21ba7d6..61dfeffb 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/Hash.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 public final class Hash {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
index f9d80824..d717b0ce 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.Collection;
 import java.util.IdentityHashMap;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSON.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/JSON.java
index 60726d14..79a607b9 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSON.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 
-import com.massivecraft.mcore.xlib.bson.BSONCallback;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.bson.BSONCallback;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
 
 /**
  *   Helper methods for JSON serialization and de-serialization
@@ -34,7 +34,7 @@ public class JSON {
      *
      * @param o object to serialize
      * @return  String containing JSON form of the object
-     * @see com.massivecraft.mcore.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.massivecore.xlib.mongodb.util.JSONSerializers#getLegacy()
      */
     public static String serialize( Object o ){
         StringBuilder buf = new StringBuilder();
@@ -50,7 +50,7 @@ public class JSON {
      * @param o object to serialize
      * @param buf StringBuilder containing the JSON representation under construction 
      * @return String containing JSON form of the object
-     * @see com.massivecraft.mcore.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.massivecore.xlib.mongodb.util.JSONSerializers#getLegacy()
      */
     public static void serialize( Object o, StringBuilder buf) {
         JSONSerializers.getLegacy().serialize(o, buf);
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONCallback.java
similarity index 89%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/JSONCallback.java
index 8e431de7..41a5d927 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONCallback.java
@@ -16,17 +16,16 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
-
-import com.massivecraft.mcore.xlib.bson.BSON;
-import com.massivecraft.mcore.xlib.bson.BSONObject;
-import com.massivecraft.mcore.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore.xlib.bson.types.*;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBList;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.DBRef;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
+import com.massivecraft.massivecore.xlib.bson.BSON;
+import com.massivecraft.massivecore.xlib.bson.BSONObject;
+import com.massivecraft.massivecore.xlib.bson.BasicBSONCallback;
+import com.massivecraft.massivecore.xlib.bson.types.*;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBList;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.DBRef;
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONParseException.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/JSONParseException.java
index 955bf067..99691776 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONParseException.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 /**
  * Exception throw when invalid JSON is passed to JSONParser.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONSerializers.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/JSONSerializers.java
index 9e2094a6..6b4a17db 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/JSONSerializers.java
@@ -14,14 +14,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
-
-import com.massivecraft.mcore.xlib.bson.types.*;
-import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore.xlib.mongodb.Bytes;
-import com.massivecraft.mcore.xlib.mongodb.DBObject;
-import com.massivecraft.mcore.xlib.mongodb.DBRefBase;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
+import com.massivecraft.massivecore.xlib.bson.types.*;
+import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.massivecore.xlib.mongodb.Bytes;
+import com.massivecraft.massivecore.xlib.mongodb.DBObject;
+import com.massivecraft.massivecore.xlib.mongodb.DBRefBase;
 
 import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/MyAsserts.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/MyAsserts.java
index 61b4d9c0..b0dc4fe1 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/MyAsserts.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ObjectSerializer.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/ObjectSerializer.java
index 14ad8fee..ea5d9706 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ObjectSerializer.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 /**
  * Interface describing methods for serializing an object to a string.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/OptionMap.java
similarity index 94%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/OptionMap.java
index 3bf60ac0..2690c582 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/OptionMap.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.TreeMap;
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
index 63b24e11..8382c913 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/StringBuilderPool.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/StringBuilderPool.java
index 02a10967..d9af8e23 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/StringBuilderPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 public class StringBuilderPool extends SimplePool {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/StringParseUtil.java
similarity index 99%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/StringParseUtil.java
index 199e5ff2..7baa4509 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/StringParseUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 public final class StringParseUtil {
 
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
index f62c2a94..5db5340a 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
index e8585dcb..37e2c9bf 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/TimeConstants.java
similarity index 96%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/TimeConstants.java
index b87eac98..1d798d7e 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/TimeConstants.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 public class TimeConstants {
     
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/UniqueList.java
similarity index 95%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/UniqueList.java
index c91cf7f3..2663a2e2 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/UniqueList.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/Util.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/Util.java
similarity index 97%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/Util.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/Util.java
index 5e9fbc4b..36336627 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/Util.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/Util.java
@@ -14,7 +14,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
similarity index 98%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
index d2d07657..02dab405 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util;
+package com.massivecraft.massivecore.xlib.mongodb.util;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/management/JMException.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/JMException.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/management/JMException.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/management/JMException.java
index addb2acb..39c1affe 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/management/JMException.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/JMException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util.management;
+package com.massivecraft.massivecore.xlib.mongodb.util.management;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServer.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServer.java
index fef1b11e..7c121ef1 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util.management;
+package com.massivecraft.massivecore.xlib.mongodb.util.management;
 
 /**
  * This class is NOT part of the public API.  It may change at any time without notification.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServerFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServerFactory.java
similarity index 89%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServerFactory.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServerFactory.java
index 6eb533f9..c42e0838 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/management/MBeanServerFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/MBeanServerFactory.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore.xlib.mongodb.util.management;
+package com.massivecraft.massivecore.xlib.mongodb.util.management;
 
-import com.massivecraft.mcore.xlib.mongodb.util.management.jmx.JMXMBeanServer;
+import com.massivecraft.massivecore.xlib.mongodb.util.management.jmx.JMXMBeanServer;
 
 /**
  * This class is NOT part of the public API.  It may change at any time without notification.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/management/NullMBeanServer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/NullMBeanServer.java
similarity index 93%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/management/NullMBeanServer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/management/NullMBeanServer.java
index 3c7aac20..39f3e324 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/management/NullMBeanServer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/NullMBeanServer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util.management;
+package com.massivecraft.massivecore.xlib.mongodb.util.management;
 
 /**
  * This class is NOT part of the public API.  It may change at any time without notification.
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java
similarity index 90%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java
index b20babc4..f96c924b 100644
--- a/src/com/massivecraft/mcore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore.xlib.mongodb.util.management.jmx;
+package com.massivecraft.massivecore.xlib.mongodb.util.management.jmx;
 
-import com.massivecraft.mcore.xlib.mongodb.util.management.JMException;
-import com.massivecraft.mcore.xlib.mongodb.util.management.MBeanServer;
+import com.massivecraft.massivecore.xlib.mongodb.util.management.JMException;
+import com.massivecraft.massivecore.xlib.mongodb.util.management.MBeanServer;
 
 import javax.management.*;
+
 import java.lang.management.ManagementFactory;
 
 /**
diff --git a/src/com/massivecraft/mcore/xlib/mongodb/util/package.html b/src/com/massivecraft/massivecore/xlib/mongodb/util/package.html
similarity index 100%
rename from src/com/massivecraft/mcore/xlib/mongodb/util/package.html
rename to src/com/massivecraft/massivecore/xlib/mongodb/util/package.html
diff --git a/src/com/massivecraft/mcore/HashCodeComparator.java b/src/com/massivecraft/mcore/HashCodeComparator.java
deleted file mode 100644
index fc3c0346..00000000
--- a/src/com/massivecraft/mcore/HashCodeComparator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.
- Copyright (C) 2003 by Pierre-Luc Paour 
-
- Based on the C version by Martin Pool, of which this is more or less a straight conversion.
- Copyright (C) 2000 by Martin Pool 
-
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
-This version has been slightly modified for usage in the MCore library.
-Check out the original at: https://github.com/paour/natorder/blob/master/NaturalOrderComparator.java 
-*/
-
-package com.massivecraft.mcore;
-
-import java.util.*;
-
-public class HashCodeComparator implements Comparator
-{
-	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
-	
-	private static transient HashCodeComparator i = new HashCodeComparator();
-	public static HashCodeComparator get() { return i; }
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-
-	@Override
-	public int compare(Object o1, Object o2)
-	{
-		return o2.hashCode() - o1.hashCode();
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/MCoreConfColl.java b/src/com/massivecraft/mcore/MCoreConfColl.java
deleted file mode 100644
index 3d0ba317..00000000
--- a/src/com/massivecraft/mcore/MCoreConfColl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.massivecraft.mcore;
-
-import com.massivecraft.mcore.MCore;
-import com.massivecraft.mcore.store.Coll;
-import com.massivecraft.mcore.store.MStore;
-
-public class MCoreConfColl extends Coll
-{
-	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
-	
-	private static MCoreConfColl i = new MCoreConfColl();
-	public static MCoreConfColl get() { return i; }
-	private MCoreConfColl()
-	{
-		super("mcore_conf", MCoreConf.class, MStore.getDb(ConfServer.dburi), MCore.get());
-	}
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void init()
-	{
-		super.init();
-		MCoreConf.i = this.get(MCore.INSTANCE, true);
-	}
-	
-	@Override
-	public synchronized void loadFromRemote(Object oid)
-	{
-		super.loadFromRemote(oid);
-		if ( ! this.inited()) return;
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/cmd/req/Req.java b/src/com/massivecraft/mcore/cmd/req/Req.java
deleted file mode 100644
index 85e34b31..00000000
--- a/src/com/massivecraft/mcore/cmd/req/Req.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.massivecraft.mcore.cmd.req;
-
-import org.bukkit.command.CommandSender;
-
-import com.massivecraft.mcore.Predictate;
-import com.massivecraft.mcore.cmd.MCommand;
-
-public interface Req extends Predictate
-{
-	public boolean apply(CommandSender sender, MCommand command);
-	
-	// This just composes the error message and does NOT test the requirement at all.
-	
-	public String createErrorMessage(CommandSender sender);
-	public String createErrorMessage(CommandSender sender, MCommand command);
-}
diff --git a/src/com/massivecraft/mcore/integration/protocollib/ProtocolLibFeatures.java b/src/com/massivecraft/mcore/integration/protocollib/ProtocolLibFeatures.java
deleted file mode 100644
index 2409dbc0..00000000
--- a/src/com/massivecraft/mcore/integration/protocollib/ProtocolLibFeatures.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.massivecraft.mcore.integration.protocollib;
-
-import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract;
-
-public class ProtocolLibFeatures extends IntegrationFeaturesAbstract 
-{
-	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
-	
-	private ProtocolLibFeatures() { super("ProtocolLib"); }
-	private static ProtocolLibFeatures i = new ProtocolLibFeatures();
-	public static ProtocolLibFeatures get() { return i; }
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void activate()
-	{
-		EntityPotionColorPacketAdapter.get().setup();
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/integration/vault/VaultFeatures.java b/src/com/massivecraft/mcore/integration/vault/VaultFeatures.java
deleted file mode 100644
index ab773654..00000000
--- a/src/com/massivecraft/mcore/integration/vault/VaultFeatures.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.massivecraft.mcore.integration.vault;
-
-import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract;
-import com.massivecraft.mcore.money.MoneyMixinVault;
-
-public class VaultFeatures extends IntegrationFeaturesAbstract
-{
-	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
-	
-	private static VaultFeatures i = new VaultFeatures();
-	public static VaultFeatures get() { return i; }
-	private VaultFeatures() { super("Vault"); }
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void activate()
-	{
-		MoneyMixinVault.get().activate();
-	}
-	
-	@Override
-	public void deactivate()
-	{
-		MoneyMixinVault.get().deactivate();
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCore.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCore.java
deleted file mode 100644
index 859b9bc5..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCore.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCore;
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.VersionCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCore extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsys cmdMCoreUsys = new CmdMCoreUsys();
-	public CmdMCoreMStore cmdMCoreMStore = new CmdMCoreMStore();
-	public CmdMCoreId cmdMCoreId = new CmdMCoreId();
-	public CmdMCoreTest cmdMCoreTest = new CmdMCoreTest();
-	public CmdMCoreHearsound cmdMCoreHearsound = new CmdMCoreHearsound();
-	public CmdMCoreBuffer cmdMCoreBuffer = new CmdMCoreBuffer();
-	public VersionCommand cmdMCoreVersion = new VersionCommand(MCore.get(), MCorePerm.VERSION.node, "v", "version");
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCore()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdMCoreUsys);
-		this.addSubCommand(this.cmdMCoreMStore);
-		this.addSubCommand(this.cmdMCoreId);
-		this.addSubCommand(this.cmdMCoreTest);
-		this.addSubCommand(this.cmdMCoreHearsound);
-		this.addSubCommand(this.cmdMCoreBuffer);
-		this.addSubCommand(this.cmdMCoreVersion);
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.BASECOMMAND.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBuffer.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBuffer.java
deleted file mode 100644
index e4dc412a..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBuffer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreBuffer extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreBufferPrint cmdMCoreBufferPrint = new CmdMCoreBufferPrint();
-	public CmdMCoreBufferClear cmdMCoreBufferClear = new CmdMCoreBufferClear();
-	public CmdMCoreBufferSet cmdMCoreBufferSet = new CmdMCoreBufferSet();
-	public CmdMCoreBufferAdd cmdMCoreBufferAdd = new CmdMCoreBufferAdd();
-	public CmdMCoreBufferWhitespace cmdMCoreBufferWhitespace = new CmdMCoreBufferWhitespace();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreBuffer()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdMCoreBufferPrint);
-		this.addSubCommand(this.cmdMCoreBufferClear);
-		this.addSubCommand(this.cmdMCoreBufferSet);
-		this.addSubCommand(this.cmdMCoreBufferAdd);
-		this.addSubCommand(this.cmdMCoreBufferWhitespace);
-		
-		// Aliases
-		this.addAliases("buffer");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java
deleted file mode 100644
index d1908423..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCoreEngineVariable;
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreBufferAdd extends MCommand
-{
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreBufferAdd()
-	{
-		// Aliases
-		this.addAliases("a", "add");
-		
-		// Args
-		this.addRequiredArg("string");
-		this.setErrorOnToManyArgs(false);
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER_ADD.node));
-	}
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void perform()
-	{
-		String string = this.argConcatFrom(0);
-		if (string == null) return;
-		
-		String buffer = MCoreEngineVariable.getBuffer(sender);
-		buffer += string;
-		MCoreEngineVariable.setBuffer(sender, buffer);
-		
-		msg("Buffer Add");
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java
deleted file mode 100644
index 5048065f..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCoreEngineVariable;
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreBufferClear extends MCommand
-{
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreBufferClear()
-	{
-		// Aliases
-		this.addAliases("c", "clear");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER_CLEAR.node));
-	}
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void perform()
-	{
-		MCoreEngineVariable.setBuffer(sender, "");
-		
-		msg("Buffer Clear");
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java
deleted file mode 100644
index ca231d7f..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCoreEngineVariable;
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.arg.ARInteger;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.util.Txt;
-
-public class CmdMCoreBufferWhitespace extends MCommand
-{
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreBufferWhitespace()
-	{
-		// Aliases
-		this.addAliases("w", "whitespace");
-		
-		// Args
-		this.addOptionalArg("times", "1");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.BUFFER_WHITESPACE.node));
-	}
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public void perform()
-	{
-		Integer times = this.arg(0, ARInteger.get(), 1);
-		if (times == null) return;
-		
-		String string = Txt.repeat(" ", times);
-		
-		String buffer = MCoreEngineVariable.getBuffer(sender);
-		buffer += string;
-		MCoreEngineVariable.setBuffer(sender, buffer);
-		
-		msg("Buffer Whitespace");
-	}
-	
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStore.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStore.java
deleted file mode 100644
index 0927d0d7..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStore.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreMStore extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreMStoreStats cmdMCoreMStoreStats = new CmdMCoreMStoreStats();
-	public CmdMCoreMStoreListcolls cmdMCoreMStoreListcolls = new CmdMCoreMStoreListcolls();
-	public CmdMCoreMStoreCopydb cmdMCoreMStoreCopydb = new CmdMCoreMStoreCopydb();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreMStore()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdMCoreMStoreStats);
-		this.addSubCommand(this.cmdMCoreMStoreListcolls);
-		this.addSubCommand(this.cmdMCoreMStoreCopydb);
-		
-		// Args
-		this.addAliases("mstore");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsys.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsys.java
deleted file mode 100644
index 626dc387..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsys.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreUsys extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysMultiverse cmdUsysMultiverse = new CmdMCoreUsysMultiverse();
-	public CmdMCoreUsysUniverse cmdUsysUniverse = new CmdMCoreUsysUniverse();
-	public CmdMCoreUsysWorld cmdUsysWorld = new CmdMCoreUsysWorld();
-	public CmdMCoreUsysAspect cmdUsysAspect = new CmdMCoreUsysAspect();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsys()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdUsysMultiverse);
-		this.addSubCommand(this.cmdUsysUniverse);
-		this.addSubCommand(this.cmdUsysWorld);
-		this.addSubCommand(this.cmdUsysAspect);
-		
-		// Aliases
-		this.addAliases("usys");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.USYS.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspect.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspect.java
deleted file mode 100644
index eac232c7..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspect.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreUsysAspect extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysAspectList cmdUsysAspectList = new CmdMCoreUsysAspectList();
-	public CmdMCoreUsysAspectShow cmdUsysAspectShow = new CmdMCoreUsysAspectShow();
-	public CmdMCoreUsysAspectUse cmdUsysAspectUse = new CmdMCoreUsysAspectUse();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysAspect()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdUsysAspectList);
-		this.addSubCommand(this.cmdUsysAspectShow);
-		this.addSubCommand(this.cmdUsysAspectUse);
-		
-		// Aliases
-		this.addAliases("a", "aspect");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverse.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverse.java
deleted file mode 100644
index 1ceddd74..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverse.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreUsysMultiverse extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysMultiverseList cmdUsysMultiverseList = new CmdMCoreUsysMultiverseList();
-	public CmdMCoreUsysMultiverseShow cmdUsysMultiverseShow = new CmdMCoreUsysMultiverseShow();
-	public CmdMCoreUsysMultiverseNew cmdUsysMultiverseNew = new CmdMCoreUsysMultiverseNew();
-	public CmdMCoreUsysMultiverseDel cmdUsysMultiverseDel = new CmdMCoreUsysMultiverseDel();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysMultiverse()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdUsysMultiverseList);
-		this.addSubCommand(this.cmdUsysMultiverseShow);
-		this.addSubCommand(this.cmdUsysMultiverseNew);
-		this.addSubCommand(this.cmdUsysMultiverseDel);
-		
-		// Aliases
-		this.addAliases("m", "multiverse");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverse.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverse.java
deleted file mode 100644
index 1f10df5f..00000000
--- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.massivecraft.mcore.mcorecmd;
-
-import com.massivecraft.mcore.MCorePerm;
-import com.massivecraft.mcore.cmd.MCommand;
-import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-
-public class CmdMCoreUsysUniverse extends MCommand
-{
-	// -------------------------------------------- //
-	// FIELDS
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysUniverseNew cmdUsysUniverseNew = new CmdMCoreUsysUniverseNew();
-	public CmdMCoreUsysUniverseDel cmdUsysUniverseDel = new CmdMCoreUsysUniverseDel();
-	public CmdMCoreUsysUniverseClear cmdUsysUniverseClear = new CmdMCoreUsysUniverseClear();
-	
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public CmdMCoreUsysUniverse()
-	{
-		// SubCommands
-		this.addSubCommand(this.cmdUsysUniverseNew);
-		this.addSubCommand(this.cmdUsysUniverseDel);
-		this.addSubCommand(this.cmdUsysUniverseClear);
-		
-		// Aliases
-		this.addAliases("u", "universe");
-		
-		// Requirements
-		this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE.node));
-	}
-
-}
diff --git a/src/com/massivecraft/mcore/mixin/ActualMixin.java b/src/com/massivecraft/mcore/mixin/ActualMixin.java
deleted file mode 100644
index bf4bbbd5..00000000
--- a/src/com/massivecraft/mcore/mixin/ActualMixin.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.massivecraft.mcore.mixin;
-
-import org.bukkit.event.player.PlayerJoinEvent;
-
-import com.massivecraft.mcore.event.MCorePlayerLeaveEvent;
-
-public interface ActualMixin
-{
-	public boolean isActualJoin(PlayerJoinEvent event);
-	public boolean isActualLeave(MCorePlayerLeaveEvent event);
-}
diff --git a/src/com/massivecraft/mcore/xlib/bson/util/Function.java b/src/com/massivecraft/mcore/xlib/bson/util/Function.java
deleted file mode 100644
index f78f35a6..00000000
--- a/src/com/massivecraft/mcore/xlib/bson/util/Function.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.massivecraft.mcore.xlib.bson.util;
-
-interface Function {
-    B apply(A a);
-}
diff --git a/src/com/massivecraft/mcore/xlib/gson/package-info.java b/src/com/massivecraft/mcore/xlib/gson/package-info.java
deleted file mode 100644
index 4915276a..00000000
--- a/src/com/massivecraft/mcore/xlib/gson/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * This package provides the {@link com.massivecraft.mcore.xlib.gson.Gson} class to convert Json to Java and
- * vice-versa.
- *
- * 
    The primary class to use is {@link com.massivecraft.mcore.xlib.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore.xlib.gson.GsonBuilder}
- * (to configure various options such as using versioning and so on).
    
- *
- * @author Inderjeet Singh, Joel Leitch
- */
-package com.massivecraft.mcore.xlib.gson;
\ No newline at end of file