Renaming lib package to xlib. As in eXternal library. This makes it sort better in IDEs.

src/com/massivecraft/mcore4/MCore.java

@@ -12,12 +12,12 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.massivecraft.mcore4.adapter.InventoryAdapter;
 import com.massivecraft.mcore4.adapter.ItemStackAdapter;
 import com.massivecraft.mcore4.adapter.MongoURIAdapter;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
-import com.massivecraft.mcore4.lib.mongodb.MongoURI;
 import com.massivecraft.mcore4.persist.Persist;
 import com.massivecraft.mcore4.util.PlayerUtil;
 import com.massivecraft.mcore4.util.Txt;
+import com.massivecraft.mcore4.xlib.gson.Gson;
+import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore4.xlib.mongodb.MongoURI;
 
 public class MCore extends JavaPlugin
 {

src/com/massivecraft/mcore4/MPlugin.java

@@ -8,12 +8,12 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.massivecraft.mcore4.cmd.Cmd;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
 import com.massivecraft.mcore4.persist.One;
 import com.massivecraft.mcore4.persist.Persist;
 import com.massivecraft.mcore4.util.LibLoader;
 import com.massivecraft.mcore4.util.Txt;
+import com.massivecraft.mcore4.xlib.gson.Gson;
+import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
 
 public abstract class MPlugin extends JavaPlugin implements Listener
 {

src/com/massivecraft/mcore4/adapter/InventoryAdapter.java

@@ -6,15 +6,15 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryCustom;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
+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.mcore4.xlib.mongodb.BasicDBObject;
 
 public class InventoryAdapter implements JsonDeserializer<Inventory>, JsonSerializer<Inventory>
 {

src/com/massivecraft/mcore4/adapter/ItemStackAdapter.java

@@ -6,14 +6,14 @@ import java.util.Map.Entry;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
+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.mcore4.xlib.mongodb.BasicDBObject;
 
 public class ItemStackAdapter implements JsonDeserializer<ItemStack>, JsonSerializer<ItemStack>
 {	

src/com/massivecraft/mcore4/adapter/MongoURIAdapter.java

@@ -2,14 +2,14 @@ package com.massivecraft.mcore4.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.mongodb.MongoURI;
+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;
 
 public class MongoURIAdapter implements JsonDeserializer<MongoURI>, JsonSerializer<MongoURI>
 {

src/com/massivecraft/mcore4/persist/gson/GsonClassManager.java

@@ -12,10 +12,10 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import com.massivecraft.mcore4.Predictate;
-import com.massivecraft.mcore4.lib.gson.Gson;
 import com.massivecraft.mcore4.persist.IClassManager;
 import com.massivecraft.mcore4.persist.Persist;
 import com.massivecraft.mcore4.util.DiscUtil;
+import com.massivecraft.mcore4.xlib.gson.Gson;
 
 public abstract class GsonClassManager<T> implements IClassManager<T>
 {

src/com/massivecraft/mcore4/persist/gson/GsonPlayerEntityManager.java

@@ -9,8 +9,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerEvent;
 
 import com.massivecraft.mcore4.Predictate;
-import com.massivecraft.mcore4.lib.gson.Gson;
 import com.massivecraft.mcore4.persist.PlayerEntity;
+import com.massivecraft.mcore4.xlib.gson.Gson;
 
 public abstract class GsonPlayerEntityManager<T extends PlayerEntity<T>> extends GsonClassManager<T>
 {

src/com/massivecraft/mcore4/store/DbGson.java

@@ -2,8 +2,8 @@ package com.massivecraft.mcore4.store;
 
 import java.io.File;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
 import com.massivecraft.mcore4.util.DiscUtil;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
 
 public class DbGson extends DbAbstract<JsonElement>
 {

src/com/massivecraft/mcore4/store/DbMongo.java

@@ -1,7 +1,7 @@
 package com.massivecraft.mcore4.store;
 
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.lib.mongodb.DB;
+import com.massivecraft.mcore4.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore4.xlib.mongodb.DB;
 
 public class DbMongo extends DbAbstract<BasicDBObject>
 {

src/com/massivecraft/mcore4/store/DriverGson.java

@@ -11,14 +11,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonParser;
 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;
 
 public class DriverGson extends DriverAbstract<JsonElement>
 {

src/com/massivecraft/mcore4/store/DriverMongo.java

@@ -9,16 +9,16 @@ import java.util.Set;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
 
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.lib.mongodb.DB;
-import com.massivecraft.mcore4.lib.mongodb.DBCollection;
-import com.massivecraft.mcore4.lib.mongodb.DBCursor;
-import com.massivecraft.mcore4.lib.mongodb.MongoURI;
 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;
 
 public class DriverMongo extends DriverAbstract<BasicDBObject>
 {

src/com/massivecraft/mcore4/store/idstrategy/IdStrategyAiMongo.java

@@ -1,10 +1,10 @@
 package com.massivecraft.mcore4.store.idstrategy;
 
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.lib.mongodb.DBCollection;
-import com.massivecraft.mcore4.lib.mongodb.DBObject;
 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;
 
 public class IdStrategyAiMongo extends IdStrategyAbstract<String, String>
 {

src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidGson.java

@@ -1,7 +1,7 @@
 package com.massivecraft.mcore4.store.idstrategy;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
 import com.massivecraft.mcore4.store.CollInterface;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 public class IdStrategyOidGson extends IdStrategyAbstract<ObjectId, String>
 {

src/com/massivecraft/mcore4/store/idstrategy/IdStrategyOidMongo.java

@@ -1,7 +1,7 @@
 package com.massivecraft.mcore4.store.idstrategy;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
 import com.massivecraft.mcore4.store.CollInterface;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 public class IdStrategyOidMongo extends IdStrategyAbstract<ObjectId, ObjectId>
 {

src/com/massivecraft/mcore4/store/storeadapter/MongoGsonConverter.java

@@ -2,15 +2,15 @@ package com.massivecraft.mcore4.store.storeadapter;
 
 import java.util.Map.Entry;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
-import com.massivecraft.mcore4.lib.gson.JsonArray;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.mongodb.BasicDBList;
-import com.massivecraft.mcore4.lib.mongodb.BasicDBObject;
-import com.massivecraft.mcore4.lib.mongodb.DBObject;
+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;
 
 public final class MongoGsonConverter
 {

src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterGson.java

@@ -1,8 +1,8 @@
 package com.massivecraft.mcore4.store.storeadapter;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
 import com.massivecraft.mcore4.store.Coll;
 import com.massivecraft.mcore4.store.accessor.Accessor;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
 
 public class StoreAdapterGson extends StoreAdapterAbstract
 {

src/com/massivecraft/mcore4/store/storeadapter/StoreAdapterMongo.java

@@ -1,8 +1,8 @@
 package com.massivecraft.mcore4.store.storeadapter;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.mongodb.DBObject;
 import com.massivecraft.mcore4.store.Coll;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
+import com.massivecraft.mcore4.xlib.mongodb.DBObject;
 
 public class StoreAdapterMongo extends StoreAdapterAbstract
 {	

src/com/massivecraft/mcore4/xlib/bson/BSON.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.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.lib.bson.util.ClassMap;
+import com.massivecraft.mcore4.xlib.bson.util.ClassMap;
 
 public class BSON {
 

src/com/massivecraft/mcore4/xlib/bson/BSONCallback.java

@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 public interface BSONCallback {
     

src/com/massivecraft/mcore4/xlib/bson/BSONDecoder.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/massivecraft/mcore4/xlib/bson/BSONEncoder.java

@@ -11,9 +11,9 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.io.*;
+import com.massivecraft.mcore4.xlib.bson.io.*;
 
 
 public interface BSONEncoder {

src/com/massivecraft/mcore4/xlib/bson/BSONException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 /**
  * A general runtime exception raised in BSON processing.

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 /**
  *

src/com/massivecraft/mcore4/xlib/bson/BSONObject.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 import java.util.Map;
 import java.util.Set;

src/com/massivecraft/mcore4/xlib/bson/BasicBSONCallback.java

@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 import java.util.*;
 import java.util.regex.Pattern;
 
-import com.massivecraft.mcore4.lib.bson.types.*;
+import com.massivecraft.mcore4.xlib.bson.types.*;
 
 public class BasicBSONCallback implements BSONCallback {
 

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import static com.massivecraft.mcore4.lib.bson.BSON.*;
+import static com.massivecraft.mcore4.xlib.bson.BSON.*;
 
 import java.io.*;
 
-import com.massivecraft.mcore4.lib.bson.io.PoolOutputBuffer;
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 
 /**
@@ -337,17 +337,17 @@ public class BasicBSONDecoder implements BSONDecoder {
 
         public int readInt()
                 throws IOException {
-            return com.massivecraft.mcore4.lib.bson.io.Bits.readInt( _inputBuffer , _need(4) );
+            return com.massivecraft.mcore4.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) );
         }
 
         public int readIntBE()
                 throws IOException {
-            return com.massivecraft.mcore4.lib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) );
+            return com.massivecraft.mcore4.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) );
         }
 
         public long readLong()
                 throws IOException {
-            return com.massivecraft.mcore4.lib.bson.io.Bits.readLong( _inputBuffer , _need(8) );
+            return com.massivecraft.mcore4.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) );
         }
 
         public double readDouble()

src/com/massivecraft/mcore4/xlib/bson/BasicBSONEncoder.java

@@ -16,32 +16,32 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import static com.massivecraft.mcore4.lib.bson.BSON.ARRAY;
-import static com.massivecraft.mcore4.lib.bson.BSON.BINARY;
-import static com.massivecraft.mcore4.lib.bson.BSON.BOOLEAN;
-import static com.massivecraft.mcore4.lib.bson.BSON.B_BINARY;
-import static com.massivecraft.mcore4.lib.bson.BSON.B_GENERAL;
-import static com.massivecraft.mcore4.lib.bson.BSON.B_UUID;
-import static com.massivecraft.mcore4.lib.bson.BSON.CODE;
-import static com.massivecraft.mcore4.lib.bson.BSON.CODE_W_SCOPE;
-import static com.massivecraft.mcore4.lib.bson.BSON.DATE;
-import static com.massivecraft.mcore4.lib.bson.BSON.EOO;
-import static com.massivecraft.mcore4.lib.bson.BSON.MAXKEY;
-import static com.massivecraft.mcore4.lib.bson.BSON.MINKEY;
-import static com.massivecraft.mcore4.lib.bson.BSON.NULL;
-import static com.massivecraft.mcore4.lib.bson.BSON.NUMBER;
-import static com.massivecraft.mcore4.lib.bson.BSON.NUMBER_INT;
-import static com.massivecraft.mcore4.lib.bson.BSON.NUMBER_LONG;
-import static com.massivecraft.mcore4.lib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore4.lib.bson.BSON.OID;
-import static com.massivecraft.mcore4.lib.bson.BSON.REGEX;
-import static com.massivecraft.mcore4.lib.bson.BSON.STRING;
-import static com.massivecraft.mcore4.lib.bson.BSON.SYMBOL;
-import static com.massivecraft.mcore4.lib.bson.BSON.TIMESTAMP;
-import static com.massivecraft.mcore4.lib.bson.BSON.UNDEFINED;
-import static com.massivecraft.mcore4.lib.bson.BSON.regexFlags;
+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 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.lib.bson.io.BasicOutputBuffer;
-import com.massivecraft.mcore4.lib.bson.io.OutputBuffer;
-import com.massivecraft.mcore4.lib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore4.lib.bson.types.Binary;
-import com.massivecraft.mcore4.lib.bson.types.Code;
-import com.massivecraft.mcore4.lib.bson.types.CodeWScope;
-import com.massivecraft.mcore4.lib.bson.types.MaxKey;
-import com.massivecraft.mcore4.lib.bson.types.MinKey;
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
-import com.massivecraft.mcore4.lib.bson.types.Symbol;
-import com.massivecraft.mcore4.lib.mongodb.DBRefBase;
+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;
 
 /**
  * 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.lib.mongodb.util.MyAsserts.assertEquals( after - before , data.length );
+        com.massivecraft.mcore4.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length );
     }
     
     protected void putUUID( String name , UUID val ){

src/com/massivecraft/mcore4/xlib/bson/BasicBSONObject.java

@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 // BSON
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 // Java
 import java.util.Map;
@@ -310,7 +310,7 @@ public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSO
      * @return JSON serialization
      */
     public String toString(){
-        return com.massivecraft.mcore4.lib.mongodb.util.JSON.serialize( this );
+        return com.massivecraft.mcore4.xlib.mongodb.util.JSON.serialize( this );
     }
 
     public boolean equals( Object o ){

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
 public class EmptyBSONCallback implements BSONCallback {
 

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 import java.util.HashMap;
 
-import com.massivecraft.mcore4.lib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
 
 /**
  * @author brendan

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
-import com.massivecraft.mcore4.lib.mongodb.LazyDBObject;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.mongodb.LazyDBObject;
 
 
 /**

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.io.Bits;
+import com.massivecraft.mcore4.xlib.bson.io.Bits;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

src/com/massivecraft/mcore4/xlib/bson/LazyBSONList.java

@@ -1,6 +1,6 @@
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
 
 import java.util.*;
 

src/com/massivecraft/mcore4/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.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.io.BSONByteBuffer;
-import com.massivecraft.mcore4.lib.bson.types.*;
+import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore4.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.lib.mongodb.util.JSON.serialize( this );
+        return com.massivecraft.mcore4.xlib.mongodb.util.JSON.serialize( this );
     }
 
     /**

src/com/massivecraft/mcore4/xlib/bson/LazyDBList.java

@@ -1,12 +1,12 @@
 /**
  *
  */
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 
-import com.massivecraft.mcore4.lib.bson.io.BSONByteBuffer;
-import com.massivecraft.mcore4.lib.mongodb.DBObject;
-import com.massivecraft.mcore4.lib.mongodb.util.JSON;
+import com.massivecraft.mcore4.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore4.xlib.mongodb.DBObject;
+import com.massivecraft.mcore4.xlib.mongodb.util.JSON;
 
 /**
  * @author scotthernandez

src/com/massivecraft/mcore4/xlib/bson/NewBSONDecoder.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
-import com.massivecraft.mcore4.lib.bson.io.Bits;
-import com.massivecraft.mcore4.lib.bson.types.ObjectId;
+import com.massivecraft.mcore4.xlib.bson.io.Bits;
+import com.massivecraft.mcore4.xlib.bson.types.ObjectId;
 
-import static com.massivecraft.mcore4.lib.bson.BSON.*;
+import static com.massivecraft.mcore4.xlib.bson.BSON.*;
 
 // Java
 import java.io.IOException;

src/com/massivecraft/mcore4/xlib/bson/Transformer.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson;
+package com.massivecraft.mcore4.xlib.bson;
 
 public interface Transformer {
 

src/com/massivecraft/mcore4/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.lib.bson.io;
+package com.massivecraft.mcore4.xlib.bson.io;
 
-import com.massivecraft.mcore4.lib.bson.*;
+import com.massivecraft.mcore4.xlib.bson.*;
 
 import java.io.*;
 import java.nio.*;

src/com/massivecraft/mcore4/xlib/bson/io/BasicOutputBuffer.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.io;
+package com.massivecraft.mcore4.xlib.bson.io;
 
 import java.io.*;
 

src/com/massivecraft/mcore4/xlib/bson/io/Bits.java

@@ -17,7 +17,7 @@
  */
 
 
-package com.massivecraft.mcore4.lib.bson.io;
+package com.massivecraft.mcore4.xlib.bson.io;
 
 import java.io.*;
 

src/com/massivecraft/mcore4/xlib/bson/io/OutputBuffer.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.io;
+package com.massivecraft.mcore4.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.lib.mongodb.util.Util.toHex( md5.digest() );
+        return com.massivecraft.mcore4.xlib.mongodb.util.Util.toHex( md5.digest() );
     }
     
     public void writeInt( int x ){

src/com/massivecraft/mcore4/xlib/bson/io/PoolOutputBuffer.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.io;
+package com.massivecraft.mcore4.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.lib.bson.util.SimplePool<byte[]> _extra =
-        new com.massivecraft.mcore4.lib.bson.util.SimplePool<byte[]>( ( 1024 * 1024 * 10 ) / BUF_SIZE ){
+    private static com.massivecraft.mcore4.xlib.bson.util.SimplePool<byte[]> _extra =
+        new com.massivecraft.mcore4.xlib.bson.util.SimplePool<byte[]>( ( 1024 * 1024 * 10 ) / BUF_SIZE ){
 
         protected byte[] createNew(){
             return new byte[BUF_SIZE];

src/com/massivecraft/mcore4/xlib/bson/io/UTF8Encoding.java

@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 //package org.postgresql.core;
-package com.massivecraft.mcore4.lib.bson.io;
+package com.massivecraft.mcore4.xlib.bson.io;
 
 import java.io.IOException;
 import java.text.MessageFormat;

src/com/massivecraft/mcore4/xlib/bson/types/BSONTimestamp.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.io.Serializable;
 import java.util.Date;

src/com/massivecraft/mcore4/xlib/bson/types/BasicBSONList.java

@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
-import com.massivecraft.mcore4.lib.bson.*;
-import com.massivecraft.mcore4.lib.bson.util.StringRangeSet;
+import com.massivecraft.mcore4.xlib.bson.*;
+import com.massivecraft.mcore4.xlib.bson.util.StringRangeSet;
 
 import java.util.*;
 

src/com/massivecraft/mcore4/xlib/bson/types/Binary.java

@@ -19,9 +19,9 @@
  * under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
-import com.massivecraft.mcore4.lib.bson.BSON;
+import com.massivecraft.mcore4.xlib.bson.BSON;
 
 import java.io.Serializable;
 

src/com/massivecraft/mcore4/xlib/bson/types/Code.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.io.Serializable;
 

src/com/massivecraft/mcore4/xlib/bson/types/CodeWScope.java

@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
-import com.massivecraft.mcore4.lib.bson.*;
+import com.massivecraft.mcore4.xlib.bson.*;
 
 /** 
  * for using the CodeWScope type

src/com/massivecraft/mcore4/xlib/bson/types/MaxKey.java

@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.io.Serializable;
 

src/com/massivecraft/mcore4/xlib/bson/types/MinKey.java

@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.io.Serializable;
 

src/com/massivecraft/mcore4/xlib/bson/types/ObjectId.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.net.*;
 import java.nio.*;

src/com/massivecraft/mcore4/xlib/bson/types/Symbol.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.types;
+package com.massivecraft.mcore4.xlib.bson.types;
 
 import java.io.Serializable;
 

src/com/massivecraft/mcore4/xlib/bson/util/AbstractCopyOnWriteMap.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
-import static com.massivecraft.mcore4.lib.bson.util.Assertions.notNull;
+import static com.massivecraft.mcore4.xlib.bson.util.Assertions.notNull;
 import static java.util.Collections.unmodifiableCollection;
 import static java.util.Collections.unmodifiableSet;
 
-import com.massivecraft.mcore4.lib.bson.util.annotations.GuardedBy;
-import com.massivecraft.mcore4.lib.bson.util.annotations.ThreadSafe;
+import com.massivecraft.mcore4.xlib.bson.util.annotations.GuardedBy;
+import com.massivecraft.mcore4.xlib.bson.util.annotations.ThreadSafe;
 
 import java.io.Serializable;
 import java.util.Collection;

src/com/massivecraft/mcore4/xlib/bson/util/Assertions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
 /**
  * Design by contract assertions.

src/com/massivecraft/mcore4/xlib/bson/util/ClassAncestry.java

@@ -1,6 +1,6 @@
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
-import static com.massivecraft.mcore4.lib.bson.util.CopyOnWriteMap.newHashMap;
+import static com.massivecraft.mcore4.xlib.bson.util.CopyOnWriteMap.newHashMap;
 import static java.util.Collections.unmodifiableList;
 
 import java.util.ArrayList;

src/com/massivecraft/mcore4/xlib/bson/util/ClassMap.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
 import java.util.List;
 import java.util.Map;

src/com/massivecraft/mcore4/xlib/bson/util/ComputingMap.java

@@ -1,6 +1,6 @@
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
-import static com.massivecraft.mcore4.lib.bson.util.Assertions.notNull;
+import static com.massivecraft.mcore4.xlib.bson.util.Assertions.notNull;
 
 import java.util.Collection;
 import java.util.Map;

src/com/massivecraft/mcore4/xlib/bson/util/CopyOnWriteMap.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.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.lib.bson.util.AbstractCopyOnWriteMap.View.Type;
-import com.massivecraft.mcore4.lib.bson.util.annotations.GuardedBy;
-import com.massivecraft.mcore4.lib.bson.util.annotations.ThreadSafe;
+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;
 
 /**
  * A thread-safe variant of {@link Map} in which all mutative operations (the

src/com/massivecraft/mcore4/xlib/bson/util/Function.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
 interface Function<A, B> {
     B apply(A a);

src/com/massivecraft/mcore4/xlib/bson/util/SimplePool.java

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
 import java.util.*;
 import java.util.concurrent.*;

src/com/massivecraft/mcore4/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.lib.bson.util;
+package com.massivecraft.mcore4.xlib.bson.util;
 
 import java.util.Collection;
 import java.util.Iterator;

src/com/massivecraft/mcore4/xlib/bson/util/annotations/GuardedBy.java

@@ -8,7 +8,7 @@
  * must include this copyright and license notice.
  */
 
-package com.massivecraft.mcore4.lib.bson.util.annotations;
+package com.massivecraft.mcore4.xlib.bson.util.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/com/massivecraft/mcore4/xlib/bson/util/annotations/Immutable.java

@@ -8,7 +8,7 @@
  * must include this copyright and license notice.
  */
 
-package com.massivecraft.mcore4.lib.bson.util.annotations;
+package com.massivecraft.mcore4.xlib.bson.util.annotations;
 
 import java.lang.annotation.*;
 

src/com/massivecraft/mcore4/xlib/bson/util/annotations/NotThreadSafe.java

@@ -8,7 +8,7 @@
  * must include this copyright and license notice.
  */
 
-package com.massivecraft.mcore4.lib.bson.util.annotations;
+package com.massivecraft.mcore4.xlib.bson.util.annotations;
 
 import java.lang.annotation.*;
 

src/com/massivecraft/mcore4/xlib/bson/util/annotations/ThreadSafe.java

@@ -8,7 +8,7 @@
  * must include this copyright and license notice.
  */
 
-package com.massivecraft.mcore4.lib.bson.util.annotations;
+package com.massivecraft.mcore4.xlib.bson.util.annotations;
 
 import java.lang.annotation.*;
 

src/com/massivecraft/mcore4/xlib/gson/DefaultDateTypeAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.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.lib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
+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;
 
 /**
  * This type adapter supports three subclasses of date: Date, Timestamp, and

src/com/massivecraft/mcore4/xlib/gson/ExclusionStrategy.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore4.lib.gson.FieldAttributes;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
+import com.massivecraft.mcore4.xlib.gson.ExclusionStrategy;
+import com.massivecraft.mcore4.xlib.gson.FieldAttributes;
+import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
 
 /**
  * A strategy (or policy) definition that is used to decide whether or not a field or top-level

src/com/massivecraft/mcore4/xlib/gson/FieldAttributes.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

src/com/massivecraft/mcore4/xlib/gson/FieldNamingPolicy.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Field;
 
-import com.massivecraft.mcore4.lib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore4.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.lib.gson.GsonBuilder}
- * to configure a {@link com.massivecraft.mcore4.lib.gson.Gson} instance to properly translate Java field
+ * 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
  * names into the desired JSON field names.
  *
  * @author Inderjeet Singh

src/com/massivecraft/mcore4/xlib/gson/FieldNamingStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Field;
 

src/com/massivecraft/mcore4/xlib/gson/Gson.java

@@ -14,48 +14,48 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore4.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
-import com.massivecraft.mcore4.lib.gson.InstanceCreator;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonIOException;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.Excluder;
-import com.massivecraft.mcore4.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore4.lib.gson.internal.Primitives;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.BigDecimalTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.BigIntegerTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.CollectionTypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore4.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.MapTypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.lib.gson.stream.JsonWriter;
-import com.massivecraft.mcore4.lib.gson.stream.MalformedJsonException;
+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 java.io.EOFException;
 import java.io.IOException;
@@ -109,7 +109,7 @@ import java.util.Map;
  * <p>See the <a href="https://sites.google.com/site/gson/gson-user-guide">Gson User Guide</a>
  * for a more complete set of examples.</p>
  *
- * @see com.massivecraft.mcore4.lib.gson.reflect.TypeToken
+ * @see com.massivecraft.mcore4.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)}. </li>
-   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore4.lib.gson.annotations.Expose} annotation.
+   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore4.xlib.gson.annotations.Expose} annotation.
    *   You can enable Gson to serialize/deserialize only those fields marked with this annotation
    *   through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}. </li>
-   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore4.lib.gson.annotations.Since} annotation. You
+   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore4.xlib.gson.annotations.Since} annotation. You
    *   can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.</li>
    *   <li>The default field naming policy for the output Json is same as in Java. So, a Java class
    *   field <code>versionNumber</code> will be output as <code>&quot;versionNumber@quot;</code> 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.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.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.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.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.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -670,7 +670,7 @@ public final class Gson {
    * @param <T> 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.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -723,7 +723,7 @@ public final class Gson {
    * @param <T> 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.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.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.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore4.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();

src/com/massivecraft/mcore4/xlib/gson/GsonBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.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.lib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore4.lib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore4.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
-import com.massivecraft.mcore4.lib.gson.InstanceCreator;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore4.lib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.lib.gson.internal.Excluder;
-import com.massivecraft.mcore4.lib.gson.internal.Primitives;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
+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;
 
 /**
  * <p>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.lib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.mcore4.xlib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */

src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
+import com.massivecraft.mcore4.xlib.gson.GsonBuilder;
 
 /**
  * This interface is implemented to create instances of a class that does not define a no-args

src/com/massivecraft/mcore4/xlib/gson/JsonArray.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.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.lib.gson.JsonArray;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
+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;
 
 /**
  * A class representing an array type in Json. An array is a list of {@link JsonElement}s each of

src/com/massivecraft/mcore4/xlib/gson/JsonDeserializationContext.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
+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;
 
 /**
  * Context for deserialization that is passed to a custom deserializer during invocation of its

src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
+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;
 
 /**
  * <p>Interface representing a custom deserializer for Json. You should write a custom

src/com/massivecraft/mcore4/xlib/gson/JsonElement.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonArray;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.stream.JsonWriter;
+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 java.io.IOException;
 import java.io.StringWriter;

src/com/massivecraft/mcore4/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.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
+import com.massivecraft.mcore4.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson was unable to read an input stream

src/com/massivecraft/mcore4/xlib/gson/JsonNull.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
+import com.massivecraft.mcore4.xlib.gson.JsonNull;
 
 /**
  * A class representing a Json {@code null} value.

src/com/massivecraft/mcore4/xlib/gson/JsonObject.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonArray;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
+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 java.util.LinkedHashMap;
 import java.util.Map;

src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
+import com.massivecraft.mcore4.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json

src/com/massivecraft/mcore4/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.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonIOException;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.lib.gson.stream.MalformedJsonException;
+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 java.io.EOFException;
 import java.io.IOException;

src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.lib.gson.internal.LazilyParsedNumber;
+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 java.math.BigDecimal;
 import java.math.BigInteger;

src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
+import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore4.xlib.gson.JsonSerializer;
 
 /**
  * Context for serialization that is passed to a custom serializer during invocation of its

src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
+import com.massivecraft.mcore4.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore4.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.lib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * <p>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}.</p>

src/com/massivecraft/mcore4/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.lib.gson;
+package com.massivecraft.mcore4.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.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonIOException;
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.lib.gson.stream.MalformedJsonException;
+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;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader

src/com/massivecraft/mcore4/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.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonParseException;
+import com.massivecraft.mcore4.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed

src/com/massivecraft/mcore4/xlib/gson/LongSerializationPolicy.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore4.xlib.gson.JsonElement;
+import com.massivecraft.mcore4.xlib.gson.JsonPrimitive;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.

src/com/massivecraft/mcore4/xlib/gson/TreeTypeAdapter.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonSerializer;
-import com.massivecraft.mcore4.lib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore4.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonWriter;
+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 java.io.IOException;
 

src/com/massivecraft/mcore4/xlib/gson/TypeAdapter.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.GsonBuilder;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonIOException;
-import com.massivecraft.mcore4.lib.gson.JsonNull;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore4.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore4.lib.gson.stream.JsonWriter;
+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 java.io.IOException;
 import java.io.Reader;
@@ -138,7 +138,7 @@ public abstract class TypeAdapter<T> {
    * 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.lib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore4.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<T> {
    * 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.lib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore4.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.

src/com/massivecraft/mcore4/xlib/gson/TypeAdapterFactory.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson;
+package com.massivecraft.mcore4.xlib.gson;
 
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore4.xlib.gson.Gson;
+import com.massivecraft.mcore4.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
 
 /**
  * Creates type adapters for set of related types. Type adapter factories are
@@ -82,7 +82,7 @@ import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
  * mapping from lowercase name to enum value is computed eagerly.
  *
  * <p>As with type adapters, factories must be <i>registered</i> with a {@link
- * com.massivecraft.mcore4.lib.gson.GsonBuilder} for them to take effect: <pre>   {@code
+ * com.massivecraft.mcore4.xlib.gson.GsonBuilder} for them to take effect: <pre>   {@code
  *
  *  GsonBuilder builder = new GsonBuilder();
  *  builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());

src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson.annotations;
+package com.massivecraft.mcore4.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.
  *
- * <p>This annotation has no effect unless you build {@link com.massivecraft.mcore4.lib.gson.Gson}
- * with a {@link com.massivecraft.mcore4.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * <p>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()}
  * method.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:

src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson.annotations;
+package com.massivecraft.mcore4.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.
  *
- * <p>This annotation will override any {@link com.massivecraft.mcore4.lib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore4.lib.gson.Gson}
+ * <p>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}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore4.lib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.mcore4.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore4.xlib.gson.FieldNamingPolicy)}
  * for more information.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * <p>NOTE: The value you specify in this annotation must be a valid JSON field name.</p>
  *
- * @see com.massivecraft.mcore4.lib.gson.FieldNamingPolicy
+ * @see com.massivecraft.mcore4.xlib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch

src/com/massivecraft/mcore4/xlib/gson/annotations/Since.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson.annotations;
+package com.massivecraft.mcore4.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.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.massivecraft.mcore4.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder#setVersion(double)} method.
+ * 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.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>

src/com/massivecraft/mcore4/xlib/gson/annotations/Until.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore4.lib.gson.annotations;
+package com.massivecraft.mcore4.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.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.massivecraft.mcore4.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore4.lib.gson.GsonBuilder#setVersion(double)} method.
+ * 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.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>

src/com/massivecraft/mcore4/xlib/gson/annotations/package-info.java

@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore4.lib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.mcore4.xlib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore4.lib.gson.annotations;
+package com.massivecraft.mcore4.xlib.gson.annotations;