diff --git a/src/com/massivecraft/mcore4/MCore.java b/src/com/massivecraft/mcore4/MCore.java
index 78bff611..3635c1d7 100644
--- a/src/com/massivecraft/mcore4/MCore.java
+++ b/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
{
diff --git a/src/com/massivecraft/mcore4/MPlugin.java b/src/com/massivecraft/mcore4/MPlugin.java
index 40c592bc..0c6a2832 100644
--- a/src/com/massivecraft/mcore4/MPlugin.java
+++ b/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
{
diff --git a/src/com/massivecraft/mcore4/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore4/adapter/InventoryAdapter.java
index 5a992952..d9ec21cb 100644
--- a/src/com/massivecraft/mcore4/adapter/InventoryAdapter.java
+++ b/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 See the Gson User Guide
* for a more complete set of examples. 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
*/
diff --git a/src/com/massivecraft/mcore4/lib/gson/InstanceCreator.java b/src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java
similarity index 97%
rename from src/com/massivecraft/mcore4/lib/gson/InstanceCreator.java
rename to src/com/massivecraft/mcore4/xlib/gson/InstanceCreator.java
index 4a15ddee..a062a69d 100644
--- a/src/com/massivecraft/mcore4/lib/gson/InstanceCreator.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonArray.java b/src/com/massivecraft/mcore4/xlib/gson/JsonArray.java
similarity index 97%
rename from src/com/massivecraft/mcore4/lib/gson/JsonArray.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonArray.java
index a76a011d..f1ee7379 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonArray.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonDeserializationContext.java b/src/com/massivecraft/mcore4/xlib/gson/JsonDeserializationContext.java
similarity index 85%
rename from src/com/massivecraft/mcore4/lib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonDeserializationContext.java
index 0a63a23b..6dbd9f21 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonDeserializationContext.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonDeserializer.java b/src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java
similarity index 91%
rename from src/com/massivecraft/mcore4/lib/gson/JsonDeserializer.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonDeserializer.java
index defcabf7..446870c1 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonDeserializer.java
+++ b/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;
/**
* Interface representing a custom deserializer for Json. You should write a custom
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonElement.java b/src/com/massivecraft/mcore4/xlib/gson/JsonElement.java
similarity index 96%
rename from src/com/massivecraft/mcore4/lib/gson/JsonElement.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonElement.java
index 734e1be8..55e8b825 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonElement.java
+++ b/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;
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonIOException.java b/src/com/massivecraft/mcore4/xlib/gson/JsonIOException.java
similarity index 92%
rename from src/com/massivecraft/mcore4/lib/gson/JsonIOException.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonIOException.java
index 9d9c6cd2..b3486a21 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonIOException.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonNull.java b/src/com/massivecraft/mcore4/xlib/gson/JsonNull.java
similarity index 87%
rename from src/com/massivecraft/mcore4/lib/gson/JsonNull.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonNull.java
index 6b2a2102..782b47d8 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonNull.java
+++ b/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.
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonObject.java b/src/com/massivecraft/mcore4/xlib/gson/JsonObject.java
similarity index 94%
rename from src/com/massivecraft/mcore4/lib/gson/JsonObject.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonObject.java
index 08f7b65b..c9f3a729 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonObject.java
+++ b/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;
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonParseException.java b/src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java
similarity index 95%
rename from src/com/massivecraft/mcore4/lib/gson/JsonParseException.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonParseException.java
index e633fc03..a4351a92 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonParseException.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonParser.java b/src/com/massivecraft/mcore4/xlib/gson/JsonParser.java
similarity index 81%
rename from src/com/massivecraft/mcore4/lib/gson/JsonParser.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonParser.java
index 6382ac3a..306dcffc 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonParser.java
+++ b/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;
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonPrimitive.java b/src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java
similarity index 97%
rename from src/com/massivecraft/mcore4/lib/gson/JsonPrimitive.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonPrimitive.java
index be0de961..f7de9f1f 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonPrimitive.java
+++ b/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;
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonSerializationContext.java b/src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java
similarity index 89%
rename from src/com/massivecraft/mcore4/lib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonSerializationContext.java
index 57071fb4..b89b48e0 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonSerializationContext.java
+++ b/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
diff --git a/src/com/massivecraft/mcore4/lib/gson/JsonSerializer.java b/src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java
similarity index 90%
rename from src/com/massivecraft/mcore4/lib/gson/JsonSerializer.java
rename to src/com/massivecraft/mcore4/xlib/gson/JsonSerializer.java
index 0908f2a9..ab2e6601 100644
--- a/src/com/massivecraft/mcore4/lib/gson/JsonSerializer.java
+++ b/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)}.
*
* 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}. As with type adapters, factories must be registered with a {@link
- * com.massivecraft.mcore4.lib.gson.GsonBuilder} for them to take effect: 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()}
+ * 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. Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore4/lib/gson/annotations/SerializedName.java b/src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java
similarity index 86%
rename from src/com/massivecraft/mcore4/lib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/mcore4/xlib/gson/annotations/SerializedName.java
index 82e02d97..778e94e8 100644
--- a/src/com/massivecraft/mcore4/lib/gson/annotations/SerializedName.java
+++ b/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.
*
- * 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}
+ * 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. Here is an example of how this annotation is meant to be used: NOTE: The value you specify in this annotation must be a valid JSON field name.
- * 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.
*
* Here is an example of how this annotation is meant to be used:
- * 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.
*
* Here is an example of how this annotation is meant to be used: The primary class to use is {@link com.massivecraft.mcore4.lib.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore4.lib.gson.GsonBuilder}
+ * 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}
* (to configure various options such as using versioning and so on). 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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore4.lib.mongodb.WriteConcern)} with default WriteConcern.
+ * 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.
* @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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
+ * calls {@link DBCollection#update(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
+ * calls {@link DBCollection#update(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.WriteConcern)} with the default WriteConcern
+ * calls {@link DBCollection#remove(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, int, int)} and applies the query options
+ * Calls {@link DBCollection#find(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean)}
+ * 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)}
* 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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean)}
+ * 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)}
* 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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, com.massivecraft.mcore4.lib.mongodb.DBObject, boolean, boolean)}
+ * 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)}
* 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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject)} with default index options
+ * calls {@link DBCollection#createIndex(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject)} with default options
+ * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
+ * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore4.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.lib.mongodb.DBObject, boolean)} with ensureID=true
+ * calls {@link DBCollection#apply(com.massivecraft.mcore4.xlib.mongodb.DBObject, boolean)} with ensureID=true
* @param o 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.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
* 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.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
* 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.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
* Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -670,7 +670,7 @@ public final class Gson {
* @param
* Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -723,7 +723,7 @@ public final class Gson {
* @param
* 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.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
* Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
diff --git a/src/com/massivecraft/mcore4/lib/gson/GsonBuilder.java b/src/com/massivecraft/mcore4/xlib/gson/GsonBuilder.java
similarity index 94%
rename from src/com/massivecraft/mcore4/lib/gson/GsonBuilder.java
rename to src/com/massivecraft/mcore4/xlib/gson/GsonBuilder.java
index 79436f48..3bad0e8b 100644
--- a/src/com/massivecraft/mcore4/lib/gson/GsonBuilder.java
+++ b/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;
/**
*
{@code
+ * com.massivecraft.mcore4.xlib.gson.GsonBuilder} for them to take effect:
{@code
*
* GsonBuilder builder = new GsonBuilder();
* builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
diff --git a/src/com/massivecraft/mcore4/lib/gson/annotations/Expose.java b/src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java
similarity index 92%
rename from src/com/massivecraft/mcore4/lib/gson/annotations/Expose.java
rename to src/com/massivecraft/mcore4/xlib/gson/annotations/Expose.java
index e9c462bb..9ef75bf3 100644
--- a/src/com/massivecraft/mcore4/lib/gson/annotations/Expose.java
+++ b/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.
*
- *
diff --git a/src/com/massivecraft/mcore4/lib/gson/annotations/Until.java b/src/com/massivecraft/mcore4/xlib/gson/annotations/Until.java
similarity index 90%
rename from src/com/massivecraft/mcore4/lib/gson/annotations/Until.java
rename to src/com/massivecraft/mcore4/xlib/gson/annotations/Until.java
index cac516ff..e07b6dca 100644
--- a/src/com/massivecraft/mcore4/lib/gson/annotations/Until.java
+++ b/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.
*
*
diff --git a/src/com/massivecraft/mcore4/lib/gson/annotations/package-info.java b/src/com/massivecraft/mcore4/xlib/gson/annotations/package-info.java
similarity index 54%
rename from src/com/massivecraft/mcore4/lib/gson/annotations/package-info.java
rename to src/com/massivecraft/mcore4/xlib/gson/annotations/package-info.java
index 57f1c8df..3bf15e4d 100644
--- a/src/com/massivecraft/mcore4/lib/gson/annotations/package-info.java
+++ b/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;
\ No newline at end of file
+package com.massivecraft.mcore4.xlib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java
index 737b38ed..8dcb8482 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
/**
* A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Types.java b/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java
similarity index 98%
rename from src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java
index e96156f0..d237bf19 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import static com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
import java.io.Serializable;
import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore4/lib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java
index 3b2b7179..dcc7b2df 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/ConstructorConstructor.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.InstanceCreator;
-import com.massivecraft.mcore4.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.UnsafeAllocator;
-import com.massivecraft.mcore4.lib.gson.reflect.TypeToken;
+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 java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/Excluder.java b/src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java
similarity index 89%
rename from src/com/massivecraft/mcore4/lib/gson/internal/Excluder.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java
index 38565e6f..695a900f 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/Excluder.java
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore4.lib.gson.FieldAttributes;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.annotations.Expose;
-import com.massivecraft.mcore4.lib.gson.annotations.Since;
-import com.massivecraft.mcore4.lib.gson.annotations.Until;
-import com.massivecraft.mcore4.lib.gson.internal.Excluder;
-import com.massivecraft.mcore4.lib.gson.internal.GsonInternalAccess;
-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.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 java.io.IOException;
import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/GsonInternalAccess.java b/src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java
similarity index 77%
rename from src/com/massivecraft/mcore4/lib/gson/internal/GsonInternalAccess.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java
index b5a225ea..1c130404 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/GsonInternalAccess.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/GsonInternalAccess.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.GsonInternalAccess;
-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.TypeAdapterFactory;
+import com.massivecraft.mcore4.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore4.xlib.gson.reflect.TypeToken;
/**
* Internal-only APIs of Gson available only to other classes in Gson.
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/JsonReaderInternalAccess.java b/src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java
similarity index 84%
rename from src/com/massivecraft/mcore4/lib/gson/internal/JsonReaderInternalAccess.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java
index 5cee41ab..b775de44 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/JsonReaderInternalAccess.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/JsonReaderInternalAccess.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore4.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore4.xlib.gson.stream.JsonReader;
import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/mcore4/xlib/gson/internal/LazilyParsedNumber.java
similarity index 96%
rename from src/com/massivecraft/mcore4/lib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/LazilyParsedNumber.java
index d01837bb..8a724ed2 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/mcore4/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.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore4/lib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java
index c1909d41..be28033f 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
/**
* Defines a generic object construction factory. The purpose of this class
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/Pair.java b/src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java
similarity index 93%
rename from src/com/massivecraft/mcore4/lib/gson/internal/Pair.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java
index b59fedaa..a9f57ef7 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/Pair.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/Pair.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.internal.Pair;
+import com.massivecraft.mcore4.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/lib/gson/internal/Primitives.java b/src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java
similarity index 97%
rename from src/com/massivecraft/mcore4/lib/gson/internal/Primitives.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java
index 9fe32a60..ce047e94 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore4.xlib.gson.internal.$Gson$Preconditions;
import java.lang.reflect.Type;
import java.util.Collections;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/Streams.java b/src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java
similarity index 83%
rename from src/com/massivecraft/mcore4/lib/gson/internal/Streams.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java
index dae396ed..dee9a196 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/Streams.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.xlib.gson.internal;
-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.bind.TypeAdapters;
-import com.massivecraft.mcore4.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonWriter;
-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.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 java.io.EOFException;
import java.io.IOException;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java
similarity index 96%
rename from src/com/massivecraft/mcore4/lib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java
index 9cec7f8d..4cf6d685 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/UnsafeAllocator.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal;
+package com.massivecraft.mcore4.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.lib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore4.xlib.gson.internal.UnsafeAllocator;
/**
* Do sneaky things to allocate objects without invoking their constructors.
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 80%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java
index 148d1c0d..9d8d03fd 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.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.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-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.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;
/**
* Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
index 31f41e66..f53e5bc7 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-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.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 java.io.IOException;
import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
index 6f1a29fe..39c51847 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-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.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 java.io.IOException;
import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 80%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
index 6da42d7f..75e80223 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-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.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 java.io.IOException;
import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java
similarity index 82%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java
index 73982dfe..bd4b3882 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/DateTypeAdapter.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.DateTypeAdapter;
-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.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 java.io.IOException;
import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java
similarity index 93%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeReader.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java
index 33cff86c..b1393b00 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeReader.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-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.stream.JsonReader;
-import com.massivecraft.mcore4.lib.gson.stream.JsonToken;
+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 java.io.IOException;
import java.io.Reader;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java
similarity index 93%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeWriter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java
index 89f8374e..925aa3b9 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/JsonTreeWriter.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-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.stream.JsonWriter;
+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 java.io.IOException;
import java.io.Writer;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 88%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java
index bee15bfe..1796db50 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,27 +14,27 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonElement;
-import com.massivecraft.mcore4.lib.gson.JsonIOException;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore4.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.Streams;
-import com.massivecraft.mcore4.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-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.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 java.io.IOException;
import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java
index 4089ef06..ca802ba4 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ObjectTypeAdapter;
-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.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 java.io.IOException;
import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 85%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index a3331857..2bcba0de 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,25 +14,25 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.annotations.SerializedName;
-import com.massivecraft.mcore4.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore4.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.Excluder;
-import com.massivecraft.mcore4.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore4.lib.gson.internal.Primitives;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-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.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 java.io.IOException;
import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 77%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java
index ecefd6c7..135b5106 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.SqlDateTypeAdapter;
-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.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 java.io.IOException;
import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java
similarity index 77%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java
index b9fa3d79..1f851f5c 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.internal.bind.TimeTypeAdapter;
-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.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 java.io.IOException;
import java.sql.Time;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 84%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 103bfafc..06020276 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/mcore4/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.lib.gson.internal.bind;
+package com.massivecraft.mcore4.xlib.gson.internal.bind;
-import com.massivecraft.mcore4.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-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.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 java.io.IOException;
import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java
similarity index 96%
rename from src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java
index 3b8bb46c..6bfda36c 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.gson.internal.bind;
+package com.massivecraft.mcore4.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.lib.gson.Gson;
-import com.massivecraft.mcore4.lib.gson.JsonArray;
-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.JsonObject;
-import com.massivecraft.mcore4.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore4.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore4.lib.gson.TypeAdapter;
-import com.massivecraft.mcore4.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore4.lib.gson.annotations.SerializedName;
-import com.massivecraft.mcore4.lib.gson.internal.LazilyParsedNumber;
-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.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;
/**
* Type adapters for basic types.
diff --git a/src/com/massivecraft/mcore4/lib/gson/internal/package-info.java b/src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java
similarity index 82%
rename from src/com/massivecraft/mcore4/lib/gson/internal/package-info.java
rename to src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java
index ef6f1580..d85a62db 100644
--- a/src/com/massivecraft/mcore4/lib/gson/internal/package-info.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
*
* @author Inderjeet Singh, Joel Leitch, Jesse Wilson
*/
-package com.massivecraft.mcore4.lib.gson.internal;
\ No newline at end of file
+package com.massivecraft.mcore4.xlib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore4/lib/gson/package-info.java b/src/com/massivecraft/mcore4/xlib/gson/package-info.java
similarity index 52%
rename from src/com/massivecraft/mcore4/lib/gson/package-info.java
rename to src/com/massivecraft/mcore4/xlib/gson/package-info.java
index 8b8a275a..1001d0af 100644
--- a/src/com/massivecraft/mcore4/lib/gson/package-info.java
+++ b/src/com/massivecraft/mcore4/xlib/gson/package-info.java
@@ -1,11 +1,11 @@
/**
- * This package provides the {@link com.massivecraft.mcore4.lib.gson.Gson} class to convert Json to Java and
+ * This package provides the {@link com.massivecraft.mcore4.xlib.gson.Gson} class to convert Json to Java and
* vice-versa.
*
- *
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.lib.mongodb.DBObject)}, optionally adding an automatic _id field
+ * calls {@link DBCollection#doapply(com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.WriteConcern)} with default WriteConcern
+ * calls {@link DBCollection#save(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject)} with an empty query and null fields.
+ * calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject)} with null fields.
+ * calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, long, long)} with limit=0 and skip=0
+ * calls {@link DBCollection#getCount(com.massivecraft.mcore4.xlib.mongodb.DBObject, com.massivecraft.mcore4.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.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, com.massivecraft.mcore4.lib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
+ * 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
* @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.lib.mongodb.GroupCommand)} which is more standard
+ * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore4.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.lib.mongodb.ReadPreference.SECONDARY
+ * @see com.massivecraft.mcore4.xlib.mongodb.ReadPreference.SECONDARY
*/
@Deprecated
public void slaveOk(){
diff --git a/src/com/massivecraft/mcore4/lib/mongodb/DBConnector.java b/src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java
similarity index 98%
rename from src/com/massivecraft/mcore4/lib/mongodb/DBConnector.java
rename to src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java
index 9ed37e78..bb001b78 100644
--- a/src/com/massivecraft/mcore4/lib/mongodb/DBConnector.java
+++ b/src/com/massivecraft/mcore4/xlib/mongodb/DBConnector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.mongodb;
+package com.massivecraft.mcore4.xlib.mongodb;
/**
diff --git a/src/com/massivecraft/mcore4/lib/mongodb/DBCursor.java b/src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java
similarity index 99%
rename from src/com/massivecraft/mcore4/lib/mongodb/DBCursor.java
rename to src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java
index 6dc0e27b..8451e081 100644
--- a/src/com/massivecraft/mcore4/lib/mongodb/DBCursor.java
+++ b/src/com/massivecraft/mcore4/xlib/mongodb/DBCursor.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.massivecraft.mcore4.lib.mongodb;
+package com.massivecraft.mcore4.xlib.mongodb;
import java.io.Closeable;
import java.util.*;
-import com.massivecraft.mcore4.lib.mongodb.DBApiLayer.Result;
+import com.massivecraft.mcore4.xlib.mongodb.DBApiLayer.Result;
/** An iterator over database results.
@@ -295,7 +295,7 @@ public class DBCursor implements Iterator
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.lib.mongodb.ServerAddress + * @see com.massivecraft.mcore4.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.lib.mongodb.ReadPreference.SECONDARY + * @see com.massivecraft.mcore4.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.lib.bson.util.SimplePool