diff --git a/plugin.yml b/plugin.yml index ab672bb1..9919c56b 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ -name: mcore4 +name: mcore5 version: 1.0.0 -main: com.massivecraft.mcore4.MCore +main: com.massivecraft.mcore5.MCore load: startup permissions: # -------------------------------------------- # diff --git a/src/com/massivecraft/mcore4/Conf.java b/src/com/massivecraft/mcore5/Conf.java similarity index 82% rename from src/com/massivecraft/mcore4/Conf.java rename to src/com/massivecraft/mcore5/Conf.java index e07be548..4ad63186 100644 --- a/src/com/massivecraft/mcore4/Conf.java +++ b/src/com/massivecraft/mcore5/Conf.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.io.File; import java.util.List; import java.util.Map; import java.util.UUID; -import com.massivecraft.mcore4.usys.cmd.CmdUsys; -import com.massivecraft.mcore4.util.MUtil; +import com.massivecraft.mcore5.usys.cmd.CmdUsys; +import com.massivecraft.mcore5.util.MUtil; public class Conf extends SimpleConfig { diff --git a/src/com/massivecraft/mcore4/InternalListener.java b/src/com/massivecraft/mcore5/InternalListener.java similarity index 90% rename from src/com/massivecraft/mcore4/InternalListener.java rename to src/com/massivecraft/mcore5/InternalListener.java index 47d0d14b..4d5fc937 100644 --- a/src/com/massivecraft/mcore4/InternalListener.java +++ b/src/com/massivecraft/mcore5/InternalListener.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.util.HashMap; import java.util.Map; @@ -14,11 +14,11 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; -import com.massivecraft.mcore4.event.MCoreAfterPlayerRespawnEvent; -import com.massivecraft.mcore4.event.MCoreAfterPlayerTeleportEvent; -import com.massivecraft.mcore4.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.store.PlayerColl; +import com.massivecraft.mcore5.event.MCoreAfterPlayerRespawnEvent; +import com.massivecraft.mcore5.event.MCoreAfterPlayerTeleportEvent; +import com.massivecraft.mcore5.event.MCorePlayerLeaveEvent; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.store.PlayerColl; public class InternalListener implements Listener { diff --git a/src/com/massivecraft/mcore4/Lang.java b/src/com/massivecraft/mcore5/Lang.java similarity index 92% rename from src/com/massivecraft/mcore4/Lang.java rename to src/com/massivecraft/mcore5/Lang.java index 4bb738c8..2ab2fc68 100644 --- a/src/com/massivecraft/mcore4/Lang.java +++ b/src/com/massivecraft/mcore5/Lang.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; public class Lang { diff --git a/src/com/massivecraft/mcore4/MCore.java b/src/com/massivecraft/mcore5/MCore.java similarity index 74% rename from src/com/massivecraft/mcore4/MCore.java rename to src/com/massivecraft/mcore5/MCore.java index aa0fbf2d..cbcf8d4f 100644 --- a/src/com/massivecraft/mcore4/MCore.java +++ b/src/com/massivecraft/mcore5/MCore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.lang.reflect.Modifier; import java.util.Random; @@ -7,20 +7,20 @@ import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore4.adapter.InventoryAdapter; -import com.massivecraft.mcore4.adapter.ItemStackAdapter; -import com.massivecraft.mcore4.adapter.MongoURIAdapter; -import com.massivecraft.mcore4.adapter.PSAdapter; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.store.Db; -import com.massivecraft.mcore4.store.MStore; -import com.massivecraft.mcore4.usys.AspectColl; -import com.massivecraft.mcore4.usys.MultiverseColl; -import com.massivecraft.mcore4.usys.cmd.CmdUsys; -import com.massivecraft.mcore4.util.PlayerUtil; -import com.massivecraft.mcore4.xlib.gson.Gson; -import com.massivecraft.mcore4.xlib.gson.GsonBuilder; -import com.massivecraft.mcore4.xlib.mongodb.MongoURI; +import com.massivecraft.mcore5.adapter.InventoryAdapter; +import com.massivecraft.mcore5.adapter.ItemStackAdapter; +import com.massivecraft.mcore5.adapter.MongoURIAdapter; +import com.massivecraft.mcore5.adapter.PSAdapter; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.store.Db; +import com.massivecraft.mcore5.store.MStore; +import com.massivecraft.mcore5.usys.AspectColl; +import com.massivecraft.mcore5.usys.MultiverseColl; +import com.massivecraft.mcore5.usys.cmd.CmdUsys; +import com.massivecraft.mcore5.util.PlayerUtil; +import com.massivecraft.mcore5.xlib.gson.Gson; +import com.massivecraft.mcore5.xlib.gson.GsonBuilder; +import com.massivecraft.mcore5.xlib.mongodb.MongoURI; public class MCore extends MPlugin { diff --git a/src/com/massivecraft/mcore4/MPlugin.java b/src/com/massivecraft/mcore5/MPlugin.java similarity index 85% rename from src/com/massivecraft/mcore4/MPlugin.java rename to src/com/massivecraft/mcore5/MPlugin.java index 4e17f5a5..6885532a 100644 --- a/src/com/massivecraft/mcore4/MPlugin.java +++ b/src/com/massivecraft/mcore5/MPlugin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.util.logging.Level; import java.util.logging.Logger; @@ -9,12 +9,12 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import com.massivecraft.mcore4.integration.Integration; -import com.massivecraft.mcore4.integration.IntegrationFeatures; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.util.Txt; -import com.massivecraft.mcore4.xlib.gson.Gson; -import com.massivecraft.mcore4.xlib.gson.GsonBuilder; +import com.massivecraft.mcore5.integration.Integration; +import com.massivecraft.mcore5.integration.IntegrationFeatures; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore5.xlib.gson.Gson; +import com.massivecraft.mcore5.xlib.gson.GsonBuilder; public abstract class MPlugin extends JavaPlugin implements Listener { diff --git a/src/com/massivecraft/mcore4/PS.java b/src/com/massivecraft/mcore5/PS.java similarity index 95% rename from src/com/massivecraft/mcore4/PS.java rename to src/com/massivecraft/mcore5/PS.java index 3f0ba4a5..5e025aa1 100644 --- a/src/com/massivecraft/mcore4/PS.java +++ b/src/com/massivecraft/mcore5/PS.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.text.DecimalFormat; import java.util.ArrayList; @@ -16,8 +16,8 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; -import com.massivecraft.mcore4.util.Txt; -import com.massivecraft.mcore4.xlib.gson.annotations.SerializedName; +import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName; /** * PS stands for PhysicalState. diff --git a/src/com/massivecraft/mcore4/PSTeleporter.java b/src/com/massivecraft/mcore5/PSTeleporter.java similarity index 73% rename from src/com/massivecraft/mcore4/PSTeleporter.java rename to src/com/massivecraft/mcore5/PSTeleporter.java index 5ef8f2b3..402ff823 100644 --- a/src/com/massivecraft/mcore4/PSTeleporter.java +++ b/src/com/massivecraft/mcore5/PSTeleporter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import org.bukkit.entity.Entity; diff --git a/src/com/massivecraft/mcore4/PSTeleporterDefault.java b/src/com/massivecraft/mcore5/PSTeleporterDefault.java similarity index 91% rename from src/com/massivecraft/mcore4/PSTeleporterDefault.java rename to src/com/massivecraft/mcore5/PSTeleporterDefault.java index c836e928..78354baa 100644 --- a/src/com/massivecraft/mcore4/PSTeleporterDefault.java +++ b/src/com/massivecraft/mcore5/PSTeleporterDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import org.bukkit.Location; import org.bukkit.entity.Entity; diff --git a/src/com/massivecraft/mcore4/Permission.java b/src/com/massivecraft/mcore5/Permission.java similarity index 89% rename from src/com/massivecraft/mcore4/Permission.java rename to src/com/massivecraft/mcore5/Permission.java index bca3939c..4c2ac9db 100644 --- a/src/com/massivecraft/mcore4/Permission.java +++ b/src/com/massivecraft/mcore5/Permission.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore4.util.Perm; +import com.massivecraft.mcore5.util.Perm; public enum Permission { diff --git a/src/com/massivecraft/mcore4/Predictate.java b/src/com/massivecraft/mcore5/Predictate.java similarity index 63% rename from src/com/massivecraft/mcore4/Predictate.java rename to src/com/massivecraft/mcore5/Predictate.java index 6074de91..dd29e33c 100644 --- a/src/com/massivecraft/mcore4/Predictate.java +++ b/src/com/massivecraft/mcore5/Predictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; public interface Predictate { diff --git a/src/com/massivecraft/mcore4/SimpleConfig.java b/src/com/massivecraft/mcore5/SimpleConfig.java similarity index 88% rename from src/com/massivecraft/mcore4/SimpleConfig.java rename to src/com/massivecraft/mcore5/SimpleConfig.java index 71bce961..55b4cb69 100644 --- a/src/com/massivecraft/mcore4/SimpleConfig.java +++ b/src/com/massivecraft/mcore5/SimpleConfig.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4; +package com.massivecraft.mcore5; import java.io.File; -import com.massivecraft.mcore4.store.accessor.Accessor; -import com.massivecraft.mcore4.util.DiscUtil; +import com.massivecraft.mcore5.store.accessor.Accessor; +import com.massivecraft.mcore5.util.DiscUtil; public class SimpleConfig { diff --git a/src/com/massivecraft/mcore4/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java similarity index 84% rename from src/com/massivecraft/mcore4/adapter/InventoryAdapter.java rename to src/com/massivecraft/mcore5/adapter/InventoryAdapter.java index 1622a480..dc5700e1 100644 --- a/src/com/massivecraft/mcore4/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; @@ -6,14 +6,14 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonObject; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonSerializer; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonObject; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonSerializer; public class InventoryAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore4/adapter/ItemStackAdapter.java b/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java similarity index 87% rename from src/com/massivecraft/mcore4/adapter/ItemStackAdapter.java rename to src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java index 2d4d54fb..fd806b59 100644 --- a/src/com/massivecraft/mcore4/adapter/ItemStackAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; import java.util.Map.Entry; @@ -10,13 +10,13 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonObject; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonSerializer; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonObject; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonSerializer; public class ItemStackAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore4/adapter/MongoURIAdapter.java b/src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java similarity index 67% rename from src/com/massivecraft/mcore4/adapter/MongoURIAdapter.java rename to src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java index 3d1dec0e..1c9b15a9 100644 --- a/src/com/massivecraft/mcore4/adapter/MongoURIAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonSerializer; -import com.massivecraft.mcore4.xlib.mongodb.MongoURI; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore5.xlib.mongodb.MongoURI; public class MongoURIAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore4/adapter/NBType.java b/src/com/massivecraft/mcore5/adapter/NBType.java similarity index 93% rename from src/com/massivecraft/mcore4/adapter/NBType.java rename to src/com/massivecraft/mcore5/adapter/NBType.java index 0c5783ab..29a06736 100644 --- a/src/com/massivecraft/mcore4/adapter/NBType.java +++ b/src/com/massivecraft/mcore5/adapter/NBType.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/adapter/NbtGsonConverter.java b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java similarity index 92% rename from src/com/massivecraft/mcore4/adapter/NbtGsonConverter.java rename to src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java index 5a39c806..06af6bd5 100644 --- a/src/com/massivecraft/mcore4/adapter/NbtGsonConverter.java +++ b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagByte; @@ -18,10 +18,10 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map.Entry; -import com.massivecraft.mcore4.xlib.gson.JsonArray; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonObject; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.gson.JsonArray; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonObject; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; public class NbtGsonConverter { diff --git a/src/com/massivecraft/mcore4/adapter/PSAdapter.java b/src/com/massivecraft/mcore5/adapter/PSAdapter.java similarity index 66% rename from src/com/massivecraft/mcore4/adapter/PSAdapter.java rename to src/com/massivecraft/mcore5/adapter/PSAdapter.java index d49dc181..d58f8974 100644 --- a/src/com/massivecraft/mcore4/adapter/PSAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/PSAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore4.adapter; +package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore4.PS; -import com.massivecraft.mcore4.xlib.gson.Gson; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore4.xlib.mongodb.MongoURI; +import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore5.xlib.gson.Gson; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.mongodb.MongoURI; public class PSAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/mcore4/cmd/BukkitGlueCommand.java b/src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java similarity index 85% rename from src/com/massivecraft/mcore4/cmd/BukkitGlueCommand.java rename to src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java index f429a478..e41548b3 100644 --- a/src/com/massivecraft/mcore4/cmd/BukkitGlueCommand.java +++ b/src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.cmd; +package com.massivecraft.mcore5.cmd; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.util.Txt; public class BukkitGlueCommand extends Command { diff --git a/src/com/massivecraft/mcore4/cmd/HelpCommand.java b/src/com/massivecraft/mcore5/cmd/HelpCommand.java similarity index 81% rename from src/com/massivecraft/mcore4/cmd/HelpCommand.java rename to src/com/massivecraft/mcore5/cmd/HelpCommand.java index a3043a97..65249366 100644 --- a/src/com/massivecraft/mcore4/cmd/HelpCommand.java +++ b/src/com/massivecraft/mcore5/cmd/HelpCommand.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd; +package com.massivecraft.mcore5.cmd; import java.util.ArrayList; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.cmd.arg.ARInteger; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.cmd.arg.ARInteger; +import com.massivecraft.mcore5.util.Txt; public class HelpCommand extends MCommand { diff --git a/src/com/massivecraft/mcore4/cmd/MCommand.java b/src/com/massivecraft/mcore5/cmd/MCommand.java similarity index 92% rename from src/com/massivecraft/mcore4/cmd/MCommand.java rename to src/com/massivecraft/mcore5/cmd/MCommand.java index 70bd0914..3e2ab8f1 100644 --- a/src/com/massivecraft/mcore4/cmd/MCommand.java +++ b/src/com/massivecraft/mcore5/cmd/MCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd; +package com.massivecraft.mcore5.cmd; import java.util.*; import java.util.Map.Entry; @@ -11,15 +11,15 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.SimpleCommandMap; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.Lang; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.cmd.arg.ArgReader; -import com.massivecraft.mcore4.cmd.arg.ArgResult; -import com.massivecraft.mcore4.cmd.req.IReq; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.util.BukkitCommandUtil; -import com.massivecraft.mcore4.util.Perm; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.Lang; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.cmd.arg.ArgReader; +import com.massivecraft.mcore5.cmd.arg.ArgResult; +import com.massivecraft.mcore5.cmd.req.IReq; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.util.BukkitCommandUtil; +import com.massivecraft.mcore5.util.Perm; +import com.massivecraft.mcore5.util.Txt; public abstract class MCommand { diff --git a/src/com/massivecraft/mcore4/cmd/VisibilityMode.java b/src/com/massivecraft/mcore5/cmd/VisibilityMode.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/VisibilityMode.java rename to src/com/massivecraft/mcore5/cmd/VisibilityMode.java index 13dc1dc1..6bb154a4 100644 --- a/src/com/massivecraft/mcore4/cmd/VisibilityMode.java +++ b/src/com/massivecraft/mcore5/cmd/VisibilityMode.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd; +package com.massivecraft.mcore5.cmd; public enum VisibilityMode { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractPrimitive.java b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java similarity index 80% rename from src/com/massivecraft/mcore4/cmd/arg/ARAbstractPrimitive.java rename to src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java index 891cc72d..a65e8795 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractPrimitive.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.cmd.MCommand; public abstract class ARAbstractPrimitive implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractSelect.java b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java similarity index 85% rename from src/com/massivecraft/mcore4/cmd/arg/ARAbstractSelect.java rename to src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java index e6a8ef2a..2a8276c3 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractSelect.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.Txt; public abstract class ARAbstractSelect implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractStringMatch.java b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractStringMatch.java similarity index 91% rename from src/com/massivecraft/mcore4/cmd/arg/ARAbstractStringMatch.java rename to src/com/massivecraft/mcore5/cmd/arg/ARAbstractStringMatch.java index ca01aab6..47f1908c 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARAbstractStringMatch.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARAbstractStringMatch.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.Txt; public abstract class ARAbstractStringMatch implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARAspect.java b/src/com/massivecraft/mcore5/cmd/arg/ARAspect.java similarity index 72% rename from src/com/massivecraft/mcore4/cmd/arg/ARAspect.java rename to src/com/massivecraft/mcore5/cmd/arg/ARAspect.java index 7453dc81..7929c8f5 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARAspect.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARAspect.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.usys.AspectColl; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.usys.AspectColl; public class ARAspect extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARBoolean.java b/src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/arg/ARBoolean.java rename to src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java index 12e1bf95..14a1a9e0 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARBoolean.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARBoolean extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARByte.java b/src/com/massivecraft/mcore5/cmd/arg/ARByte.java similarity index 86% rename from src/com/massivecraft/mcore4/cmd/arg/ARByte.java rename to src/com/massivecraft/mcore5/cmd/arg/ARByte.java index 0ef3ee1e..d279efe9 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARByte.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARByte.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARByte extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARDate.java b/src/com/massivecraft/mcore5/cmd/arg/ARDate.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/arg/ARDate.java rename to src/com/massivecraft/mcore5/cmd/arg/ARDate.java index 8f99dfcd..001e77e6 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARDate.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARDate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARDouble.java b/src/com/massivecraft/mcore5/cmd/arg/ARDouble.java similarity index 87% rename from src/com/massivecraft/mcore4/cmd/arg/ARDouble.java rename to src/com/massivecraft/mcore5/cmd/arg/ARDouble.java index 9df1e056..1f03c680 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARDouble.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARDouble.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARDouble extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/AREnvironment.java b/src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java similarity index 85% rename from src/com/massivecraft/mcore4/cmd/arg/AREnvironment.java rename to src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java index 698031d9..b055312d 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/AREnvironment.java +++ b/src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; import org.bukkit.World.Environment; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.MUtil; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.MUtil; public class AREnvironment extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARFloat.java b/src/com/massivecraft/mcore5/cmd/arg/ARFloat.java similarity index 87% rename from src/com/massivecraft/mcore4/cmd/arg/ARFloat.java rename to src/com/massivecraft/mcore5/cmd/arg/ARFloat.java index 5291cd97..d3d7e925 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARFloat.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARFloat.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARFloat extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARInteger.java b/src/com/massivecraft/mcore5/cmd/arg/ARInteger.java similarity index 87% rename from src/com/massivecraft/mcore4/cmd/arg/ARInteger.java rename to src/com/massivecraft/mcore5/cmd/arg/ARInteger.java index 7800f77a..75c75df6 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARInteger.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARInteger.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARInteger extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARLong.java b/src/com/massivecraft/mcore5/cmd/arg/ARLong.java similarity index 86% rename from src/com/massivecraft/mcore4/cmd/arg/ARLong.java rename to src/com/massivecraft/mcore5/cmd/arg/ARLong.java index 7a30a1e0..f45b8d9f 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARLong.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARLong.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARLong extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARMaterial.java b/src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java similarity index 85% rename from src/com/massivecraft/mcore4/cmd/arg/ARMaterial.java rename to src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java index 399219d6..e292350c 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARMaterial.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import org.bukkit.Material; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.cmd.MCommand; public class ARMaterial implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARMultiverse.java b/src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java similarity index 73% rename from src/com/massivecraft/mcore4/cmd/arg/ARMultiverse.java rename to src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java index 173444b1..3e2e7491 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARMultiverse.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.usys.Multiverse; -import com.massivecraft.mcore4.usys.MultiverseColl; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore5.usys.MultiverseColl; public class ARMultiverse extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerExact.java b/src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerExact.java similarity index 86% rename from src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerExact.java rename to src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerExact.java index e8789d65..70ce37a2 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerExact.java +++ b/src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerExact.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.cmd.MCommand; public class AROnlinePlayerExact implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerMatch.java b/src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerMatch.java similarity index 87% rename from src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerMatch.java rename to src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerMatch.java index a075a5c4..debcc34e 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/AROnlinePlayerMatch.java +++ b/src/com/massivecraft/mcore5/cmd/arg/AROnlinePlayerMatch.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.ArrayList; import java.util.List; @@ -6,8 +6,8 @@ import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.Txt; public class AROnlinePlayerMatch implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARString.java b/src/com/massivecraft/mcore5/cmd/arg/ARString.java similarity index 86% rename from src/com/massivecraft/mcore4/cmd/arg/ARString.java rename to src/com/massivecraft/mcore5/cmd/arg/ARString.java index e7ef4d65..7976a20d 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARString.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARString.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; public class ARString extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARStringEntity.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringEntity.java similarity index 84% rename from src/com/massivecraft/mcore4/cmd/arg/ARStringEntity.java rename to src/com/massivecraft/mcore5/cmd/arg/ARStringEntity.java index aae3cf37..df2ae5e6 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARStringEntity.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringEntity.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.store.Entity; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.store.Entity; public class ARStringEntity> implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCI.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCI.java rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java index 65d8a0f2..aba167b6 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCI.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCS.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCS.java rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java index 37c317cf..3d5a1a00 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchFullCS.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCI.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java similarity index 90% rename from src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCI.java rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java index 945891bb..1ab46033 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCI.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCS.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java similarity index 89% rename from src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCS.java rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java index fb97b9c0..f54acc71 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARStringMatchStartCS.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARUniverse.java b/src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java similarity index 84% rename from src/com/massivecraft/mcore4/cmd/arg/ARUniverse.java rename to src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java index 9604f15c..f32f0299 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARUniverse.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.ArrayList; import java.util.Collection; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.usys.Multiverse; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore5.util.Txt; public class ARUniverse implements ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARWorld.java b/src/com/massivecraft/mcore5/cmd/arg/ARWorld.java similarity index 85% rename from src/com/massivecraft/mcore4/cmd/arg/ARWorld.java rename to src/com/massivecraft/mcore5/cmd/arg/ARWorld.java index 753eccef..aa6ed2b6 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARWorld.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARWorld.java @@ -1,11 +1,12 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.ArrayList; import java.util.List; import org.bukkit.Bukkit; import org.bukkit.World; -import com.massivecraft.mcore4.cmd.MCommand; + +import com.massivecraft.mcore5.cmd.MCommand; public class ARWorld extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ARWorldType.java b/src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java similarity index 86% rename from src/com/massivecraft/mcore4/cmd/arg/ARWorldType.java rename to src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java index 4d648813..c15768f1 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ARWorldType.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.Collection; import org.bukkit.WorldType; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.MUtil; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.MUtil; public class ARWorldType extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ArgReader.java b/src/com/massivecraft/mcore5/cmd/arg/ArgReader.java similarity index 50% rename from src/com/massivecraft/mcore4/cmd/arg/ArgReader.java rename to src/com/massivecraft/mcore5/cmd/arg/ArgReader.java index 5c6d3775..b6ab35fa 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ArgReader.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ArgReader.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.cmd.MCommand; public interface ArgReader { diff --git a/src/com/massivecraft/mcore4/cmd/arg/ArgResult.java b/src/com/massivecraft/mcore5/cmd/arg/ArgResult.java similarity index 91% rename from src/com/massivecraft/mcore4/cmd/arg/ArgResult.java rename to src/com/massivecraft/mcore5/cmd/arg/ArgResult.java index 408180c3..2e1928e1 100644 --- a/src/com/massivecraft/mcore4/cmd/arg/ArgResult.java +++ b/src/com/massivecraft/mcore5/cmd/arg/ArgResult.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.cmd.arg; +package com.massivecraft.mcore5.cmd.arg; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore4/cmd/req/IReq.java b/src/com/massivecraft/mcore5/cmd/req/IReq.java similarity index 77% rename from src/com/massivecraft/mcore4/cmd/req/IReq.java rename to src/com/massivecraft/mcore5/cmd/req/IReq.java index 7ccaf737..0cbe3d1e 100644 --- a/src/com/massivecraft/mcore4/cmd/req/IReq.java +++ b/src/com/massivecraft/mcore5/cmd/req/IReq.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.cmd.req; +package com.massivecraft.mcore5.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.cmd.MCommand; public interface IReq { diff --git a/src/com/massivecraft/mcore4/cmd/req/ReqHasPerm.java b/src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java similarity index 77% rename from src/com/massivecraft/mcore4/cmd/req/ReqHasPerm.java rename to src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java index 4424d26b..8d3e5716 100644 --- a/src/com/massivecraft/mcore4/cmd/req/ReqHasPerm.java +++ b/src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore4.cmd.req; +package com.massivecraft.mcore5.cmd.req; import lombok.Getter; import lombok.Setter; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore4.cmd.MCommand; -import com.massivecraft.mcore4.util.Perm; +import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore5.util.Perm; public class ReqHasPerm implements IReq { diff --git a/src/com/massivecraft/mcore4/cmd/req/ReqIsPlayer.java b/src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java similarity index 78% rename from src/com/massivecraft/mcore4/cmd/req/ReqIsPlayer.java rename to src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java index 5185cbc6..9d478680 100644 --- a/src/com/massivecraft/mcore4/cmd/req/ReqIsPlayer.java +++ b/src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.cmd.req; +package com.massivecraft.mcore5.cmd.req; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.Lang; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.Lang; +import com.massivecraft.mcore5.cmd.MCommand; public class ReqIsPlayer implements IReq { diff --git a/src/com/massivecraft/mcore4/event/MCoreAfterPlayerRespawnEvent.java b/src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java similarity index 94% rename from src/com/massivecraft/mcore4/event/MCoreAfterPlayerRespawnEvent.java rename to src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java index 8c8798d9..1334a571 100644 --- a/src/com/massivecraft/mcore4/event/MCoreAfterPlayerRespawnEvent.java +++ b/src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.event; +package com.massivecraft.mcore5.event; import lombok.Getter; diff --git a/src/com/massivecraft/mcore4/event/MCoreAfterPlayerTeleportEvent.java b/src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java similarity index 94% rename from src/com/massivecraft/mcore4/event/MCoreAfterPlayerTeleportEvent.java rename to src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java index 7de5bb0e..79cbd10d 100644 --- a/src/com/massivecraft/mcore4/event/MCoreAfterPlayerTeleportEvent.java +++ b/src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.event; +package com.massivecraft.mcore5.event; import lombok.Getter; diff --git a/src/com/massivecraft/mcore4/event/MCorePlayerLeaveEvent.java b/src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java similarity index 95% rename from src/com/massivecraft/mcore4/event/MCorePlayerLeaveEvent.java rename to src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java index a6f5e865..57fb7253 100644 --- a/src/com/massivecraft/mcore4/event/MCorePlayerLeaveEvent.java +++ b/src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.event; +package com.massivecraft.mcore5.event; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/integration/Integration.java b/src/com/massivecraft/mcore5/integration/Integration.java similarity index 91% rename from src/com/massivecraft/mcore4/integration/Integration.java rename to src/com/massivecraft/mcore5/integration/Integration.java index 7036a5b7..08fa6559 100644 --- a/src/com/massivecraft/mcore4/integration/Integration.java +++ b/src/com/massivecraft/mcore5/integration/Integration.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.integration; +package com.massivecraft.mcore5.integration; import lombok.Getter; @@ -10,8 +10,8 @@ import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.util.Txt; public class Integration implements Listener { diff --git a/src/com/massivecraft/mcore4/integration/IntegrationFeatures.java b/src/com/massivecraft/mcore5/integration/IntegrationFeatures.java similarity index 71% rename from src/com/massivecraft/mcore4/integration/IntegrationFeatures.java rename to src/com/massivecraft/mcore5/integration/IntegrationFeatures.java index d96a4b29..ffa751c0 100644 --- a/src/com/massivecraft/mcore4/integration/IntegrationFeatures.java +++ b/src/com/massivecraft/mcore5/integration/IntegrationFeatures.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.integration; +package com.massivecraft.mcore5.integration; public interface IntegrationFeatures { diff --git a/src/com/massivecraft/mcore4/integration/IntegrationFeaturesAbstract.java b/src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java similarity index 84% rename from src/com/massivecraft/mcore4/integration/IntegrationFeaturesAbstract.java rename to src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java index ec9d76f4..57fe8ef6 100644 --- a/src/com/massivecraft/mcore4/integration/IntegrationFeaturesAbstract.java +++ b/src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.integration; +package com.massivecraft.mcore5.integration; public abstract class IntegrationFeaturesAbstract implements IntegrationFeatures { diff --git a/src/com/massivecraft/mcore4/store/Coll.java b/src/com/massivecraft/mcore5/store/Coll.java similarity index 94% rename from src/com/massivecraft/mcore4/store/Coll.java rename to src/com/massivecraft/mcore5/store/Coll.java index 78f53acc..3a40541f 100644 --- a/src/com/massivecraft/mcore4/store/Coll.java +++ b/src/com/massivecraft/mcore5/store/Coll.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Collection; import java.util.Collections; @@ -11,12 +11,12 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.Predictate; -import com.massivecraft.mcore4.store.accessor.Accessor; -import com.massivecraft.mcore4.store.idstrategy.IdStrategy; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.Predictate; +import com.massivecraft.mcore5.store.accessor.Accessor; +import com.massivecraft.mcore5.store.idstrategy.IdStrategy; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; public class Coll implements CollInterface { diff --git a/src/com/massivecraft/mcore4/store/CollInterface.java b/src/com/massivecraft/mcore5/store/CollInterface.java similarity index 91% rename from src/com/massivecraft/mcore4/store/CollInterface.java rename to src/com/massivecraft/mcore5/store/CollInterface.java index 331899cf..e0f810fe 100644 --- a/src/com/massivecraft/mcore4/store/CollInterface.java +++ b/src/com/massivecraft/mcore5/store/CollInterface.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Collection; import java.util.Comparator; import java.util.Map; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.Predictate; -import com.massivecraft.mcore4.store.idstrategy.IdStrategy; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.Predictate; +import com.massivecraft.mcore5.store.idstrategy.IdStrategy; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; public interface CollInterface { diff --git a/src/com/massivecraft/mcore4/store/Colls.java b/src/com/massivecraft/mcore5/store/Colls.java similarity index 89% rename from src/com/massivecraft/mcore4/store/Colls.java rename to src/com/massivecraft/mcore5/store/Colls.java index 85644331..f529d8b7 100644 --- a/src/com/massivecraft/mcore4/store/Colls.java +++ b/src/com/massivecraft/mcore5/store/Colls.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.usys.Multiverse; -import com.massivecraft.mcore4.util.MUtil; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore5.util.MUtil; public abstract class Colls, E, L> { diff --git a/src/com/massivecraft/mcore4/store/Db.java b/src/com/massivecraft/mcore5/store/Db.java similarity index 80% rename from src/com/massivecraft/mcore4/store/Db.java rename to src/com/massivecraft/mcore5/store/Db.java index 20fcfe48..59bd24ea 100644 --- a/src/com/massivecraft/mcore4/store/Db.java +++ b/src/com/massivecraft/mcore5/store/Db.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore4/store/DbAbstract.java b/src/com/massivecraft/mcore5/store/DbAbstract.java similarity index 77% rename from src/com/massivecraft/mcore4/store/DbAbstract.java rename to src/com/massivecraft/mcore5/store/DbAbstract.java index dc380323..fd77cf7b 100644 --- a/src/com/massivecraft/mcore4/store/DbAbstract.java +++ b/src/com/massivecraft/mcore5/store/DbAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore4/store/DbGson.java b/src/com/massivecraft/mcore5/store/DbGson.java similarity index 83% rename from src/com/massivecraft/mcore4/store/DbGson.java rename to src/com/massivecraft/mcore5/store/DbGson.java index 89021882..b211d0a5 100644 --- a/src/com/massivecraft/mcore4/store/DbGson.java +++ b/src/com/massivecraft/mcore5/store/DbGson.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.io.File; -import com.massivecraft.mcore4.util.DiscUtil; -import com.massivecraft.mcore4.xlib.gson.JsonElement; +import com.massivecraft.mcore5.util.DiscUtil; +import com.massivecraft.mcore5.xlib.gson.JsonElement; public class DbGson extends DbAbstract { diff --git a/src/com/massivecraft/mcore4/store/DbMongo.java b/src/com/massivecraft/mcore5/store/DbMongo.java similarity index 82% rename from src/com/massivecraft/mcore4/store/DbMongo.java rename to src/com/massivecraft/mcore5/store/DbMongo.java index c823de54..21601cc9 100644 --- a/src/com/massivecraft/mcore4/store/DbMongo.java +++ b/src/com/massivecraft/mcore5/store/DbMongo.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; -import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore4.xlib.mongodb.DB; +import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore5.xlib.mongodb.DB; public class DbMongo extends DbAbstract { diff --git a/src/com/massivecraft/mcore4/store/Driver.java b/src/com/massivecraft/mcore5/store/Driver.java similarity index 87% rename from src/com/massivecraft/mcore4/store/Driver.java rename to src/com/massivecraft/mcore5/store/Driver.java index 6b5374b4..711876b8 100644 --- a/src/com/massivecraft/mcore4/store/Driver.java +++ b/src/com/massivecraft/mcore5/store/Driver.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.mcore4.store.idstrategy.IdStrategy; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore5.store.idstrategy.IdStrategy; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; public interface Driver { diff --git a/src/com/massivecraft/mcore4/store/DriverAbstract.java b/src/com/massivecraft/mcore5/store/DriverAbstract.java similarity index 85% rename from src/com/massivecraft/mcore4/store/DriverAbstract.java rename to src/com/massivecraft/mcore5/store/DriverAbstract.java index cb0350d7..7ebb7e09 100644 --- a/src/com/massivecraft/mcore4/store/DriverAbstract.java +++ b/src/com/massivecraft/mcore5/store/DriverAbstract.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.HashMap; import java.util.Map; -import com.massivecraft.mcore4.store.idstrategy.IdStrategy; +import com.massivecraft.mcore5.store.idstrategy.IdStrategy; public abstract class DriverAbstract implements Driver { diff --git a/src/com/massivecraft/mcore4/store/DriverGson.java b/src/com/massivecraft/mcore5/store/DriverGson.java similarity index 86% rename from src/com/massivecraft/mcore4/store/DriverGson.java rename to src/com/massivecraft/mcore5/store/DriverGson.java index 2958a99c..e388a1fd 100644 --- a/src/com/massivecraft/mcore4/store/DriverGson.java +++ b/src/com/massivecraft/mcore5/store/DriverGson.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.io.File; import java.util.AbstractMap.SimpleEntry; @@ -11,14 +11,14 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyAiGson; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyOidGson; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyUuidMongoAndGson; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapter; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapterGson; -import com.massivecraft.mcore4.util.DiscUtil; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonParser; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyAiGson; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyOidGson; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyUuidMongoAndGson; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapterGson; +import com.massivecraft.mcore5.util.DiscUtil; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonParser; public class DriverGson extends DriverAbstract { diff --git a/src/com/massivecraft/mcore4/store/DriverMongo.java b/src/com/massivecraft/mcore5/store/DriverMongo.java similarity index 86% rename from src/com/massivecraft/mcore4/store/DriverMongo.java rename to src/com/massivecraft/mcore5/store/DriverMongo.java index 17390d27..93b4db9c 100644 --- a/src/com/massivecraft/mcore4/store/DriverMongo.java +++ b/src/com/massivecraft/mcore5/store/DriverMongo.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.ArrayList; import java.util.Collection; @@ -9,16 +9,16 @@ import java.util.Set; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyAiMongo; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyOidMongo; -import com.massivecraft.mcore4.store.idstrategy.IdStrategyUuidMongoAndGson; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapter; -import com.massivecraft.mcore4.store.storeadapter.StoreAdapterMongo; -import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore4.xlib.mongodb.DB; -import com.massivecraft.mcore4.xlib.mongodb.DBCollection; -import com.massivecraft.mcore4.xlib.mongodb.DBCursor; -import com.massivecraft.mcore4.xlib.mongodb.MongoURI; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyAiMongo; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyOidMongo; +import com.massivecraft.mcore5.store.idstrategy.IdStrategyUuidMongoAndGson; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore5.store.storeadapter.StoreAdapterMongo; +import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore5.xlib.mongodb.DB; +import com.massivecraft.mcore5.xlib.mongodb.DBCollection; +import com.massivecraft.mcore5.xlib.mongodb.DBCursor; +import com.massivecraft.mcore5.xlib.mongodb.MongoURI; public class DriverMongo extends DriverAbstract { diff --git a/src/com/massivecraft/mcore4/store/Entity.java b/src/com/massivecraft/mcore5/store/Entity.java similarity index 88% rename from src/com/massivecraft/mcore4/store/Entity.java rename to src/com/massivecraft/mcore5/store/Entity.java index 88ecffda..94d16f10 100644 --- a/src/com/massivecraft/mcore4/store/Entity.java +++ b/src/com/massivecraft/mcore5/store/Entity.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.store.accessor.Accessor; -import com.massivecraft.mcore4.xlib.gson.Gson; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.store.accessor.Accessor; +import com.massivecraft.mcore5.xlib.gson.Gson; /** * Usage of this class is highly optional. You may persist anything. If you are diff --git a/src/com/massivecraft/mcore4/store/ExamineThread.java b/src/com/massivecraft/mcore5/store/ExamineThread.java similarity index 90% rename from src/com/massivecraft/mcore4/store/ExamineThread.java rename to src/com/massivecraft/mcore5/store/ExamineThread.java index d81fd9d0..870fb6fd 100644 --- a/src/com/massivecraft/mcore4/store/ExamineThread.java +++ b/src/com/massivecraft/mcore5/store/ExamineThread.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; public class ExamineThread extends Thread { diff --git a/src/com/massivecraft/mcore4/store/JsonFileFilter.java b/src/com/massivecraft/mcore5/store/JsonFileFilter.java similarity index 89% rename from src/com/massivecraft/mcore4/store/JsonFileFilter.java rename to src/com/massivecraft/mcore5/store/JsonFileFilter.java index 6b007ca1..b0777dd5 100644 --- a/src/com/massivecraft/mcore4/store/JsonFileFilter.java +++ b/src/com/massivecraft/mcore5/store/JsonFileFilter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.io.File; import java.io.FileFilter; diff --git a/src/com/massivecraft/mcore4/store/MStore.java b/src/com/massivecraft/mcore5/store/MStore.java similarity index 88% rename from src/com/massivecraft/mcore4/store/MStore.java rename to src/com/massivecraft/mcore5/store/MStore.java index 99885d84..d5bd55c8 100644 --- a/src/com/massivecraft/mcore4/store/MStore.java +++ b/src/com/massivecraft/mcore5/store/MStore.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import com.massivecraft.mcore4.MCore; +import com.massivecraft.mcore5.MCore; public class MStore diff --git a/src/com/massivecraft/mcore4/store/MStoreUtil.java b/src/com/massivecraft/mcore5/store/MStoreUtil.java similarity index 88% rename from src/com/massivecraft/mcore4/store/MStoreUtil.java rename to src/com/massivecraft/mcore5/store/MStoreUtil.java index 5b4da69a..40845292 100644 --- a/src/com/massivecraft/mcore4/store/MStoreUtil.java +++ b/src/com/massivecraft/mcore5/store/MStoreUtil.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import com.massivecraft.mcore4.Predictate; +import com.massivecraft.mcore5.Predictate; public class MStoreUtil { diff --git a/src/com/massivecraft/mcore4/store/ModificationState.java b/src/com/massivecraft/mcore5/store/ModificationState.java similarity index 90% rename from src/com/massivecraft/mcore4/store/ModificationState.java rename to src/com/massivecraft/mcore5/store/ModificationState.java index cb7f28e1..90b12543 100644 --- a/src/com/massivecraft/mcore4/store/ModificationState.java +++ b/src/com/massivecraft/mcore5/store/ModificationState.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; public enum ModificationState { diff --git a/src/com/massivecraft/mcore4/store/PlayerColl.java b/src/com/massivecraft/mcore5/store/PlayerColl.java similarity index 84% rename from src/com/massivecraft/mcore4/store/PlayerColl.java rename to src/com/massivecraft/mcore5/store/PlayerColl.java index 005db462..78eedf94 100644 --- a/src/com/massivecraft/mcore4/store/PlayerColl.java +++ b/src/com/massivecraft/mcore5/store/PlayerColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.ArrayList; import java.util.Collection; @@ -7,15 +7,15 @@ import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.Predictate; -import com.massivecraft.mcore4.cmd.arg.ARStringEntity; -import com.massivecraft.mcore4.cmd.arg.ARStringMatchFullCI; -import com.massivecraft.mcore4.cmd.arg.ARStringMatchStartCI; -import com.massivecraft.mcore4.cmd.arg.ArgReader; -import com.massivecraft.mcore4.util.MUtil; -import com.massivecraft.mcore4.util.PlayerUtil; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore5.Predictate; +import com.massivecraft.mcore5.cmd.arg.ARStringEntity; +import com.massivecraft.mcore5.cmd.arg.ARStringMatchFullCI; +import com.massivecraft.mcore5.cmd.arg.ARStringMatchStartCI; +import com.massivecraft.mcore5.cmd.arg.ArgReader; +import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore5.util.PlayerUtil; public class PlayerColl> extends Coll { diff --git a/src/com/massivecraft/mcore4/store/PlayerEntity.java b/src/com/massivecraft/mcore5/store/PlayerEntity.java similarity index 90% rename from src/com/massivecraft/mcore4/store/PlayerEntity.java rename to src/com/massivecraft/mcore5/store/PlayerEntity.java index 63b1070b..0cc303fe 100644 --- a/src/com/massivecraft/mcore4/store/PlayerEntity.java +++ b/src/com/massivecraft/mcore5/store/PlayerEntity.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store; +package com.massivecraft.mcore5.store; import java.util.Collection; @@ -6,8 +6,8 @@ import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; -import com.massivecraft.mcore4.util.PlayerUtil; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.util.PlayerUtil; +import com.massivecraft.mcore5.util.Txt; public abstract class PlayerEntity> extends Entity diff --git a/src/com/massivecraft/mcore4/store/accessor/Accessor.java b/src/com/massivecraft/mcore5/store/accessor/Accessor.java similarity index 86% rename from src/com/massivecraft/mcore4/store/accessor/Accessor.java rename to src/com/massivecraft/mcore5/store/accessor/Accessor.java index 2d34dcd5..d3d76e7b 100644 --- a/src/com/massivecraft/mcore4/store/accessor/Accessor.java +++ b/src/com/massivecraft/mcore5/store/accessor/Accessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/store/accessor/AccessorUtil.java b/src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java similarity index 95% rename from src/com/massivecraft/mcore4/store/accessor/AccessorUtil.java rename to src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java index 0b21bc96..22f0fee7 100644 --- a/src/com/massivecraft/mcore4/store/accessor/AccessorUtil.java +++ b/src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore4/store/accessor/EntityAccessor.java b/src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java similarity index 61% rename from src/com/massivecraft/mcore4/store/accessor/EntityAccessor.java rename to src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java index f88b3b6b..957397b8 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntityAccessor.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface EntityAccessor extends EntitySetter, EntityGetter, EntityGlue { diff --git a/src/com/massivecraft/mcore4/store/accessor/EntityAccessorAbstract.java b/src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java similarity index 92% rename from src/com/massivecraft/mcore4/store/accessor/EntityAccessorAbstract.java rename to src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java index 9e5591f1..a6535dda 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntityAccessorAbstract.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/store/accessor/EntityAccessorPerProperty.java b/src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java similarity index 94% rename from src/com/massivecraft/mcore4/store/accessor/EntityAccessorPerProperty.java rename to src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java index 400cd4b8..42da9c00 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntityAccessorPerProperty.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.util.Collection; import java.util.HashMap; diff --git a/src/com/massivecraft/mcore4/store/accessor/EntityGetter.java b/src/com/massivecraft/mcore5/store/accessor/EntityGetter.java similarity index 61% rename from src/com/massivecraft/mcore4/store/accessor/EntityGetter.java rename to src/com/massivecraft/mcore5/store/accessor/EntityGetter.java index b82568e2..ff76393b 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntityGetter.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntityGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface EntityGetter { diff --git a/src/com/massivecraft/mcore4/store/accessor/EntityGlue.java b/src/com/massivecraft/mcore5/store/accessor/EntityGlue.java similarity index 89% rename from src/com/massivecraft/mcore4/store/accessor/EntityGlue.java rename to src/com/massivecraft/mcore5/store/accessor/EntityGlue.java index 27de4e1b..35b26084 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntityGlue.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntityGlue.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/store/accessor/EntitySetter.java b/src/com/massivecraft/mcore5/store/accessor/EntitySetter.java similarity index 64% rename from src/com/massivecraft/mcore4/store/accessor/EntitySetter.java rename to src/com/massivecraft/mcore5/store/accessor/EntitySetter.java index 16a241f5..b71287bb 100644 --- a/src/com/massivecraft/mcore4/store/accessor/EntitySetter.java +++ b/src/com/massivecraft/mcore5/store/accessor/EntitySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface EntitySetter { diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertyAccessor.java b/src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java similarity index 59% rename from src/com/massivecraft/mcore4/store/accessor/PropertyAccessor.java rename to src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java index 6e9d6d54..3c300643 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertyAccessor.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface PropertyAccessor extends PropertySetter, PropertyGetter { diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertyAccessorComposite.java b/src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java similarity index 86% rename from src/com/massivecraft/mcore4/store/accessor/PropertyAccessorComposite.java rename to src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java index 4ecf1423..ee6df46c 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertyAccessorComposite.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public class PropertyAccessorComposite implements PropertyAccessor { diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertyGetter.java b/src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java similarity index 57% rename from src/com/massivecraft/mcore4/store/accessor/PropertyGetter.java rename to src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java index 3fd8a147..3ec02c37 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertyGetter.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface PropertyGetter { diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertyGetterFieldReflection.java b/src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java similarity index 84% rename from src/com/massivecraft/mcore4/store/accessor/PropertyGetterFieldReflection.java rename to src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java index 6439ce99..5c3d7fe9 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertyGetterFieldReflection.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertyGetterMethodReflection.java b/src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java similarity index 85% rename from src/com/massivecraft/mcore4/store/accessor/PropertyGetterMethodReflection.java rename to src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java index 17755979..20d3d524 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertyGetterMethodReflection.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertySetter.java b/src/com/massivecraft/mcore5/store/accessor/PropertySetter.java similarity index 60% rename from src/com/massivecraft/mcore4/store/accessor/PropertySetter.java rename to src/com/massivecraft/mcore5/store/accessor/PropertySetter.java index 3e9d5b44..173d16d2 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertySetter.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; public interface PropertySetter { diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertySetterFieldReflection.java b/src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java similarity index 84% rename from src/com/massivecraft/mcore4/store/accessor/PropertySetterFieldReflection.java rename to src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java index b2230c1c..73ca1e12 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertySetterFieldReflection.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore4/store/accessor/PropertySetterMethodReflection.java b/src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java similarity index 85% rename from src/com/massivecraft/mcore4/store/accessor/PropertySetterMethodReflection.java rename to src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java index d69f4c68..1ee4610d 100644 --- a/src/com/massivecraft/mcore4/store/accessor/PropertySetterMethodReflection.java +++ b/src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.accessor; +package com.massivecraft.mcore5.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategy.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java similarity index 85% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategy.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java index 53bffc38..23d30760 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategy.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; -import com.massivecraft.mcore4.store.CollInterface; +import com.massivecraft.mcore5.store.CollInterface; /** * The tasks of the IdStrategy: diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAbstract.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java similarity index 86% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAbstract.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java index 16d77aaf..7cb6eaa0 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAbstract.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; import java.util.Collection; -import com.massivecraft.mcore4.store.CollInterface; +import com.massivecraft.mcore5.store.CollInterface; public abstract class IdStrategyAbstract implements IdStrategy { diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiGson.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java similarity index 86% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiGson.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java index 34fe6600..2f2aab49 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiGson.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; import java.io.File; import java.io.IOException; -import com.massivecraft.mcore4.store.CollInterface; -import com.massivecraft.mcore4.store.DbGson; -import com.massivecraft.mcore4.util.DiscUtil; +import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore5.store.DbGson; +import com.massivecraft.mcore5.util.DiscUtil; public class IdStrategyAiGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiMongo.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java similarity index 84% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiMongo.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java index 70c1bc4c..377c65b2 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiMongo.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; -import com.massivecraft.mcore4.store.CollInterface; -import com.massivecraft.mcore4.store.DbMongo; -import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore4.xlib.mongodb.DBCollection; -import com.massivecraft.mcore4.xlib.mongodb.DBObject; +import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore5.store.DbMongo; +import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore5.xlib.mongodb.DBCollection; +import com.massivecraft.mcore5.xlib.mongodb.DBObject; public class IdStrategyAiMongo extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidGson.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java similarity index 83% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidGson.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java index 4ba0c002..6284446f 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidGson.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; -import com.massivecraft.mcore4.store.CollInterface; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; public class IdStrategyOidGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidMongo.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java similarity index 82% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidMongo.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java index b0fa4def..8672762e 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidMongo.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; -import com.massivecraft.mcore4.store.CollInterface; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; public class IdStrategyOidMongo extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyUuidMongoAndGson.java b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java similarity index 87% rename from src/com/massivecraft/mcore4/store/idstrategy/IdStrategyUuidMongoAndGson.java rename to src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java index c791e3d0..bef2104c 100644 --- a/src/com/massivecraft/mcore4/store/idstrategy/IdStrategyUuidMongoAndGson.java +++ b/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.store.idstrategy; +package com.massivecraft.mcore5.store.idstrategy; import java.util.UUID; -import com.massivecraft.mcore4.store.CollInterface; +import com.massivecraft.mcore5.store.CollInterface; public class IdStrategyUuidMongoAndGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore4/store/storeadapter/MongoGsonConverter.java b/src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java similarity index 84% rename from src/com/massivecraft/mcore4/store/storeadapter/MongoGsonConverter.java rename to src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java index 7f5a0a15..7625ed20 100644 --- a/src/com/massivecraft/mcore4/store/storeadapter/MongoGsonConverter.java +++ b/src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore4.store.storeadapter; +package com.massivecraft.mcore5.store.storeadapter; import java.util.Map.Entry; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; -import com.massivecraft.mcore4.xlib.gson.JsonArray; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonNull; -import com.massivecraft.mcore4.xlib.gson.JsonObject; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore4.xlib.mongodb.BasicDBList; -import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore4.xlib.mongodb.DBObject; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.gson.JsonArray; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonNull; +import com.massivecraft.mcore5.xlib.gson.JsonObject; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.mongodb.BasicDBList; +import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore5.xlib.mongodb.DBObject; public final class MongoGsonConverter { diff --git a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapter.java b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java similarity index 75% rename from src/com/massivecraft/mcore4/store/storeadapter/StoreAdapter.java rename to src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java index f5f7c495..61321ae7 100644 --- a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapter.java +++ b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.store.storeadapter; +package com.massivecraft.mcore5.store.storeadapter; -import com.massivecraft.mcore4.store.Coll; +import com.massivecraft.mcore5.store.Coll; public interface StoreAdapter { diff --git a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterAbstract.java b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java similarity index 81% rename from src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterAbstract.java rename to src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java index d592814f..6f40ca97 100644 --- a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterAbstract.java +++ b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.store.storeadapter; +package com.massivecraft.mcore5.store.storeadapter; public abstract class StoreAdapterAbstract implements StoreAdapter { diff --git a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterGson.java b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java similarity index 79% rename from src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterGson.java rename to src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java index f62992a4..0b1d942c 100644 --- a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterGson.java +++ b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.store.storeadapter; +package com.massivecraft.mcore5.store.storeadapter; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.xlib.gson.JsonElement; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.xlib.gson.JsonElement; public class StoreAdapterGson extends StoreAdapterAbstract { diff --git a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterMongo.java b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java similarity index 75% rename from src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterMongo.java rename to src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java index 6415a0eb..f8a7d375 100644 --- a/src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterMongo.java +++ b/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.store.storeadapter; +package com.massivecraft.mcore5.store.storeadapter; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.mongodb.DBObject; +import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.mongodb.DBObject; public class StoreAdapterMongo extends StoreAdapterAbstract { diff --git a/src/com/massivecraft/mcore4/usys/Aspect.java b/src/com/massivecraft/mcore5/usys/Aspect.java similarity index 87% rename from src/com/massivecraft/mcore4/usys/Aspect.java rename to src/com/massivecraft/mcore5/usys/Aspect.java index 81d3510d..ad64877b 100644 --- a/src/com/massivecraft/mcore4/usys/Aspect.java +++ b/src/com/massivecraft/mcore5/usys/Aspect.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.usys; +package com.massivecraft.mcore5.usys; import java.util.ArrayList; import java.util.Arrays; @@ -7,9 +7,9 @@ import java.util.Collection; import lombok.Getter; import lombok.Setter; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.store.Entity; -import com.massivecraft.mcore4.xlib.gson.annotations.SerializedName; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.store.Entity; +import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName; public class Aspect extends Entity { diff --git a/src/com/massivecraft/mcore4/usys/AspectColl.java b/src/com/massivecraft/mcore5/usys/AspectColl.java similarity index 86% rename from src/com/massivecraft/mcore4/usys/AspectColl.java rename to src/com/massivecraft/mcore5/usys/AspectColl.java index d990a6a7..45fad77b 100644 --- a/src/com/massivecraft/mcore4/usys/AspectColl.java +++ b/src/com/massivecraft/mcore5/usys/AspectColl.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.usys; +package com.massivecraft.mcore5.usys; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.store.Coll; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.store.Coll; public class AspectColl extends Coll { diff --git a/src/com/massivecraft/mcore4/usys/Multiverse.java b/src/com/massivecraft/mcore5/usys/Multiverse.java similarity index 91% rename from src/com/massivecraft/mcore4/usys/Multiverse.java rename to src/com/massivecraft/mcore5/usys/Multiverse.java index 8fa63932..8d9f7e19 100644 --- a/src/com/massivecraft/mcore4/usys/Multiverse.java +++ b/src/com/massivecraft/mcore5/usys/Multiverse.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.usys; +package com.massivecraft.mcore5.usys; import java.util.HashMap; import java.util.HashSet; @@ -8,10 +8,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.cmd.arg.ARUniverse; -import com.massivecraft.mcore4.store.Entity; -import com.massivecraft.mcore4.util.MUtil; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.cmd.arg.ARUniverse; +import com.massivecraft.mcore5.store.Entity; +import com.massivecraft.mcore5.util.MUtil; public class Multiverse extends Entity { diff --git a/src/com/massivecraft/mcore4/usys/MultiverseColl.java b/src/com/massivecraft/mcore5/usys/MultiverseColl.java similarity index 76% rename from src/com/massivecraft/mcore4/usys/MultiverseColl.java rename to src/com/massivecraft/mcore5/usys/MultiverseColl.java index 1e758466..c584e6c9 100644 --- a/src/com/massivecraft/mcore4/usys/MultiverseColl.java +++ b/src/com/massivecraft/mcore5/usys/MultiverseColl.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.usys; +package com.massivecraft.mcore5.usys; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.store.Coll; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.store.Coll; public class MultiverseColl extends Coll { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsys.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java similarity index 78% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsys.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java index 564411d3..a80f7dc8 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsys.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Conf; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.HelpCommand; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.Conf; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.HelpCommand; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; public class CmdUsys extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspect.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java similarity index 79% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspect.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java index a8e49f9a..229534db 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspect.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.HelpCommand; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.HelpCommand; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; public class CmdUsysAspect extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java similarity index 70% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectList.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java index d0dc639c..972ed8db 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectList.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java @@ -1,14 +1,14 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARInteger; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.usys.AspectColl; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARInteger; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.usys.AspectColl; +import com.massivecraft.mcore5.util.Txt; public class CmdUsysAspectList extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectShow.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java similarity index 66% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectShow.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java index f9b47ea4..4a84441d 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectShow.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARAspect; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARAspect; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.util.Txt; public class CmdUsysAspectShow extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectUse.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java similarity index 65% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectUse.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java index ce73f7ce..d8384602 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysAspectUse.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARAspect; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARAspect; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysAspectUse extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverse.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java similarity index 83% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverse.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java index d5896ad2..b2e2cd0f 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverse.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.HelpCommand; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.HelpCommand; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; public class CmdUsysMultiverse extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseDel.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java similarity index 68% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseDel.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java index 55ac58ce..cce73e4e 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseDel.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysMultiverseDel extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java similarity index 72% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseList.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java index f96edcf6..dd265c26 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseList.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java @@ -1,14 +1,14 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARInteger; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; -import com.massivecraft.mcore4.usys.MultiverseColl; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARInteger; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore5.usys.MultiverseColl; +import com.massivecraft.mcore5.util.Txt; public class CmdUsysMultiverseList extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseNew.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java similarity index 73% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseNew.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java index 702461b1..dd6c8641 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseNew.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.MultiverseColl; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.MultiverseColl; public class CmdUsysMultiverseNew extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseShow.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java similarity index 78% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseShow.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java index a3219100..fac846e7 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysMultiverseShow.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Aspect; -import com.massivecraft.mcore4.usys.Multiverse; -import com.massivecraft.mcore4.util.Txt; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Aspect; +import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore5.util.Txt; public class CmdUsysMultiverseShow extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverse.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java similarity index 80% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverse.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java index 1889775a..3d63b06e 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverse.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.HelpCommand; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.HelpCommand; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; public class CmdUsysUniverse extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseClear.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java similarity index 76% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseClear.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java index 3f76650c..e107024a 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseClear.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysUniverseClear extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseDel.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java similarity index 76% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseDel.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java index 64c58a0e..eb388630 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseDel.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysUniverseDel extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseNew.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java similarity index 76% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseNew.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java index c3797592..067a6f8a 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysUniverseNew.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysUniverseNew extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysWorld.java b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java similarity index 82% rename from src/com/massivecraft/mcore4/usys/cmd/CmdUsysWorld.java rename to src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java index 593a544f..af8ed793 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/CmdUsysWorld.java +++ b/src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.Permission; -import com.massivecraft.mcore4.cmd.arg.ARMultiverse; -import com.massivecraft.mcore4.cmd.req.ReqHasPerm; -import com.massivecraft.mcore4.usys.Multiverse; +import com.massivecraft.mcore5.Permission; +import com.massivecraft.mcore5.cmd.arg.ARMultiverse; +import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore5.usys.Multiverse; public class CmdUsysWorld extends UsysCommand { diff --git a/src/com/massivecraft/mcore4/usys/cmd/UsysCommand.java b/src/com/massivecraft/mcore5/usys/cmd/UsysCommand.java similarity index 60% rename from src/com/massivecraft/mcore4/usys/cmd/UsysCommand.java rename to src/com/massivecraft/mcore5/usys/cmd/UsysCommand.java index 65b4705a..55d91ffe 100644 --- a/src/com/massivecraft/mcore4/usys/cmd/UsysCommand.java +++ b/src/com/massivecraft/mcore5/usys/cmd/UsysCommand.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore4.usys.cmd; +package com.massivecraft.mcore5.usys.cmd; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.cmd.MCommand; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.cmd.MCommand; public abstract class UsysCommand extends MCommand { diff --git a/src/com/massivecraft/mcore4/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java similarity index 91% rename from src/com/massivecraft/mcore4/util/BukkitCommandUtil.java rename to src/com/massivecraft/mcore5/util/BukkitCommandUtil.java index 14d581f8..05efa1b4 100644 --- a/src/com/massivecraft/mcore4/util/BukkitCommandUtil.java +++ b/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.lang.reflect.Field; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/util/ClassLoadHack.java b/src/com/massivecraft/mcore5/util/ClassLoadHack.java similarity index 91% rename from src/com/massivecraft/mcore4/util/ClassLoadHack.java rename to src/com/massivecraft/mcore5/util/ClassLoadHack.java index 180c023e..92a2155a 100644 --- a/src/com/massivecraft/mcore4/util/ClassLoadHack.java +++ b/src/com/massivecraft/mcore5/util/ClassLoadHack.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.io.File; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore4/util/DiscUtil.java b/src/com/massivecraft/mcore5/util/DiscUtil.java similarity index 94% rename from src/com/massivecraft/mcore4/util/DiscUtil.java rename to src/com/massivecraft/mcore5/util/DiscUtil.java index 6829d0f9..6798ccc2 100644 --- a/src/com/massivecraft/mcore4/util/DiscUtil.java +++ b/src/com/massivecraft/mcore5/util/DiscUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.io.*; import java.net.URL; diff --git a/src/com/massivecraft/mcore4/util/EventUtil.java b/src/com/massivecraft/mcore5/util/EventUtil.java similarity index 95% rename from src/com/massivecraft/mcore4/util/EventUtil.java rename to src/com/massivecraft/mcore5/util/EventUtil.java index 9ba3ed4f..811e65eb 100644 --- a/src/com/massivecraft/mcore4/util/EventUtil.java +++ b/src/com/massivecraft/mcore5/util/EventUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.lang.reflect.Field; import java.util.logging.Level; diff --git a/src/com/massivecraft/mcore4/util/IntervalUtil.java b/src/com/massivecraft/mcore5/util/IntervalUtil.java similarity index 93% rename from src/com/massivecraft/mcore4/util/IntervalUtil.java rename to src/com/massivecraft/mcore5/util/IntervalUtil.java index ecee302d..ce7dfc70 100644 --- a/src/com/massivecraft/mcore4/util/IntervalUtil.java +++ b/src/com/massivecraft/mcore5/util/IntervalUtil.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore4.MCore; +import com.massivecraft.mcore5.MCore; public class IntervalUtil { diff --git a/src/com/massivecraft/mcore4/util/LibLoader.java b/src/com/massivecraft/mcore5/util/LibLoader.java similarity index 83% rename from src/com/massivecraft/mcore4/util/LibLoader.java rename to src/com/massivecraft/mcore5/util/LibLoader.java index a88da85c..0ee06429 100644 --- a/src/com/massivecraft/mcore4/util/LibLoader.java +++ b/src/com/massivecraft/mcore5/util/LibLoader.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.io.File; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.MPlugin; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.MPlugin; public class LibLoader { diff --git a/src/com/massivecraft/mcore4/util/MUtil.java b/src/com/massivecraft/mcore5/util/MUtil.java similarity index 91% rename from src/com/massivecraft/mcore4/util/MUtil.java rename to src/com/massivecraft/mcore5/util/MUtil.java index 4f0db4df..c1a2c058 100644 --- a/src/com/massivecraft/mcore4/util/MUtil.java +++ b/src/com/massivecraft/mcore5/util/MUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.util.ArrayList; import java.util.Arrays; @@ -28,13 +28,13 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; -import com.massivecraft.mcore4.InternalListener; -import com.massivecraft.mcore4.MCore; -import com.massivecraft.mcore4.util.extractor.Extractor; -import com.massivecraft.mcore4.util.extractor.ExtractorPlayer; -import com.massivecraft.mcore4.util.extractor.ExtractorPlayerName; -import com.massivecraft.mcore4.util.extractor.ExtractorWorld; -import com.massivecraft.mcore4.util.extractor.ExtractorWorldName; +import com.massivecraft.mcore5.InternalListener; +import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore5.util.extractor.Extractor; +import com.massivecraft.mcore5.util.extractor.ExtractorPlayer; +import com.massivecraft.mcore5.util.extractor.ExtractorPlayerName; +import com.massivecraft.mcore5.util.extractor.ExtractorWorld; +import com.massivecraft.mcore5.util.extractor.ExtractorWorldName; public class MUtil { diff --git a/src/com/massivecraft/mcore4/util/Perm.java b/src/com/massivecraft/mcore5/util/Perm.java similarity index 94% rename from src/com/massivecraft/mcore4/util/Perm.java rename to src/com/massivecraft/mcore5/util/Perm.java index 9eb0cd23..b7fb6ec5 100644 --- a/src/com/massivecraft/mcore4/util/Perm.java +++ b/src/com/massivecraft/mcore5/util/Perm.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.util.Map; import java.util.Map.Entry; @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -import com.massivecraft.mcore4.Lang; +import com.massivecraft.mcore5.Lang; public class Perm { diff --git a/src/com/massivecraft/mcore4/util/PlayerUtil.java b/src/com/massivecraft/mcore5/util/PlayerUtil.java similarity index 96% rename from src/com/massivecraft/mcore4/util/PlayerUtil.java rename to src/com/massivecraft/mcore5/util/PlayerUtil.java index 2235d9a6..e0152285 100644 --- a/src/com/massivecraft/mcore4/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore5/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.io.File; import java.util.List; diff --git a/src/com/massivecraft/mcore4/util/SmokeUtil.java b/src/com/massivecraft/mcore5/util/SmokeUtil.java similarity index 95% rename from src/com/massivecraft/mcore4/util/SmokeUtil.java rename to src/com/massivecraft/mcore5/util/SmokeUtil.java index c86aeb1e..893c74a7 100644 --- a/src/com/massivecraft/mcore4/util/SmokeUtil.java +++ b/src/com/massivecraft/mcore5/util/SmokeUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/util/TextWrapper.java b/src/com/massivecraft/mcore5/util/TextWrapper.java similarity index 95% rename from src/com/massivecraft/mcore4/util/TextWrapper.java rename to src/com/massivecraft/mcore5/util/TextWrapper.java index e98a3764..5e85d264 100644 --- a/src/com/massivecraft/mcore4/util/TextWrapper.java +++ b/src/com/massivecraft/mcore5/util/TextWrapper.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; // This is a modified version of: https://github.com/Bukkit/CraftBukkit/blob/dbd06b46f2bb6a0be4f93642fe0bf57d97d8feb4/src/main/java/org/bukkit/craftbukkit/TextWrapper.java public class TextWrapper diff --git a/src/com/massivecraft/mcore4/util/Txt.java b/src/com/massivecraft/mcore5/util/Txt.java similarity index 96% rename from src/com/massivecraft/mcore4/util/Txt.java rename to src/com/massivecraft/mcore5/util/Txt.java index 0ddf71fd..3c55760d 100644 --- a/src/com/massivecraft/mcore4/util/Txt.java +++ b/src/com/massivecraft/mcore5/util/Txt.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util; +package com.massivecraft.mcore5.util; import java.util.*; import java.util.AbstractMap.SimpleEntry; diff --git a/src/com/massivecraft/mcore4/util/extractor/Extractor.java b/src/com/massivecraft/mcore5/util/extractor/Extractor.java similarity index 55% rename from src/com/massivecraft/mcore4/util/extractor/Extractor.java rename to src/com/massivecraft/mcore5/util/extractor/Extractor.java index cf43d67a..58fb48d0 100644 --- a/src/com/massivecraft/mcore4/util/extractor/Extractor.java +++ b/src/com/massivecraft/mcore5/util/extractor/Extractor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; public interface Extractor { diff --git a/src/com/massivecraft/mcore4/util/extractor/ExtractorLogic.java b/src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java similarity index 95% rename from src/com/massivecraft/mcore4/util/extractor/ExtractorLogic.java rename to src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java index 96d384d0..95649ff4 100644 --- a/src/com/massivecraft/mcore4/util/extractor/ExtractorLogic.java +++ b/src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -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.mcore4.PS; -import com.massivecraft.mcore4.store.PlayerEntity; +import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore5.store.PlayerEntity; public class ExtractorLogic { diff --git a/src/com/massivecraft/mcore4/util/extractor/ExtractorPlayer.java b/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java similarity index 72% rename from src/com/massivecraft/mcore4/util/extractor/ExtractorPlayer.java rename to src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java index 80dfc4ac..c212c640 100644 --- a/src/com/massivecraft/mcore4/util/extractor/ExtractorPlayer.java +++ b/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; public class ExtractorPlayer implements Extractor { diff --git a/src/com/massivecraft/mcore4/util/extractor/ExtractorPlayerName.java b/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java similarity index 73% rename from src/com/massivecraft/mcore4/util/extractor/ExtractorPlayerName.java rename to src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java index f5c392da..354e19b7 100644 --- a/src/com/massivecraft/mcore4/util/extractor/ExtractorPlayerName.java +++ b/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; public class ExtractorPlayerName implements Extractor { diff --git a/src/com/massivecraft/mcore4/util/extractor/ExtractorWorld.java b/src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java similarity index 71% rename from src/com/massivecraft/mcore4/util/extractor/ExtractorWorld.java rename to src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java index 0f720717..a19c04c9 100644 --- a/src/com/massivecraft/mcore4/util/extractor/ExtractorWorld.java +++ b/src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; public class ExtractorWorld implements Extractor { diff --git a/src/com/massivecraft/mcore4/util/extractor/ExtractorWorldName.java b/src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java similarity index 72% rename from src/com/massivecraft/mcore4/util/extractor/ExtractorWorldName.java rename to src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java index 92a7f4c6..41fc23b7 100644 --- a/src/com/massivecraft/mcore4/util/extractor/ExtractorWorldName.java +++ b/src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.util.extractor; +package com.massivecraft.mcore5.util.extractor; public class ExtractorWorldName implements Extractor { diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSON.java b/src/com/massivecraft/mcore5/xlib/bson/BSON.java similarity index 99% rename from src/com/massivecraft/mcore4/xlib/bson/BSON.java rename to src/com/massivecraft/mcore5/xlib/bson/BSON.java index 4a20886a..ec4daa2c 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSON.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSON.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.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.mcore4.xlib.bson.util.ClassMap; +import com.massivecraft.mcore5.xlib.bson.util.ClassMap; public class BSON { diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONCallback.java b/src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/BSONCallback.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java index 4d77ce29..b1920c07 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONCallback.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; public interface BSONCallback { diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONDecoder.java b/src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/BSONDecoder.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java index ec1765b5..6d3ba0fe 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONDecoder.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONEncoder.java b/src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java similarity index 89% rename from src/com/massivecraft/mcore4/xlib/bson/BSONEncoder.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java index e71a08ff..83b93a58 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONEncoder.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java @@ -11,9 +11,9 @@ * specific language governing permissions and limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.*; +import com.massivecraft.mcore5.xlib.bson.io.*; public interface BSONEncoder { diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONException.java b/src/com/massivecraft/mcore5/xlib/bson/BSONException.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/BSONException.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONException.java index 8cf6b064..b879ce4e 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONException.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSONException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; /** * A general runtime exception raised in BSON processing. diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONLazyDecoder.java b/src/com/massivecraft/mcore5/xlib/bson/BSONLazyDecoder.java similarity index 94% rename from src/com/massivecraft/mcore4/xlib/bson/BSONLazyDecoder.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONLazyDecoder.java index 64da732f..fdc9c3d3 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONLazyDecoder.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; /** * diff --git a/src/com/massivecraft/mcore4/xlib/bson/BSONObject.java b/src/com/massivecraft/mcore5/xlib/bson/BSONObject.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/BSONObject.java rename to src/com/massivecraft/mcore5/xlib/bson/BSONObject.java index b5f98be6..1c144f7e 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BSONObject.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BSONObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; import java.util.Map; import java.util.Set; diff --git a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONCallback.java b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/BasicBSONCallback.java rename to src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java index 821b0db1..33fca848 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONCallback.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; import java.util.*; import java.util.regex.Pattern; -import com.massivecraft.mcore4.xlib.bson.types.*; +import com.massivecraft.mcore5.xlib.bson.types.*; public class BasicBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONDecoder.java b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONDecoder.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/BasicBSONDecoder.java rename to src/com/massivecraft/mcore5/xlib/bson/BasicBSONDecoder.java index c501285d..5513e2c7 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONDecoder.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import static com.massivecraft.mcore4.xlib.bson.BSON.*; +import static com.massivecraft.mcore5.xlib.bson.BSON.*; import java.io.*; -import com.massivecraft.mcore4.xlib.bson.io.PoolOutputBuffer; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; /** @@ -337,17 +337,17 @@ public class BasicBSONDecoder implements BSONDecoder { public int readInt() throws IOException { - return com.massivecraft.mcore4.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); + return com.massivecraft.mcore5.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); } public int readIntBE() throws IOException { - return com.massivecraft.mcore4.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); + return com.massivecraft.mcore5.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); } public long readLong() throws IOException { - return com.massivecraft.mcore4.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); + return com.massivecraft.mcore5.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); } public double readDouble() diff --git a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONEncoder.java b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java similarity index 86% rename from src/com/massivecraft/mcore4/xlib/bson/BasicBSONEncoder.java rename to src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java index 3f2657c7..005cfad0 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONEncoder.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java @@ -16,32 +16,32 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import static com.massivecraft.mcore4.xlib.bson.BSON.ARRAY; -import static com.massivecraft.mcore4.xlib.bson.BSON.BINARY; -import static com.massivecraft.mcore4.xlib.bson.BSON.BOOLEAN; -import static com.massivecraft.mcore4.xlib.bson.BSON.B_BINARY; -import static com.massivecraft.mcore4.xlib.bson.BSON.B_GENERAL; -import static com.massivecraft.mcore4.xlib.bson.BSON.B_UUID; -import static com.massivecraft.mcore4.xlib.bson.BSON.CODE; -import static com.massivecraft.mcore4.xlib.bson.BSON.CODE_W_SCOPE; -import static com.massivecraft.mcore4.xlib.bson.BSON.DATE; -import static com.massivecraft.mcore4.xlib.bson.BSON.EOO; -import static com.massivecraft.mcore4.xlib.bson.BSON.MAXKEY; -import static com.massivecraft.mcore4.xlib.bson.BSON.MINKEY; -import static com.massivecraft.mcore4.xlib.bson.BSON.NULL; -import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER; -import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER_INT; -import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER_LONG; -import static com.massivecraft.mcore4.xlib.bson.BSON.OBJECT; -import static com.massivecraft.mcore4.xlib.bson.BSON.OID; -import static com.massivecraft.mcore4.xlib.bson.BSON.REGEX; -import static com.massivecraft.mcore4.xlib.bson.BSON.STRING; -import static com.massivecraft.mcore4.xlib.bson.BSON.SYMBOL; -import static com.massivecraft.mcore4.xlib.bson.BSON.TIMESTAMP; -import static com.massivecraft.mcore4.xlib.bson.BSON.UNDEFINED; -import static com.massivecraft.mcore4.xlib.bson.BSON.regexFlags; +import static com.massivecraft.mcore5.xlib.bson.BSON.ARRAY; +import static com.massivecraft.mcore5.xlib.bson.BSON.BINARY; +import static com.massivecraft.mcore5.xlib.bson.BSON.BOOLEAN; +import static com.massivecraft.mcore5.xlib.bson.BSON.B_BINARY; +import static com.massivecraft.mcore5.xlib.bson.BSON.B_GENERAL; +import static com.massivecraft.mcore5.xlib.bson.BSON.B_UUID; +import static com.massivecraft.mcore5.xlib.bson.BSON.CODE; +import static com.massivecraft.mcore5.xlib.bson.BSON.CODE_W_SCOPE; +import static com.massivecraft.mcore5.xlib.bson.BSON.DATE; +import static com.massivecraft.mcore5.xlib.bson.BSON.EOO; +import static com.massivecraft.mcore5.xlib.bson.BSON.MAXKEY; +import static com.massivecraft.mcore5.xlib.bson.BSON.MINKEY; +import static com.massivecraft.mcore5.xlib.bson.BSON.NULL; +import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER; +import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_INT; +import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_LONG; +import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT; +import static com.massivecraft.mcore5.xlib.bson.BSON.OID; +import static com.massivecraft.mcore5.xlib.bson.BSON.REGEX; +import static com.massivecraft.mcore5.xlib.bson.BSON.STRING; +import static com.massivecraft.mcore5.xlib.bson.BSON.SYMBOL; +import static com.massivecraft.mcore5.xlib.bson.BSON.TIMESTAMP; +import static com.massivecraft.mcore5.xlib.bson.BSON.UNDEFINED; +import static com.massivecraft.mcore5.xlib.bson.BSON.regexFlags; import java.lang.reflect.Array; import java.nio.Buffer; @@ -56,17 +56,17 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; -import com.massivecraft.mcore4.xlib.bson.io.BasicOutputBuffer; -import com.massivecraft.mcore4.xlib.bson.io.OutputBuffer; -import com.massivecraft.mcore4.xlib.bson.types.BSONTimestamp; -import com.massivecraft.mcore4.xlib.bson.types.Binary; -import com.massivecraft.mcore4.xlib.bson.types.Code; -import com.massivecraft.mcore4.xlib.bson.types.CodeWScope; -import com.massivecraft.mcore4.xlib.bson.types.MaxKey; -import com.massivecraft.mcore4.xlib.bson.types.MinKey; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; -import com.massivecraft.mcore4.xlib.bson.types.Symbol; -import com.massivecraft.mcore4.xlib.mongodb.DBRefBase; +import com.massivecraft.mcore5.xlib.bson.io.BasicOutputBuffer; +import com.massivecraft.mcore5.xlib.bson.io.OutputBuffer; +import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp; +import com.massivecraft.mcore5.xlib.bson.types.Binary; +import com.massivecraft.mcore5.xlib.bson.types.Code; +import com.massivecraft.mcore5.xlib.bson.types.CodeWScope; +import com.massivecraft.mcore5.xlib.bson.types.MaxKey; +import com.massivecraft.mcore5.xlib.bson.types.MinKey; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.types.Symbol; +import com.massivecraft.mcore5.xlib.mongodb.DBRefBase; /** * this is meant to be pooled or cached @@ -401,7 +401,7 @@ public class BasicBSONEncoder implements BSONEncoder { int before = _buf.getPosition(); _buf.write( data ); int after = _buf.getPosition(); - com.massivecraft.mcore4.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); + com.massivecraft.mcore5.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); } protected void putUUID( String name , UUID val ){ diff --git a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONObject.java b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/BasicBSONObject.java rename to src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java index 96e46d35..83dac16a 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/BasicBSONObject.java +++ b/src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; // BSON -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; // Java import java.util.Map; @@ -310,7 +310,7 @@ public class BasicBSONObject extends LinkedHashMap implements BSO * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore4.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.mcore5.xlib.mongodb.util.JSON.serialize( this ); } public boolean equals( Object o ){ diff --git a/src/com/massivecraft/mcore4/xlib/bson/EmptyBSONCallback.java b/src/com/massivecraft/mcore5/xlib/bson/EmptyBSONCallback.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/EmptyBSONCallback.java rename to src/com/massivecraft/mcore5/xlib/bson/EmptyBSONCallback.java index 734ba9eb..91e92b31 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/EmptyBSONCallback.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; public class EmptyBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore4/xlib/bson/KeyCachingLazyBSONObject.java b/src/com/massivecraft/mcore5/xlib/bson/KeyCachingLazyBSONObject.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/KeyCachingLazyBSONObject.java rename to src/com/massivecraft/mcore5/xlib/bson/KeyCachingLazyBSONObject.java index 5f94b0eb..8af64ce5 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/KeyCachingLazyBSONObject.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; import java.util.HashMap; -import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; /** * @author brendan diff --git a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONCallback.java b/src/com/massivecraft/mcore5/xlib/bson/LazyBSONCallback.java similarity index 93% rename from src/com/massivecraft/mcore4/xlib/bson/LazyBSONCallback.java rename to src/com/massivecraft/mcore5/xlib/bson/LazyBSONCallback.java index 7001b997..38b1016b 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONCallback.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; import java.util.List; import java.util.logging.Logger; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; -import com.massivecraft.mcore4.xlib.mongodb.LazyDBObject; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.mongodb.LazyDBObject; /** diff --git a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONDecoder.java b/src/com/massivecraft/mcore5/xlib/bson/LazyBSONDecoder.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/LazyBSONDecoder.java rename to src/com/massivecraft/mcore5/xlib/bson/LazyBSONDecoder.java index 21c240cf..546c0895 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONDecoder.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.Bits; +import com.massivecraft.mcore5.xlib.bson.io.Bits; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONList.java b/src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/LazyBSONList.java rename to src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java index 5c5a9c52..793efa23 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONList.java +++ b/src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; import java.util.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONObject.java b/src/com/massivecraft/mcore5/xlib/bson/LazyBSONObject.java similarity index 99% rename from src/com/massivecraft/mcore4/xlib/bson/LazyBSONObject.java rename to src/com/massivecraft/mcore5/xlib/bson/LazyBSONObject.java index 0a679a3f..c1763e5e 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/LazyBSONObject.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore4.xlib.bson.types.*; +import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore5.xlib.bson.types.*; import java.io.IOException; import java.io.OutputStream; @@ -670,7 +670,7 @@ public class LazyBSONObject implements BSONObject { * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore4.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.mcore5.xlib.mongodb.util.JSON.serialize( this ); } /** diff --git a/src/com/massivecraft/mcore4/xlib/bson/LazyDBList.java b/src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java similarity index 82% rename from src/com/massivecraft/mcore4/xlib/bson/LazyDBList.java rename to src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java index ea73efa0..340acd8b 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/LazyDBList.java +++ b/src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java @@ -1,12 +1,12 @@ /** * */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore4.xlib.mongodb.DBObject; -import com.massivecraft.mcore4.xlib.mongodb.util.JSON; +import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore5.xlib.mongodb.DBObject; +import com.massivecraft.mcore5.xlib.mongodb.util.JSON; /** * @author scotthernandez diff --git a/src/com/massivecraft/mcore4/xlib/bson/NewBSONDecoder.java b/src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/NewBSONDecoder.java rename to src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java index 533a4b41..2ea23368 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/NewBSONDecoder.java +++ b/src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; -import com.massivecraft.mcore4.xlib.bson.io.Bits; -import com.massivecraft.mcore4.xlib.bson.types.ObjectId; +import com.massivecraft.mcore5.xlib.bson.io.Bits; +import com.massivecraft.mcore5.xlib.bson.types.ObjectId; -import static com.massivecraft.mcore4.xlib.bson.BSON.*; +import static com.massivecraft.mcore5.xlib.bson.BSON.*; // Java import java.io.IOException; diff --git a/src/com/massivecraft/mcore4/xlib/bson/Transformer.java b/src/com/massivecraft/mcore5/xlib/bson/Transformer.java similarity index 94% rename from src/com/massivecraft/mcore4/xlib/bson/Transformer.java rename to src/com/massivecraft/mcore5/xlib/bson/Transformer.java index 9840384a..5051f40a 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/Transformer.java +++ b/src/com/massivecraft/mcore5/xlib/bson/Transformer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson; +package com.massivecraft.mcore5.xlib.bson; public interface Transformer { diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/BSONByteBuffer.java b/src/com/massivecraft/mcore5/xlib/bson/io/BSONByteBuffer.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/io/BSONByteBuffer.java rename to src/com/massivecraft/mcore5/xlib/bson/io/BSONByteBuffer.java index c4d54156..3847d425 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/BSONByteBuffer.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.xlib.bson.io; -import com.massivecraft.mcore4.xlib.bson.*; +import com.massivecraft.mcore5.xlib.bson.*; import java.io.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/BasicOutputBuffer.java b/src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/io/BasicOutputBuffer.java rename to src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java index ddf19639..b28af84c 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/BasicOutputBuffer.java +++ b/src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/Bits.java b/src/com/massivecraft/mcore5/xlib/bson/io/Bits.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/io/Bits.java rename to src/com/massivecraft/mcore5/xlib/bson/io/Bits.java index 5520a2d8..b98a73a9 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/Bits.java +++ b/src/com/massivecraft/mcore5/xlib/bson/io/Bits.java @@ -17,7 +17,7 @@ */ -package com.massivecraft.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/OutputBuffer.java b/src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/io/OutputBuffer.java rename to src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java index 3fcfc723..d3791a3b 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/OutputBuffer.java +++ b/src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.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.mcore4.xlib.mongodb.util.Util.toHex( md5.digest() ); + return com.massivecraft.mcore5.xlib.mongodb.util.Util.toHex( md5.digest() ); } public void writeInt( int x ){ diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/PoolOutputBuffer.java b/src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/io/PoolOutputBuffer.java rename to src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java index 0fb99e8b..2e41fc2d 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/PoolOutputBuffer.java +++ b/src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.xlib.bson.io; import java.io.*; @@ -228,8 +228,8 @@ public class PoolOutputBuffer extends OutputBuffer { private final Position _cur = new Position(); private final Position _end = new Position(); - private static com.massivecraft.mcore4.xlib.bson.util.SimplePool _extra = - new com.massivecraft.mcore4.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ + private static com.massivecraft.mcore5.xlib.bson.util.SimplePool _extra = + new com.massivecraft.mcore5.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ protected byte[] createNew(){ return new byte[BUF_SIZE]; diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/UTF8Encoding.java b/src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java similarity index 99% rename from src/com/massivecraft/mcore4/xlib/bson/io/UTF8Encoding.java rename to src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java index dcb5ea7e..4c151228 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/io/UTF8Encoding.java +++ b/src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java @@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. */ //package org.postgresql.core; -package com.massivecraft.mcore4.xlib.bson.io; +package com.massivecraft.mcore5.xlib.bson.io; import java.io.IOException; import java.text.MessageFormat; diff --git a/src/com/massivecraft/mcore4/xlib/bson/io/package.html b/src/com/massivecraft/mcore5/xlib/bson/io/package.html similarity index 100% rename from src/com/massivecraft/mcore4/xlib/bson/io/package.html rename to src/com/massivecraft/mcore5/xlib/bson/io/package.html diff --git a/src/com/massivecraft/mcore4/xlib/bson/package.html b/src/com/massivecraft/mcore5/xlib/bson/package.html similarity index 100% rename from src/com/massivecraft/mcore4/xlib/bson/package.html rename to src/com/massivecraft/mcore5/xlib/bson/package.html diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/BSONTimestamp.java b/src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/types/BSONTimestamp.java rename to src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java index 151c4db7..c104d3e7 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/BSONTimestamp.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.io.Serializable; import java.util.Date; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/BasicBSONList.java b/src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/types/BasicBSONList.java rename to src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java index 6e38053f..bc858cac 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/BasicBSONList.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; -import com.massivecraft.mcore4.xlib.bson.*; -import com.massivecraft.mcore4.xlib.bson.util.StringRangeSet; +import com.massivecraft.mcore5.xlib.bson.*; +import com.massivecraft.mcore5.xlib.bson.util.StringRangeSet; import java.util.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/Binary.java b/src/com/massivecraft/mcore5/xlib/bson/types/Binary.java similarity index 94% rename from src/com/massivecraft/mcore4/xlib/bson/types/Binary.java rename to src/com/massivecraft/mcore5/xlib/bson/types/Binary.java index a2c3b9d8..9c532c18 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/Binary.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/Binary.java @@ -19,9 +19,9 @@ * under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; -import com.massivecraft.mcore4.xlib.bson.BSON; +import com.massivecraft.mcore5.xlib.bson.BSON; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/Code.java b/src/com/massivecraft/mcore5/xlib/bson/types/Code.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/types/Code.java rename to src/com/massivecraft/mcore5/xlib/bson/types/Code.java index c6be5fc3..ef8a745f 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/Code.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/Code.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/CodeWScope.java b/src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java similarity index 93% rename from src/com/massivecraft/mcore4/xlib/bson/types/CodeWScope.java rename to src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java index 4cc04ef1..3e091b26 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/CodeWScope.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; -import com.massivecraft.mcore4.xlib.bson.*; +import com.massivecraft.mcore5.xlib.bson.*; /** * for using the CodeWScope type diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/MaxKey.java b/src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/types/MaxKey.java rename to src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java index f0359f40..fc1b7a7b 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/MaxKey.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/MinKey.java b/src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/types/MinKey.java rename to src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java index 0c5eb5e4..d84b1453 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/MinKey.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/ObjectId.java b/src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java similarity index 99% rename from src/com/massivecraft/mcore4/xlib/bson/types/ObjectId.java rename to src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java index 7922c5d6..f9bdd241 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/ObjectId.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.net.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/Symbol.java b/src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/types/Symbol.java rename to src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java index fe0a8899..b452683b 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/types/Symbol.java +++ b/src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.types; +package com.massivecraft.mcore5.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore4/xlib/bson/types/package.html b/src/com/massivecraft/mcore5/xlib/bson/types/package.html similarity index 100% rename from src/com/massivecraft/mcore4/xlib/bson/types/package.html rename to src/com/massivecraft/mcore5/xlib/bson/types/package.html diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/AbstractCopyOnWriteMap.java b/src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/util/AbstractCopyOnWriteMap.java rename to src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java index 3488473a..cb6fd23a 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/AbstractCopyOnWriteMap.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; -import static com.massivecraft.mcore4.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.mcore5.xlib.bson.util.Assertions.notNull; import static java.util.Collections.unmodifiableCollection; import static java.util.Collections.unmodifiableSet; -import com.massivecraft.mcore4.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore4.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.mcore5.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe; import java.io.Serializable; import java.util.Collection; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/Assertions.java b/src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/util/Assertions.java rename to src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java index 902aa21a..56354e0c 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/Assertions.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; /** * Design by contract assertions. diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/ClassAncestry.java b/src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/util/ClassAncestry.java rename to src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java index d5d75c7e..ecec76b5 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/ClassAncestry.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; -import static com.massivecraft.mcore4.xlib.bson.util.CopyOnWriteMap.newHashMap; +import static com.massivecraft.mcore5.xlib.bson.util.CopyOnWriteMap.newHashMap; import static java.util.Collections.unmodifiableList; import java.util.ArrayList; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/ClassMap.java b/src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/util/ClassMap.java rename to src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java index 1cbebe79..666eb268 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/ClassMap.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; import java.util.List; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/ComputingMap.java b/src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/util/ComputingMap.java rename to src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java index 3ed3dc27..8511ab71 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/ComputingMap.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; -import static com.massivecraft.mcore4.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.mcore5.xlib.bson.util.Assertions.notNull; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/CopyOnWriteMap.java b/src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/bson/util/CopyOnWriteMap.java rename to src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java index d283d550..9745a477 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/CopyOnWriteMap.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; import java.util.Collections; import java.util.HashMap; @@ -24,9 +24,9 @@ import java.util.TreeMap; import java.util.WeakHashMap; -import com.massivecraft.mcore4.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; -import com.massivecraft.mcore4.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore4.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.mcore5.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; +import com.massivecraft.mcore5.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe; /** * A thread-safe variant of {@link Map} in which all mutative operations (the diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/Function.java b/src/com/massivecraft/mcore5/xlib/bson/util/Function.java similarity index 50% rename from src/com/massivecraft/mcore4/xlib/bson/util/Function.java rename to src/com/massivecraft/mcore5/xlib/bson/util/Function.java index 4394f862..1ee242a8 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/Function.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/Function.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; interface Function { B apply(A a); diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/SimplePool.java b/src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/util/SimplePool.java rename to src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java index 8923c25e..40964772 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/SimplePool.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; import java.util.*; import java.util.concurrent.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/StringRangeSet.java b/src/com/massivecraft/mcore5/xlib/bson/util/StringRangeSet.java similarity index 98% rename from src/com/massivecraft/mcore4/xlib/bson/util/StringRangeSet.java rename to src/com/massivecraft/mcore5/xlib/bson/util/StringRangeSet.java index 65d67211..25b7a298 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/StringRangeSet.java +++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.bson.util; +package com.massivecraft.mcore5.xlib.bson.util; import java.util.Collection; import java.util.Iterator; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/GuardedBy.java b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/bson/util/annotations/GuardedBy.java rename to src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java index 8d926830..c34cdb9d 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/GuardedBy.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore4.xlib.bson.util.annotations; +package com.massivecraft.mcore5.xlib.bson.util.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/Immutable.java b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/bson/util/annotations/Immutable.java rename to src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java index 2670c1e3..9a509087 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/Immutable.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore4.xlib.bson.util.annotations; +package com.massivecraft.mcore5.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/NotThreadSafe.java b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java similarity index 93% rename from src/com/massivecraft/mcore4/xlib/bson/util/annotations/NotThreadSafe.java rename to src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java index 24eb0a0b..4fe141d2 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/NotThreadSafe.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore4.xlib.bson.util.annotations; +package com.massivecraft.mcore5.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/ThreadSafe.java b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java similarity index 93% rename from src/com/massivecraft/mcore4/xlib/bson/util/annotations/ThreadSafe.java rename to src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java index 3cdd40f2..ed2e2dd8 100644 --- a/src/com/massivecraft/mcore4/xlib/bson/util/annotations/ThreadSafe.java +++ b/src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore4.xlib.bson.util.annotations; +package com.massivecraft.mcore5.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore4/xlib/bson/util/package.html b/src/com/massivecraft/mcore5/xlib/bson/util/package.html similarity index 100% rename from src/com/massivecraft/mcore4/xlib/bson/util/package.html rename to src/com/massivecraft/mcore5/xlib/bson/util/package.html diff --git a/src/com/massivecraft/mcore4/xlib/gson/DefaultDateTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java similarity index 87% rename from src/com/massivecraft/mcore4/xlib/gson/DefaultDateTypeAdapter.java rename to src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java index e2d29c26..6d40ad90 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/DefaultDateTypeAdapter.java +++ b/src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.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.mcore4.xlib.gson.DefaultDateTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonSerializer; -import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException; +import com.massivecraft.mcore5.xlib.gson.DefaultDateTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException; /** * This type adapter supports three subclasses of date: Date, Timestamp, and diff --git a/src/com/massivecraft/mcore4/xlib/gson/ExclusionStrategy.java b/src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java similarity index 95% rename from src/com/massivecraft/mcore4/xlib/gson/ExclusionStrategy.java rename to src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java index 930e0efa..a2a025bd 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/ExclusionStrategy.java +++ b/src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.xlib.gson; -import com.massivecraft.mcore4.xlib.gson.ExclusionStrategy; -import com.massivecraft.mcore4.xlib.gson.FieldAttributes; -import com.massivecraft.mcore4.xlib.gson.GsonBuilder; +import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy; +import com.massivecraft.mcore5.xlib.gson.FieldAttributes; +import com.massivecraft.mcore5.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/mcore4/xlib/gson/FieldAttributes.java b/src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java similarity index 97% rename from src/com/massivecraft/mcore4/xlib/gson/FieldAttributes.java rename to src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java index 5e28665b..0f8d87b4 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/FieldAttributes.java +++ b/src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.xlib.gson; -import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore4/xlib/gson/FieldNamingPolicy.java b/src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/gson/FieldNamingPolicy.java rename to src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java index 3dac9865..9d8095a2 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/FieldNamingPolicy.java +++ b/src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.xlib.gson; import java.lang.reflect.Field; -import com.massivecraft.mcore4.xlib.gson.FieldNamingStrategy; +import com.massivecraft.mcore5.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.mcore4.xlib.gson.GsonBuilder} - * to configure a {@link com.massivecraft.mcore4.xlib.gson.Gson} instance to properly translate Java field + * This enumeration should be used in conjunction with {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} + * to configure a {@link com.massivecraft.mcore5.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/mcore4/xlib/gson/FieldNamingStrategy.java b/src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java similarity index 96% rename from src/com/massivecraft/mcore4/xlib/gson/FieldNamingStrategy.java rename to src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java index 330ab680..b6dacf72 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/FieldNamingStrategy.java +++ b/src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.xlib.gson; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore4/xlib/gson/Gson.java b/src/com/massivecraft/mcore5/xlib/gson/Gson.java similarity index 92% rename from src/com/massivecraft/mcore4/xlib/gson/Gson.java rename to src/com/massivecraft/mcore5/xlib/gson/Gson.java index 99392b90..a826c09a 100644 --- a/src/com/massivecraft/mcore4/xlib/gson/Gson.java +++ b/src/com/massivecraft/mcore5/xlib/gson/Gson.java @@ -14,48 +14,48 @@ * limitations under the License. */ -package com.massivecraft.mcore4.xlib.gson; +package com.massivecraft.mcore5.xlib.gson; -import com.massivecraft.mcore4.xlib.gson.FieldNamingPolicy; -import com.massivecraft.mcore4.xlib.gson.FieldNamingStrategy; -import com.massivecraft.mcore4.xlib.gson.Gson; -import com.massivecraft.mcore4.xlib.gson.GsonBuilder; -import com.massivecraft.mcore4.xlib.gson.InstanceCreator; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore4.xlib.gson.JsonElement; -import com.massivecraft.mcore4.xlib.gson.JsonIOException; -import com.massivecraft.mcore4.xlib.gson.JsonNull; -import com.massivecraft.mcore4.xlib.gson.JsonParseException; -import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore4.xlib.gson.JsonSerializer; -import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException; -import com.massivecraft.mcore4.xlib.gson.LongSerializationPolicy; -import com.massivecraft.mcore4.xlib.gson.TypeAdapter; -import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory; -import com.massivecraft.mcore4.xlib.gson.internal.ConstructorConstructor; -import com.massivecraft.mcore4.xlib.gson.internal.Excluder; -import com.massivecraft.mcore4.xlib.gson.internal.GsonInternalAccess; -import com.massivecraft.mcore4.xlib.gson.internal.Primitives; -import com.massivecraft.mcore4.xlib.gson.internal.Streams; -import com.massivecraft.mcore4.xlib.gson.internal.bind.ArrayTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.BigDecimalTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.BigIntegerTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.CollectionTypeAdapterFactory; -import com.massivecraft.mcore4.xlib.gson.internal.bind.DateTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeReader; -import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeWriter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.MapTypeAdapterFactory; -import com.massivecraft.mcore4.xlib.gson.internal.bind.ObjectTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; -import com.massivecraft.mcore4.xlib.gson.internal.bind.SqlDateTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.TimeTypeAdapter; -import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapters; -import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken; -import com.massivecraft.mcore4.xlib.gson.stream.JsonReader; -import com.massivecraft.mcore4.xlib.gson.stream.JsonToken; -import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter; -import com.massivecraft.mcore4.xlib.gson.stream.MalformedJsonException; +import com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy; +import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy; +import com.massivecraft.mcore5.xlib.gson.Gson; +import com.massivecraft.mcore5.xlib.gson.GsonBuilder; +import com.massivecraft.mcore5.xlib.gson.InstanceCreator; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore5.xlib.gson.JsonIOException; +import com.massivecraft.mcore5.xlib.gson.JsonNull; +import com.massivecraft.mcore5.xlib.gson.JsonParseException; +import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException; +import com.massivecraft.mcore5.xlib.gson.LongSerializationPolicy; +import com.massivecraft.mcore5.xlib.gson.TypeAdapter; +import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory; +import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor; +import com.massivecraft.mcore5.xlib.gson.internal.Excluder; +import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess; +import com.massivecraft.mcore5.xlib.gson.internal.Primitives; +import com.massivecraft.mcore5.xlib.gson.internal.Streams; +import com.massivecraft.mcore5.xlib.gson.internal.bind.ArrayTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.BigDecimalTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.BigIntegerTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.CollectionTypeAdapterFactory; +import com.massivecraft.mcore5.xlib.gson.internal.bind.DateTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader; +import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.MapTypeAdapterFactory; +import com.massivecraft.mcore5.xlib.gson.internal.bind.ObjectTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; +import com.massivecraft.mcore5.xlib.gson.internal.bind.SqlDateTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.TimeTypeAdapter; +import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters; +import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken; +import com.massivecraft.mcore5.xlib.gson.stream.JsonReader; +import com.massivecraft.mcore5.xlib.gson.stream.JsonToken; +import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter; +import com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken + * @see com.massivecraft.mcore5.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.mcore4.xlib.gson.annotations.Expose} annotation. + *
  • By default, Gson ignores the {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.annotations.Since} annotation. You + *
  • By default, Gson ignores the {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example, + * this type by using the {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore5.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.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore5.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/mcore4/xlib/gson/GsonBuilder.java b/src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/gson/GsonBuilder.java
rename to src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java
index 3bad0e8b..69d66f47 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore4.xlib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore4.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore4.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore4.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore4.xlib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore4.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore4.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.DefaultDateTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy;
+import com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy;
+import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore5.xlib.gson.InstanceCreator;
+import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore5.xlib.gson.LongSerializationPolicy;
+import com.massivecraft.mcore5.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore5.xlib.gson.internal.Primitives;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore5.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.mcore4.xlib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.mcore5.xlib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java b/src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java
rename to src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java
index a062a69d..120462f4 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore5.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/mcore4/xlib/gson/JsonArray.java b/src/com/massivecraft/mcore5/xlib/gson/JsonArray.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonArray.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonArray.java
index f1ee7379..ea6d92d6 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonArray.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.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/mcore4/xlib/gson/JsonDeserializationContext.java b/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java
index 6dbd9f21..64f16db5 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
 
 /**
  * Context for deserialization that is passed to a custom deserializer during invocation of its
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java b/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java
similarity index 91%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java
index 446870c1..b10350d4 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore4.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
 
 /**
  * 
    Interface representing a custom deserializer for Json. You should write a custom
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonElement.java b/src/com/massivecraft/mcore5/xlib/gson/JsonElement.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonElement.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonElement.java
index 55e8b825..91869c00 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonElement.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonElement.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.internal.Streams;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.internal.Streams;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonIOException.java b/src/com/massivecraft/mcore5/xlib/gson/JsonIOException.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonIOException.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonIOException.java
index b3486a21..41ec7930 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonIOException.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonNull.java b/src/com/massivecraft/mcore5/xlib/gson/JsonNull.java
similarity index 87%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonNull.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonNull.java
index 782b47d8..00025bde 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonNull.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonNull.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
 
 /**
  * A class representing a Json {@code null} value.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonObject.java b/src/com/massivecraft/mcore5/xlib/gson/JsonObject.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonObject.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonObject.java
index c9f3a729..b7674271 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonObject.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonObject.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java b/src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java
index a4351a92..92ed97da 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.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/mcore4/xlib/gson/JsonParser.java b/src/com/massivecraft/mcore5/xlib/gson/JsonParser.java
similarity index 81%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonParser.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonParser.java
index 306dcffc..c523f0c7 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonParser.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.internal.Streams;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.internal.Streams;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java b/src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java
index f7de9f1f..7325b876 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.internal.LazilyParsedNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java b/src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java
similarity index 89%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java
index b89b48e0..fbffc82d 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
 
 /**
  * Context for serialization that is passed to a custom serializer during invocation of its
diff --git a/src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java b/src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java
index ab2e6601..6d740de0 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore5.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.mcore4.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.mcore5.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/mcore4/xlib/gson/JsonStreamParser.java b/src/com/massivecraft/mcore5/xlib/gson/JsonStreamParser.java
similarity index 87%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonStreamParser.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonStreamParser.java
index c44b1763..eafc6382 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.internal.Streams;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.internal.Streams;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.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/mcore4/xlib/gson/JsonSyntaxException.java b/src/com/massivecraft/mcore5/xlib/gson/JsonSyntaxException.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/gson/JsonSyntaxException.java
rename to src/com/massivecraft/mcore5/xlib/gson/JsonSyntaxException.java
index fdb4ebec..730be537 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/massivecraft/mcore4/xlib/gson/LongSerializationPolicy.java b/src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java
similarity index 91%
rename from src/com/massivecraft/mcore4/xlib/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java
index 20f72016..9458d385 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/TreeTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java
similarity index 86%
rename from src/com/massivecraft/mcore4/xlib/gson/TreeTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java
index f580e0f8..210600f9 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/TreeTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore4.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.internal.Streams;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore5.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.internal.Streams;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore4/xlib/gson/TypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/gson/TypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java
index 00279613..5c69ddcc 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/TypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.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.mcore4.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore5.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.mcore4.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore5.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/TypeAdapterFactory.java b/src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/gson/TypeAdapterFactory.java
rename to src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java
index f9fdc406..ada197e4 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/TypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson;
+package com.massivecraft.mcore5.xlib.gson;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
 
 /**
  * Creates type adapters for set of related types. Type adapter factories are
@@ -82,7 +82,7 @@ import com.massivecraft.mcore4.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.mcore4.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
+ * com.massivecraft.mcore5.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
  *
  *  GsonBuilder builder = new GsonBuilder();
  *  builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
diff --git a/src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java b/src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java
rename to src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java
index 9ef75bf3..6621e890 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.annotations;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.Gson}
- * with a {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson}
+ * with a {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java b/src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java
similarity index 87%
rename from src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java
index 778e94e8..22b8f1ff 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.annotations;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore4.xlib.gson.Gson}
+ * 
    This annotation will override any {@link com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore5.xlib.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore4.xlib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore5.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.mcore4.xlib.gson.FieldNamingPolicy
+ * @see com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/massivecraft/mcore4/xlib/gson/annotations/Since.java b/src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java
similarity index 90%
rename from src/com/massivecraft/mcore4/xlib/gson/annotations/Since.java
rename to src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java
index ab35b4cb..6c3a0179 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/annotations/Since.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.annotations;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson} with a
+ * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore5.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/mcore4/xlib/gson/annotations/Until.java b/src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java
similarity index 91%
rename from src/com/massivecraft/mcore4/xlib/gson/annotations/Until.java
rename to src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java
index e07b6dca..b32e7945 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/annotations/Until.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.annotations;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson} with a
+ * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore5.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/mcore4/xlib/gson/annotations/package-info.java b/src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java
similarity index 54%
rename from src/com/massivecraft/mcore4/xlib/gson/annotations/package-info.java
rename to src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java
index 3bf15e4d..ae897a7d 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/annotations/package-info.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore4.xlib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.mcore5.xlib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore4.xlib.gson.annotations;
\ No newline at end of file
+package com.massivecraft.mcore5.xlib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java
index 8dcb8482..dcfb67ed 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java b/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java
index d237bf19..207b20de 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import static com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java
index dcc7b2df..f887625b 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore4.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.UnsafeAllocator;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.InstanceCreator;
+import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java b/src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java
similarity index 89%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java
index 695a900f..9fc841bb 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore4.xlib.gson.FieldAttributes;
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.annotations.Expose;
-import com.massivecraft.mcore4.xlib.gson.annotations.Since;
-import com.massivecraft.mcore4.xlib.gson.annotations.Until;
-import com.massivecraft.mcore4.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore4.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy;
+import com.massivecraft.mcore5.xlib.gson.FieldAttributes;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.annotations.Expose;
+import com.massivecraft.mcore5.xlib.gson.annotations.Since;
+import com.massivecraft.mcore5.xlib.gson.annotations.Until;
+import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java b/src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java
similarity index 77%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java
index 1c130404..1880a296 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
 
 /**
  * Internal-only APIs of Gson available only to other classes in Gson.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java b/src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java
index b775de44..dfa54f23 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/mcore5/xlib/gson/internal/LazilyParsedNumber.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/LazilyParsedNumber.java
index 8a724ed2..4a3bcc3b 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
 import java.math.BigInteger;
 
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java
index be28033f..f1abf82e 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
 /**
  * Defines a generic object construction factory.  The purpose of this class
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java b/src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java
index a9f57ef7..9c4e5c4a 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.internal.Pair;
+import com.massivecraft.mcore5.xlib.gson.internal.Pair;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java b/src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java
index ce047e94..5d59b44c 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
 
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java b/src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java
similarity index 84%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java
index dee9a196..1083e167 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonParseException;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
-import com.massivecraft.mcore4.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java
index 4cf6d685..fb5a3b14 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal;
+package com.massivecraft.mcore5.xlib.gson.internal;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import com.massivecraft.mcore4.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore5.xlib.gson.internal.UnsafeAllocator;
 
 /**
  * Do sneaky things to allocate objects without invoking their constructors.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 81%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java
index 9d8d03fd..0f1078ba 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.ArrayTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 /**
  * Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
index f53e5bc7..6fd2c40b 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
index 39c51847..0ce56c45 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 81%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
index 75e80223..fe67b497 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java
index bd4b3882..d3b2daf3 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.DateTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java
index b1393b00..9bc8c1c9 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java
index 925aa3b9..99821e8a 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 88%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java
index 1796db50..83d05c2b 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.Streams;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.Streams;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java
index ca802ba4..a31ee63c 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.ObjectTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 86%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 2bcba0de..6f463c08 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore4.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore5.xlib.gson.internal.Primitives;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java
index 135b5106..2c73bca7 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.SqlDateTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java
similarity index 77%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java
index 1f851f5c..bf7a8826 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.TimeTypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.sql.Time;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 06020276..96a7aeff 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java
index 6bfda36c..90cf98e8 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.internal.bind;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.Gson;
-import com.massivecraft.mcore4.xlib.gson.JsonArray;
-import com.massivecraft.mcore4.xlib.gson.JsonElement;
-import com.massivecraft.mcore4.xlib.gson.JsonIOException;
-import com.massivecraft.mcore4.xlib.gson.JsonNull;
-import com.massivecraft.mcore4.xlib.gson.JsonObject;
-import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore4.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore4.xlib.gson.internal.LazilyParsedNumber;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.Gson;
+import com.massivecraft.mcore5.xlib.gson.JsonArray;
+import com.massivecraft.mcore5.xlib.gson.JsonElement;
+import com.massivecraft.mcore5.xlib.gson.JsonIOException;
+import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName;
+import com.massivecraft.mcore5.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 /**
  * Type adapters for basic types.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java b/src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java
similarity index 82%
rename from src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java
rename to src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java
index d85a62db..6ec6e546 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package com.massivecraft.mcore4.xlib.gson.internal;
\ No newline at end of file
+package com.massivecraft.mcore5.xlib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/xlib/gson/package-info.java b/src/com/massivecraft/mcore5/xlib/gson/package-info.java
similarity index 57%
rename from src/com/massivecraft/mcore4/xlib/gson/package-info.java
rename to src/com/massivecraft/mcore5/xlib/gson/package-info.java
index 1001d0af..64db0cd3 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/package-info.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/package-info.java
@@ -1,11 +1,11 @@
 /**
- * This package provides the {@link com.massivecraft.mcore4.xlib.gson.Gson} class to convert Json to Java and
+ * This package provides the {@link com.massivecraft.mcore5.xlib.gson.Gson} class to convert Json to Java and
  * vice-versa.
  *
- * 
    The primary class to use is {@link com.massivecraft.mcore4.xlib.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder}
+ * 
    The primary class to use is {@link com.massivecraft.mcore5.xlib.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder}
  * (to configure various options such as using versioning and so on).
    
  *
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore4.xlib.gson;
\ No newline at end of file
+package com.massivecraft.mcore5.xlib.gson;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/xlib/gson/reflect/TypeToken.java b/src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/reflect/TypeToken.java
rename to src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java
index d5fa5db4..0e2bb502 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.reflect;
+package com.massivecraft.mcore5.xlib.gson.reflect;
 
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/reflect/package-info.java b/src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java
similarity index 73%
rename from src/com/massivecraft/mcore4/xlib/gson/reflect/package-info.java
rename to src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java
index d2fd36b5..8d9bb5a7 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/reflect/package-info.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore4.xlib.gson.reflect;
\ No newline at end of file
+package com.massivecraft.mcore5.xlib.gson.reflect;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonReader.java b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/JsonReader.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java
index 2bba4e68..e947c51a 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.xlib.gson.stream;
 
-import com.massivecraft.mcore4.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore4.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.xlib.gson.stream.MalformedJsonException;
-import com.massivecraft.mcore4.xlib.gson.stream.StringPool;
+import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonScope;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore5.xlib.gson.stream.StringPool;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonScope.java b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/JsonScope.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java
index 81422234..7d9de65c 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.xlib.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonToken.java b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/JsonToken.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java
index ae0b6c2b..2d41a36a 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.xlib.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonWriter.java b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/JsonWriter.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java
index 2983ac03..0323e7ee 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.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.mcore4.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore4.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonScope;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
 
 /**
  * Writes a JSON (RFC 4627)
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/MalformedJsonException.java b/src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java
index 7892c9bf..08579693 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.xlib.gson.stream;
 
 import java.io.IOException;
 
-import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
 
 /**
  * Thrown when a reader encounters malformed JSON. Some syntax errors can be
diff --git a/src/com/massivecraft/mcore4/xlib/gson/stream/StringPool.java b/src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/gson/stream/StringPool.java
rename to src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java
index b92dfb03..3005b341 100644
--- a/src/com/massivecraft/mcore4/xlib/gson/stream/StringPool.java
+++ b/src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.gson.stream;
+package com.massivecraft.mcore5.xlib.gson.stream;
 
 /**
  * A pool of string instances. Unlike the {@link String#intern() VM's
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBList.java b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java
similarity index 91%
rename from src/com/massivecraft/mcore4/xlib/mongodb/BasicDBList.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java
index 4bddfb17..eaf5ee8d 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBList.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 
-import com.massivecraft.mcore4.xlib.bson.types.BasicBSONList;
-import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore5.xlib.bson.types.BasicBSONList;
+import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson list that is mongo specific 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java
index f4749132..d9191383 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObject.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java
@@ -16,13 +16,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Map;
 
 
-import com.massivecraft.mcore4.xlib.bson.BasicBSONObject;
-import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore5.xlib.bson.BasicBSONObject;
+import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson object that is mongo specific.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObjectBuilder.java b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObjectBuilder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java
index 815aa301..73ef8d56 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/BasicDBObjectBuilder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/Bytes.java b/src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/Bytes.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java
index d03bb745..8b80e271 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/Bytes.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.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.mcore4.xlib.bson.BSON;
-import com.massivecraft.mcore4.xlib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore4.xlib.bson.types.Code;
-import com.massivecraft.mcore4.xlib.bson.types.CodeWScope;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.BSON;
+import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp;
+import com.massivecraft.mcore5.xlib.bson.types.Code;
+import com.massivecraft.mcore5.xlib.bson.types.CodeWScope;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
 
 /**
  * Class that hold definitions of the wire protocol
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/CommandResult.java b/src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/CommandResult.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java
index 1fcebc0b..cb56f301 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/CommandResult.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DB.java b/src/com/massivecraft/mcore5/xlib/mongodb/DB.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DB.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DB.java
index b748e23e..3cbcbd01 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DB.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DB.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,8 +28,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.massivecraft.mcore4.xlib.mongodb.DBApiLayer.Result;
-import com.massivecraft.mcore4.xlib.mongodb.util.Util;
+import com.massivecraft.mcore5.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.mcore5.xlib.mongodb.util.Util;
 
 /**
  * an abstract class that represents a logical database on a server
@@ -133,7 +133,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore4.xlib.mongodb.DBObject, int) } with 0 as query option.
+     * This method calls {@link DB#command(com.massivecraft.mcore5.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
@@ -199,7 +199,7 @@ public abstract class DB {
     }
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore4.xlib.mongodb.DBObject) }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore5.xlib.mongodb.DBObject) }
      * @see List of Commands
      * @param cmd command to execute
      * @return result of command from the database
@@ -212,7 +212,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore4.xlib.mongodb.DBObject, int)  }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore5.xlib.mongodb.DBObject, int)  }
      * @see List of Commands
      * @param cmd command to execute
      * @param options query options to use
@@ -387,13 +387,13 @@ public abstract class DB {
      * @return
      * @throws MongoException
      */
-    public CommandResult getLastError( com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern )
+    public CommandResult getLastError( com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern )
         throws MongoException {
         return command( concern.getCommand() );
     }
 
     /**
-     * @see {@link DB#getLastError(com.massivecraft.mcore4.xlib.mongodb.WriteConcern) }
+     * @see {@link DB#getLastError(com.massivecraft.mcore5.xlib.mongodb.WriteConcern) }
      * @param w
      * @param wtimeout
      * @param fsync
@@ -402,7 +402,7 @@ public abstract class DB {
      */
     public CommandResult getLastError( int w , int wtimeout , boolean fsync )
         throws MongoException {
-        return command( (new com.massivecraft.mcore4.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
+        return command( (new com.massivecraft.mcore5.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
     }
 
 
@@ -412,7 +412,7 @@ public abstract class DB {
      * documentation for {@link WriteConcern} for more information.
      * @param concern write concern to use
      */
-    public void setWriteConcern( com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern ){
+    public void setWriteConcern( com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern ){
         if (concern == null) throw new IllegalArgumentException();
         _concern = concern;
     }
@@ -421,7 +421,7 @@ public abstract class DB {
      * Gets the write concern for this database.
      * @return
      */
-    public com.massivecraft.mcore4.xlib.mongodb.WriteConcern getWriteConcern(){
+    public com.massivecraft.mcore5.xlib.mongodb.WriteConcern getWriteConcern(){
         if ( _concern != null )
             return _concern;
         return _mongo.getWriteConcern();
@@ -674,7 +674,7 @@ public abstract class DB {
      * Makes it possible to execute "read" queries on a slave node
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
@@ -719,8 +719,8 @@ public abstract class DB {
     final String _name;
 
     protected boolean _readOnly = false;
-    private com.massivecraft.mcore4.xlib.mongodb.WriteConcern _concern;
-    private com.massivecraft.mcore4.xlib.mongodb.ReadPreference _readPref;
+    private com.massivecraft.mcore5.xlib.mongodb.WriteConcern _concern;
+    private com.massivecraft.mcore5.xlib.mongodb.ReadPreference _readPref;
     final Bytes.OptionHolder _options;
 
     String _username;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBAddress.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBAddress.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java
index b0e214cb..f41a78ab 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBAddress.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBApiLayer.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBApiLayer.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java
index 529563f1..7037dda7 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBApiLayer.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,9 +32,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
 
 /** Database API
  * This cannot be directly instantiated, but the functions are available
@@ -180,7 +180,7 @@ public class DBApiLayer extends DB {
             soFar++;
 
             if ( soFar >= NUM_CURSORS_PER_BATCH ){
-                _connector.say( this , om ,com.massivecraft.mcore4.xlib.mongodb.WriteConcern.NONE );
+                _connector.say( this , om ,com.massivecraft.mcore5.xlib.mongodb.WriteConcern.NONE );
                 om = new OutMessage( _mongo , 2007 );
                 om.writeInt( 0 ); // reserved
                 om.writeInt( Math.min( NUM_CURSORS_PER_BATCH , all.size() - totalSoFar ) );
@@ -188,7 +188,7 @@ public class DBApiLayer extends DB {
             }
         }
 
-        _connector.say( this , om ,com.massivecraft.mcore4.xlib.mongodb.WriteConcern.NONE , addr );
+        _connector.say( this , om ,com.massivecraft.mcore5.xlib.mongodb.WriteConcern.NONE , addr );
     }
 
     class MyCollection extends DBCollection {
@@ -206,12 +206,12 @@ public class DBApiLayer extends DB {
             super.drop();
         }
 
-        public WriteResult insert(DBObject[] arr, com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult insert(DBObject[] arr, com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
             return insert( arr, true, concern, encoder );
         }
 
-        protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
@@ -264,7 +264,7 @@ public class DBApiLayer extends DB {
             return last;
         }
 
-        public WriteResult remove( DBObject o , com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult remove( DBObject o , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
@@ -323,7 +323,7 @@ public class DBApiLayer extends DB {
         }
 
         @Override
-        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.mcore4.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBCallback.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java
similarity index 87%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBCallback.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java
index a9115a95..3b2d44bd 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBCallback.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 
-import com.massivecraft.mcore4.xlib.bson.BSONCallback;
+import com.massivecraft.mcore5.xlib.bson.BSONCallback;
 
 /**
  * The DB callback interface.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBCallbackFactory.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBCallbackFactory.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java
index 2c6a5e7a..c191fb36 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBCallbackFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * The DBCallback factory interface.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBCollection.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBCollection.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java
index d3780e1c..af7c672c 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBCollection.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 // Mongo
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
 
 /** This class provides a skeleton implementation of a database collection.
  * 
    A typical invocation sequence is thus
@@ -182,7 +182,7 @@ public abstract class DBCollection {
     public abstract WriteResult update( DBObject q , DBObject o , boolean upsert , boolean multi , WriteConcern concern, DBEncoder encoder ) throws MongoException ;
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore4.xlib.mongodb.WriteConcern)} with default WriteConcern.
+     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore5.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
@@ -198,7 +198,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
+     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.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
@@ -210,7 +210,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
+     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.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
@@ -251,7 +251,7 @@ public abstract class DBCollection {
     public abstract WriteResult remove( DBObject o , WriteConcern concern, DBEncoder encoder ) throws MongoException ;
 
     /**
-     * calls {@link DBCollection#remove(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.WriteConcern)} with the default WriteConcern
+     * calls {@link DBCollection#remove(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.WriteConcern)} with the default WriteConcern
      * @param o the object that documents to be removed must match
      * @return
      * @throws MongoException
@@ -273,7 +273,7 @@ public abstract class DBCollection {
 
 
     /**
-     * Calls {@link DBCollection#find(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, int, int)} and applies the query options
+     * Calls {@link DBCollection#find(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.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
@@ -417,7 +417,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param sort
@@ -429,7 +429,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param update
@@ -440,7 +440,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=true, returnNew=false, upsert=false
      * @param query
      * @return the removed document
@@ -452,7 +452,7 @@ public abstract class DBCollection {
     // --- START INDEX CODE ---
 
     /**
-     * calls {@link DBCollection#createIndex(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject)} with default index options
+     * calls {@link DBCollection#createIndex(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with default index options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -489,7 +489,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject)} with default options
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with default options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -499,7 +499,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore4.xlib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore5.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
@@ -701,7 +701,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#apply(com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean)} with ensureID=true
+     * calls {@link DBCollection#apply(com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean)} with ensureID=true
      * @param o DBObject to which to add fields
      * @return the modified parameter object
      */
@@ -710,7 +710,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#doapply(com.massivecraft.mcore4.xlib.mongodb.DBObject)}, optionally adding an automatic _id field
+     * calls {@link DBCollection#doapply(com.massivecraft.mcore5.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
@@ -729,7 +729,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#save(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.WriteConcern)} with default WriteConcern
+     * calls {@link DBCollection#save(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.WriteConcern)} with default WriteConcern
      * @param jo the DBObject to save
      *        will add _id field to jo if needed
      * @return
@@ -838,7 +838,7 @@ public abstract class DBCollection {
 
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject)} with an empty query and null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with an empty query and null fields.
      *  @return number of documents that match query
      * @throws MongoException
      */
@@ -848,7 +848,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject)} with null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with null fields.
      *  @param query query to match
      *  @return
      * @throws MongoException
@@ -859,7 +859,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
      *  @param query query to match
      *  @param fields fields to return
      *  @return
@@ -946,7 +946,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#group(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.xlib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
+     * calls {@link DBCollection#group(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.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
@@ -992,7 +992,7 @@ public abstract class DBCollection {
 
 
     /**
-     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore4.xlib.mongodb.GroupCommand)} which is more standard
+     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore5.xlib.mongodb.GroupCommand)} which is more standard
      * Applies a group operation
      * @param args object representing the arguments to the group function
      * @return
@@ -1428,7 +1428,7 @@ public abstract class DBCollection {
      * makes this query ok to run on a slave node
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java
index bb001b78..f3c7e98b 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java
index 8451e081..85e04182 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.Closeable;
 import java.util.*;
 
-import com.massivecraft.mcore4.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.mcore5.xlib.mongodb.DBApiLayer.Result;
 
 
 /** An iterator over database results.
@@ -295,7 +295,7 @@ public class DBCursor implements Iterator , Iterable, Closea
      * @return a copy of the same cursor (for chaining)
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public DBCursor slaveOk(){
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBDecoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoder.java
similarity index 90%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBDecoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBDecoder.java
index ea988561..50b2d8f7 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBDecoder.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore4.xlib.bson.BSONDecoder;
+import com.massivecraft.mcore5.xlib.bson.BSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBDecoderFactory.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBDecoderFactory.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBDecoderFactory.java
index a9d756c5..bef3bdc3 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBDecoderFactory.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBEncoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java
similarity index 83%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBEncoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java
index 1a1e0e4e..4b44ca64 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBEncoder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java
@@ -11,10 +11,10 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.*;
-import com.massivecraft.mcore4.xlib.bson.io.*;
+import com.massivecraft.mcore5.xlib.bson.*;
+import com.massivecraft.mcore5.xlib.bson.io.*;
 
 public interface DBEncoder {
     public int writeObject( OutputBuffer buf, BSONObject o );
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBEncoderFactory.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBEncoderFactory.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBEncoderFactory.java
index 715262d8..8bd1d3ea 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBEncoderFactory.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java
similarity index 92%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java
index f105ca6e..5c74fa81 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBObject.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
 
 /**
  * A key-value map that can be saved to the database.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBPointer.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBPointer.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java
index e236282c..c99c363a 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBPointer.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
 
 /**
  * @deprecated
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBPort.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBPort.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java
index d0143180..72363cfc 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBPort.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.mongodb.util.ThreadUtil;
+import com.massivecraft.mcore5.xlib.mongodb.util.ThreadUtil;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBPortPool.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBPortPool.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java
index 7c2b48ef..d251af06 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBPortPool.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import com.massivecraft.mcore4.xlib.mongodb.util.SimplePool;
+import com.massivecraft.mcore5.xlib.mongodb.util.SimplePool;
 
 public class DBPortPool extends SimplePool {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBRef.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBRef.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java
index 0c9498af..6c97d17d 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBRef.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
 
 /**
  * overrides DBRefBase to understand a BSONObject representation of a reference.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBRefBase.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBRefBase.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java
index a1b768e8..0e3a28e0 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBRefBase.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * represents a database reference, which points to an object stored in the database
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DBTCPConnector.java b/src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DBTCPConnector.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java
index daf9bd8b..3fd65587 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DBTCPConnector.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.mongodb.ReadPreference.TaggedReadPreference;
+import com.massivecraft.mcore5.xlib.mongodb.ReadPreference.TaggedReadPreference;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBCallback.java b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBCallback.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java
index 66785c89..0758c5fe 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBCallback.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java
@@ -16,16 +16,16 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 // Bson
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BasicBSONCallback;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
 
 /**
  * This class overrides BasicBSONCallback to implement some extra features specific to the Database.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBDecoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBDecoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java
index 2d4db28e..0bda43e5 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBDecoder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore4.xlib.bson.BasicBSONDecoder;
+import com.massivecraft.mcore5.xlib.bson.BasicBSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBEncoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBEncoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java
index 0270e37f..62731d61 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/DefaultDBEncoder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java
@@ -10,15 +10,15 @@
  * 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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import static com.massivecraft.mcore4.xlib.bson.BSON.EOO;
-import static com.massivecraft.mcore4.xlib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore4.xlib.bson.BSON.REF;
+import static com.massivecraft.mcore5.xlib.bson.BSON.EOO;
+import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT;
+import static com.massivecraft.mcore5.xlib.bson.BSON.REF;
 
-import com.massivecraft.mcore4.xlib.bson.*;
-import com.massivecraft.mcore4.xlib.bson.io.*;
-import com.massivecraft.mcore4.xlib.bson.types.*;
+import com.massivecraft.mcore5.xlib.bson.*;
+import com.massivecraft.mcore5.xlib.bson.io.*;
+import com.massivecraft.mcore5.xlib.bson.types.*;
 
 
 public class DefaultDBEncoder extends BasicBSONEncoder implements DBEncoder {
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/GroupCommand.java b/src/com/massivecraft/mcore5/xlib/mongodb/GroupCommand.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/GroupCommand.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/GroupCommand.java
index d445571d..dda9248f 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/GroupCommand.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * This class groups the argument for a group operation and can build the underlying command object
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBCallback.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBCallback.java
similarity index 91%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyDBCallback.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyDBCallback.java
index 73efa598..4626d89c 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBCallback.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore4.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBDecoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBDecoder.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyDBDecoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyDBDecoder.java
index ad0afa05..052a4e98 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBDecoder.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore4.xlib.bson.LazyBSONDecoder;
+import com.massivecraft.mcore5.xlib.bson.LazyBSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBEncoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java
similarity index 89%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyDBEncoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java
index 3581fb27..d7206aba 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBEncoder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.io.OutputBuffer;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.io.OutputBuffer;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBObject.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyDBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyDBObject.java
index 94c5a7bc..a69f178e 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyDBObject.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore4.xlib.bson.LazyBSONObject;
-import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore5.xlib.bson.LazyBSONObject;
+import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer;
 
 public class LazyDBObject extends LazyBSONObject implements DBObject {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBCallback.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBCallback.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBCallback.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBCallback.java
index 8f8904c6..6810b5f7 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBCallback.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBDecoder.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBDecoder.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBDecoder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBDecoder.java
index 3e3f89e8..fea3fa94 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBDecoder.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBObject.java
similarity index 93%
rename from src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBObject.java
index 464ffef9..76d1f3ff 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/LazyWriteableDBObject.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer;
 
 public class LazyWriteableDBObject extends LazyDBObject {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MapReduceCommand.java b/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MapReduceCommand.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java
index 75b8bd20..085398dd 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MapReduceCommand.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MapReduceOutput.java b/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MapReduceOutput.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java
index e498f346..95f198e4 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MapReduceOutput.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * Represents the result of a map/reduce operation
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/Mongo.java b/src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/Mongo.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java
index 9a45db9c..9cbc9251 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/Mongo.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.massivecraft.mcore4.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer;
 
 /**
  * A database connection with internal pooling.
@@ -167,7 +167,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongodb node
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @throws MongoException
      */
@@ -178,7 +178,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @param options default query options
      * @throws MongoException
@@ -200,7 +200,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @throws MongoException
@@ -216,7 +216,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @param options
@@ -241,7 +241,7 @@ public class Mongo {
      * It will find all members (the master will be used by default). If you pass in a single server in the list,
      * the driver will still function as if it is a replica set. If you have a standalone server,
      * use the Mongo(ServerAddress) constructor.
    
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param replicaSetSeeds Put as many servers as you can in the list and
      * the system will figure out the rest.
      * @throws MongoException
@@ -254,7 +254,7 @@ public class Mongo {
     /**
      * 
    Creates a Mongo based on a replica set, or pair.
      * It will find all members (the master will be used by default).
    
-     * @see com.massivecraft.mcore4.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
      * @param replicaSetSeeds put as many servers as you can in the list.
      *                       the system will figure the rest out
      * @param options default query options
@@ -508,7 +508,7 @@ public class Mongo {
      * makes it possible to run read queries on slave nodes
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
@@ -586,8 +586,8 @@ public class Mongo {
     final Bytes.OptionHolder _netOptions = new Bytes.OptionHolder( null );
     final DBCleanerThread _cleaner;
 
-    com.massivecraft.mcore4.xlib.bson.util.SimplePool _bufferPool =
-        new com.massivecraft.mcore4.xlib.bson.util.SimplePool( 1000 ){
+    com.massivecraft.mcore5.xlib.bson.util.SimplePool _bufferPool =
+        new com.massivecraft.mcore5.xlib.bson.util.SimplePool( 1000 ){
 
         protected PoolOutputBuffer createNew(){
             return new PoolOutputBuffer();
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MongoException.java b/src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MongoException.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java
index ac3e60e0..0b119d5b 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MongoException.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
 
 /**
  * A general exception raised in Mongo
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MongoInternalException.java b/src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MongoInternalException.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java
index 3b1c525c..77d58072 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MongoInternalException.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * An Mongo exception internal to the driver, not carrying any error code
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MongoOptions.java b/src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MongoOptions.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java
index a82dd314..e2145311 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MongoOptions.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import javax.net.SocketFactory;
 
@@ -165,7 +165,7 @@ public class MongoOptions {
      * Default is false.
      *
      * @deprecated Replaced in MongoDB 2.0/Java Driver 2.7 with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public boolean slaveOk;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/MongoURI.java b/src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/MongoURI.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java
index 7aa1d820..63202956 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/MongoURI.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/OutMessage.java b/src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/OutMessage.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java
index 7b004c0d..77ef479a 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/OutMessage.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java
@@ -16,15 +16,15 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.BasicBSONEncoder;
-import com.massivecraft.mcore4.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BasicBSONEncoder;
+import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer;
 
 class OutMessage extends BasicBSONEncoder {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/QueryBuilder.java b/src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/QueryBuilder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java
index 0b85b8ab..f1ec3c7d 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/QueryBuilder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java
@@ -20,7 +20,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/QueryOperators.java b/src/com/massivecraft/mcore5/xlib/mongodb/QueryOperators.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/QueryOperators.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/QueryOperators.java
index 45a3fba1..63fe171b 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/QueryOperators.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 /**
  * MongoDB keywords for various query operations
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/RawDBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/mongodb/RawDBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java
index adc9a95a..e6acc82f 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/RawDBObject.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java
@@ -16,30 +16,30 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import static com.massivecraft.mcore4.xlib.bson.BSON.ARRAY;
-import static com.massivecraft.mcore4.xlib.bson.BSON.BINARY;
-import static com.massivecraft.mcore4.xlib.bson.BSON.BOOLEAN;
-import static com.massivecraft.mcore4.xlib.bson.BSON.CODE;
-import static com.massivecraft.mcore4.xlib.bson.BSON.CODE_W_SCOPE;
-import static com.massivecraft.mcore4.xlib.bson.BSON.DATE;
-import static com.massivecraft.mcore4.xlib.bson.BSON.EOO;
-import static com.massivecraft.mcore4.xlib.bson.BSON.MAXKEY;
-import static com.massivecraft.mcore4.xlib.bson.BSON.MINKEY;
-import static com.massivecraft.mcore4.xlib.bson.BSON.NULL;
-import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER;
-import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER_INT;
-import static com.massivecraft.mcore4.xlib.bson.BSON.NUMBER_LONG;
-import static com.massivecraft.mcore4.xlib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore4.xlib.bson.BSON.OID;
-import static com.massivecraft.mcore4.xlib.bson.BSON.REF;
-import static com.massivecraft.mcore4.xlib.bson.BSON.REGEX;
-import static com.massivecraft.mcore4.xlib.bson.BSON.STRING;
-import static com.massivecraft.mcore4.xlib.bson.BSON.SYMBOL;
-import static com.massivecraft.mcore4.xlib.bson.BSON.TIMESTAMP;
-import static com.massivecraft.mcore4.xlib.bson.BSON.UNDEFINED;
-import static com.massivecraft.mcore4.xlib.mongodb.util.MyAsserts.assertEquals;
+import static com.massivecraft.mcore5.xlib.bson.BSON.ARRAY;
+import static com.massivecraft.mcore5.xlib.bson.BSON.BINARY;
+import static com.massivecraft.mcore5.xlib.bson.BSON.BOOLEAN;
+import static com.massivecraft.mcore5.xlib.bson.BSON.CODE;
+import static com.massivecraft.mcore5.xlib.bson.BSON.CODE_W_SCOPE;
+import static com.massivecraft.mcore5.xlib.bson.BSON.DATE;
+import static com.massivecraft.mcore5.xlib.bson.BSON.EOO;
+import static com.massivecraft.mcore5.xlib.bson.BSON.MAXKEY;
+import static com.massivecraft.mcore5.xlib.bson.BSON.MINKEY;
+import static com.massivecraft.mcore5.xlib.bson.BSON.NULL;
+import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER;
+import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_INT;
+import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_LONG;
+import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT;
+import static com.massivecraft.mcore5.xlib.bson.BSON.OID;
+import static com.massivecraft.mcore5.xlib.bson.BSON.REF;
+import static com.massivecraft.mcore5.xlib.bson.BSON.REGEX;
+import static com.massivecraft.mcore5.xlib.bson.BSON.STRING;
+import static com.massivecraft.mcore5.xlib.bson.BSON.SYMBOL;
+import static com.massivecraft.mcore5.xlib.bson.BSON.TIMESTAMP;
+import static com.massivecraft.mcore5.xlib.bson.BSON.UNDEFINED;
+import static com.massivecraft.mcore5.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.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.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/mcore4/xlib/mongodb/ReadPreference.java b/src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/ReadPreference.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java
index e6547767..18e88d15 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/ReadPreference.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/ReflectionDBObject.java b/src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/ReflectionDBObject.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java
index 2e47c592..879032a9 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/ReflectionDBObject.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.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.mcore4.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
 
 /**
  * This class enables to map simple Class fields to a BSON object fields
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/ReplicaSetStatus.java b/src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/ReplicaSetStatus.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java
index 2cb9244e..50145ca6 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/ReplicaSetStatus.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.util.annotations.Immutable;
-import com.massivecraft.mcore4.xlib.bson.util.annotations.ThreadSafe;
-import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore5.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe;
+import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
 
 
 import java.net.UnknownHostException;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/Response.java b/src/com/massivecraft/mcore5/xlib/mongodb/Response.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/Response.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/Response.java
index 5d75c1d9..d1a366f0 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/Response.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/Response.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 // Bson
-import com.massivecraft.mcore4.xlib.bson.io.Bits;
+import com.massivecraft.mcore5.xlib.bson.io.Bits;
 
 // Java
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/ServerAddress.java b/src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/ServerAddress.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java
index 2cfe8ac6..7de3eacc 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/ServerAddress.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/ServerError.java b/src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/ServerError.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java
index 4d3f6c61..07f62ace 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/ServerError.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
 
 /**
  * Represents a server error
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/WriteConcern.java b/src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/WriteConcern.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java
index f9e3c7cb..0f85c522 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/WriteConcern.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/WriteResult.java b/src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/WriteResult.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java
index e68ccd88..803e5bce 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/WriteResult.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java
@@ -1,6 +1,6 @@
 // WriteResult.java
 
-package com.massivecraft.mcore4.xlib.mongodb;
+package com.massivecraft.mcore5.xlib.mongodb;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/CLI.java b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/CLI.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java
index 99f660c4..a7344469 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/CLI.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java
@@ -16,15 +16,15 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.gridfs;
+package com.massivecraft.mcore5.xlib.mongodb.gridfs;
 
 import java.io.File;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.Mongo;
-import com.massivecraft.mcore4.xlib.mongodb.util.Util;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.Mongo;
+import com.massivecraft.mcore5.xlib.mongodb.util.Util;
 
 
 /**
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFS.java b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFS.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java
index 81c01bf6..c404e554 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFS.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.gridfs;
+package com.massivecraft.mcore5.xlib.mongodb.gridfs;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -27,13 +27,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore4.xlib.mongodb.DB;
-import com.massivecraft.mcore4.xlib.mongodb.DBCollection;
-import com.massivecraft.mcore4.xlib.mongodb.DBCursor;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore5.xlib.mongodb.DB;
+import com.massivecraft.mcore5.xlib.mongodb.DBCollection;
+import com.massivecraft.mcore5.xlib.mongodb.DBCursor;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
 
 /**
  *  Implementation of GridFS v1.0
@@ -66,7 +66,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.mcore4.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.mcore5.xlib.mongodb.WriteConcern
      * @param db database to work with
      */
     public GridFS(DB db) {
@@ -77,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.mcore4.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.mcore5.xlib.mongodb.WriteConcern
      * @param db database to work with
      * @param bucket bucket to use in the given database
      */
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSDBFile.java b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSDBFile.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java
index ccb688c1..8bd41560 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSDBFile.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.gridfs;
+package com.massivecraft.mcore5.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.mcore4.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.MongoException;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.MongoException;
 
 /**
  * This class enables to retrieve a GridFS file metadata and content.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSFile.java b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSFile.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java
index 7f034265..da09f217 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSFile.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.gridfs;
+package com.massivecraft.mcore5.xlib.mongodb.gridfs;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,11 +27,11 @@ import java.util.Map;
 import java.util.Set;
 
 
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.MongoException;
-import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.MongoException;
+import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
 
 /**
  * The abstract class representing a GridFS file
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSInputFile.java b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSInputFile.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java
index 3facac0b..0f57d7ae 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/GridFSInputFile.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.gridfs;
+package com.massivecraft.mcore5.xlib.mongodb.gridfs;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,12 +25,12 @@ import java.security.MessageDigest;
 import java.util.Date;
 
 
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.MongoException;
-import com.massivecraft.mcore4.xlib.mongodb.util.SimplePool;
-import com.massivecraft.mcore4.xlib.mongodb.util.Util;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.MongoException;
+import com.massivecraft.mcore5.xlib.mongodb.util.SimplePool;
+import com.massivecraft.mcore5.xlib.mongodb.util.Util;
 
 /**
  * This class represents a GridFS file to be written to the database
@@ -179,7 +179,7 @@ public class GridFSInputFile extends GridFSFile {
     }
 
     /**
-     * @see com.massivecraft.mcore4.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
+     * @see com.massivecraft.mcore5.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
      *
      * @return Number of the next chunk.
      * @throws IOException
@@ -345,7 +345,7 @@ public class GridFSInputFile extends GridFSFile {
         /**
          * {@inheritDoc}
          *
-         * @see com.massivecraft.mcore4.xlib.mongodb.util.SimplePool#createNew()
+         * @see com.massivecraft.mcore5.xlib.mongodb.util.SimplePool#createNew()
          */
         protected MessageDigest createNew() {
             try {
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/gridfs/package.html b/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/package.html
similarity index 100%
rename from src/com/massivecraft/mcore4/xlib/mongodb/gridfs/package.html
rename to src/com/massivecraft/mcore5/xlib/mongodb/gridfs/package.html
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferFactory.java b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferFactory.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java
index 75cc84bb..db36975c 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferFactory.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.io;
+package com.massivecraft.mcore5.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferHolder.java b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferHolder.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java
index bd7d7ef1..8a0107a6 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferHolder.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.io;
+package com.massivecraft.mcore5.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferInputStream.java b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferInputStream.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java
index 4f11e567..c436b038 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferInputStream.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.io;
+package com.massivecraft.mcore5.xlib.mongodb.io;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferOutputStream.java b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferOutputStream.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java
index 6e41e60e..e0c5499a 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteBufferOutputStream.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.io;
+package com.massivecraft.mcore5.xlib.mongodb.io;
 
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteStream.java b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/io/ByteStream.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java
index 076f2f18..2bad2f5b 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/io/ByteStream.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.io;
+package com.massivecraft.mcore5.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/package.html b/src/com/massivecraft/mcore5/xlib/mongodb/package.html
similarity index 100%
rename from src/com/massivecraft/mcore4/xlib/mongodb/package.html
rename to src/com/massivecraft/mcore5/xlib/mongodb/package.html
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/AbstractObjectSerializer.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/AbstractObjectSerializer.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java
index 1f25045e..b8bcd77e 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/AbstractObjectSerializer.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 abstract class AbstractObjectSerializer implements ObjectSerializer {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/Args.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/Args.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java
index c0dbe713..cf365ab7 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/Args.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/Base64Codec.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/Base64Codec.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java
index bdea03a5..d46590b1 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/Base64Codec.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java
@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 /*
  *      Copyright (C) 2012 10gen Inc.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/ClassMapBasedObjectSerializer.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
index d76ca3e0..acca2b33 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
@@ -15,10 +15,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
-import com.massivecraft.mcore4.xlib.bson.util.ClassMap;
-import com.massivecraft.mcore4.xlib.mongodb.Bytes;
+import com.massivecraft.mcore5.xlib.bson.util.ClassMap;
+import com.massivecraft.mcore5.xlib.mongodb.Bytes;
 
 
 import java.util.List;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/FastStack.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/FastStack.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java
index b6f50492..0e2929df 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/FastStack.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/Hash.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/Hash.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java
index 5dbfa15a..f4edfb0a 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/Hash.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 public final class Hash {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/IdentitySet.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/IdentitySet.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java
index 3aad1fb4..2ea87ffc 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/IdentitySet.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.Collection;
 import java.util.IdentityHashMap;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSON.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/JSON.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java
index 2339fbd1..80973c3c 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSON.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 
-import com.massivecraft.mcore4.xlib.bson.BSONCallback;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.bson.BSONCallback;
+import com.massivecraft.mcore5.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.mcore4.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.mcore5.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.mcore4.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.mcore5.xlib.mongodb.util.JSONSerializers#getLegacy()
      */
     public static void serialize( Object o, StringBuilder buf) {
         JSONSerializers.getLegacy().serialize(o, buf);
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONCallback.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java
similarity index 85%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/JSONCallback.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java
index c770d3f3..1b779724 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONCallback.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -27,19 +27,19 @@ import java.util.UUID;
 import java.util.regex.Pattern;
 
 
-import com.massivecraft.mcore4.xlib.bson.BSON;
-import com.massivecraft.mcore4.xlib.bson.BSONObject;
-import com.massivecraft.mcore4.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore4.xlib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore4.xlib.bson.types.Code;
-import com.massivecraft.mcore4.xlib.bson.types.CodeWScope;
-import com.massivecraft.mcore4.xlib.bson.types.MaxKey;
-import com.massivecraft.mcore4.xlib.bson.types.MinKey;
-import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBList;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.DBRef;
+import com.massivecraft.mcore5.xlib.bson.BSON;
+import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore5.xlib.bson.BasicBSONCallback;
+import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp;
+import com.massivecraft.mcore5.xlib.bson.types.Code;
+import com.massivecraft.mcore5.xlib.bson.types.CodeWScope;
+import com.massivecraft.mcore5.xlib.bson.types.MaxKey;
+import com.massivecraft.mcore5.xlib.bson.types.MinKey;
+import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBList;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.DBRef;
 
 public class JSONCallback extends BasicBSONCallback {
     
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONParseException.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/JSONParseException.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java
index f43a6b72..8e77e4a7 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONParseException.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 /**
  * Exception throw when invalid JSON is passed to JSONParser.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONSerializers.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/JSONSerializers.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java
index c0e9b188..164220db 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/JSONSerializers.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java
@@ -14,13 +14,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
-import com.massivecraft.mcore4.xlib.bson.types.*;
-import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.xlib.mongodb.Bytes;
-import com.massivecraft.mcore4.xlib.mongodb.DBObject;
-import com.massivecraft.mcore4.xlib.mongodb.DBRefBase;
+import com.massivecraft.mcore5.xlib.bson.types.*;
+import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore5.xlib.mongodb.Bytes;
+import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore5.xlib.mongodb.DBRefBase;
 
 
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/MyAsserts.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/MyAsserts.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java
index 2823386f..f7798d72 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/MyAsserts.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/ObjectSerializer.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/ObjectSerializer.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java
index 58a0cc6b..11c4119c 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/ObjectSerializer.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 /**
  * Interface describing methods for serializing an object to a string.
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/OptionMap.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java
similarity index 94%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/OptionMap.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java
index 44af48d9..9b853cf2 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/OptionMap.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.TreeMap;
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/SimplePool.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/SimplePool.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java
index 5cec8fb2..873c5abe 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/SimplePool.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/StringBuilderPool.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/StringBuilderPool.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java
index 17698a68..4039676f 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/StringBuilderPool.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 public class StringBuilderPool extends SimplePool {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/StringParseUtil.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java
similarity index 99%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/StringParseUtil.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java
index 934e720a..886b0683 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/StringParseUtil.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 public final class StringParseUtil {
 
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadPool.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadPool.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java
index 9e801269..42ced171 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadPool.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadUtil.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadUtil.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java
index 94c988da..acefced9 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/ThreadUtil.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/TimeConstants.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java
similarity index 96%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/TimeConstants.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java
index e269ff3f..cfec016a 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/TimeConstants.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 public class TimeConstants {
     
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/UniqueList.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java
similarity index 95%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/UniqueList.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java
index ad5a80db..82c2d031 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/UniqueList.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/Util.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/Util.java
similarity index 97%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/Util.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/Util.java
index 9b8efb00..0b38c5be 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/Util.java
+++ b/src/com/massivecraft/mcore5/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.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/WeakBag.java b/src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java
similarity index 98%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/WeakBag.java
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java
index 2a800d9d..6e306bd1 100644
--- a/src/com/massivecraft/mcore4/xlib/mongodb/util/WeakBag.java
+++ b/src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.xlib.mongodb.util;
+package com.massivecraft.mcore5.xlib.mongodb.util;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore4/xlib/mongodb/util/package.html b/src/com/massivecraft/mcore5/xlib/mongodb/util/package.html
similarity index 100%
rename from src/com/massivecraft/mcore4/xlib/mongodb/util/package.html
rename to src/com/massivecraft/mcore5/xlib/mongodb/util/package.html