From af388effeafad5739deaae92d4c12c6e7f0b264f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 25 Jan 2012 16:20:19 +0100 Subject: [PATCH] Renamed to mcore2dev --- README.md | 3 +- plugin.yml | 4 +- .../mcore1/lib/gson/package-info.java | 11 --- .../InternalListener.java | 8 +-- .../{mcore1 => mcore2dev}/Lang.java | 2 +- .../{mcore1 => mcore2dev}/MCore.java | 16 ++--- .../{mcore1 => mcore2dev}/MPlugin.java | 16 ++--- .../{mcore1 => mcore2dev}/Predictate.java | 2 +- .../{mcore1 => mcore2dev}/cmd/Cmd.java | 18 ++--- .../cmd/HelpCommand.java | 8 +-- .../{mcore1 => mcore2dev}/cmd/MCommand.java | 18 ++--- .../cmd/VisibilityMode.java | 2 +- .../{mcore1 => mcore2dev}/cmd/arg/AHBase.java | 4 +- .../cmd/arg/AHBoolean.java | 2 +- .../cmd/arg/AHDouble.java | 2 +- .../cmd/arg/AHFloat.java | 2 +- .../cmd/arg/AHInteger.java | 2 +- .../cmd/arg/AHMaterial.java | 4 +- .../cmd/arg/AHPlayer.java | 4 +- .../cmd/arg/AHPlayerWrapper.java | 10 +-- .../cmd/arg/AHPrimitive.java | 4 +- .../cmd/arg/AHWorld.java | 4 +- .../cmd/arg/IArgHandler.java | 4 +- .../{mcore1 => mcore2dev}/cmd/req/IReq.java | 4 +- .../cmd/req/ReqHasPerm.java | 6 +- .../cmd/req/ReqIsPlayer.java | 6 +- .../gson/InventoryTypeAdapter.java | 18 ++--- ...onymousAndLocalClassExclusionStrategy.java | 2 +- .../{mcore1 => mcore2dev}/lib/gson/Cache.java | 2 +- .../gson/CamelCaseSeparatorNamingPolicy.java | 4 +- .../gson/CompositionFieldNamingPolicy.java | 2 +- .../lib/gson/DefaultTypeAdapters.java | 2 +- .../gson/DisjunctionExclusionStrategy.java | 4 +- .../lib/gson/ExclusionStrategy.java | 2 +- ...ationDeserializationExclusionStrategy.java | 4 +- ...otationSerializationExclusionStrategy.java | 4 +- .../lib/gson/FieldAttributes.java | 6 +- .../lib/gson/FieldNamingPolicy.java | 6 +- .../lib/gson/FieldNamingStrategy.java | 2 +- .../lib/gson/FieldNamingStrategy2.java | 2 +- .../lib/gson/FieldNamingStrategy2Adapter.java | 4 +- .../{mcore1 => mcore2dev}/lib/gson/Gson.java | 70 +++++++++---------- .../lib/gson/GsonBuilder.java | 14 ++-- .../GsonToMiniGsonTypeAdapterFactory.java | 16 ++--- .../lib/gson/InnerClassExclusionStrategy.java | 2 +- .../lib/gson/InstanceCreator.java | 2 +- .../lib/gson/JavaFieldNamingPolicy.java | 2 +- .../lib/gson/JsonArray.java | 2 +- .../lib/gson/JsonDeserializationContext.java | 2 +- .../lib/gson/JsonDeserializer.java | 2 +- .../JsonDeserializerExceptionWrapper.java | 4 +- .../lib/gson/JsonElement.java | 6 +- .../lib/gson/JsonElementVisitor.java | 2 +- .../lib/gson/JsonIOException.java | 2 +- .../lib/gson/JsonNull.java | 2 +- .../lib/gson/JsonObject.java | 4 +- .../lib/gson/JsonParseException.java | 2 +- .../lib/gson/JsonParser.java | 10 +-- .../lib/gson/JsonPrimitive.java | 6 +- .../lib/gson/JsonSerializationContext.java | 2 +- .../lib/gson/JsonSerializer.java | 4 +- .../lib/gson/JsonStreamParser.java | 10 +-- .../lib/gson/JsonSyntaxException.java | 2 +- .../lib/gson/LongSerializationPolicy.java | 2 +- .../LowerCamelCaseSeparatorNamingPolicy.java | 2 +- .../lib/gson/LowerCaseNamingPolicy.java | 2 +- .../lib/gson/LruCache.java | 2 +- .../gson/ModifierBasedExclusionStrategy.java | 2 +- .../gson/ModifyFirstLetterNamingPolicy.java | 4 +- .../lib/gson/RecursiveFieldNamingPolicy.java | 2 +- ...ameAnnotationInterceptingNamingPolicy.java | 6 +- .../gson/SyntheticFieldExclusionStrategy.java | 2 +- .../UpperCamelCaseSeparatorNamingPolicy.java | 2 +- .../lib/gson/UpperCaseNamingPolicy.java | 2 +- .../lib/gson/VersionConstants.java | 2 +- .../lib/gson/VersionExclusionStrategy.java | 8 +-- .../lib/gson/annotations/Expose.java | 8 +-- .../lib/gson/annotations/SerializedName.java | 10 +-- .../lib/gson/annotations/Since.java | 8 +-- .../lib/gson/annotations/Until.java | 8 +-- .../lib/gson/annotations/package-info.java | 4 +- .../gson/internal/$Gson$Preconditions.java | 2 +- .../lib/gson/internal/$Gson$Types.java | 6 +- .../gson/internal/ConstructorConstructor.java | 6 +- .../lib/gson/internal/LazilyParsedNumber.java | 2 +- .../lib/gson/internal/ObjectConstructor.java | 2 +- .../lib/gson/internal/Pair.java | 2 +- .../internal/ParameterizedTypeHandlerMap.java | 2 +- .../lib/gson/internal/Primitives.java | 4 +- .../lib/gson/internal/Streams.java | 20 +++--- .../lib/gson/internal/UnsafeAllocator.java | 2 +- .../gson/internal/bind/ArrayTypeAdapter.java | 12 ++-- .../internal/bind/BigDecimalTypeAdapter.java | 10 +-- .../internal/bind/BigIntegerTypeAdapter.java | 10 +-- .../bind/CollectionTypeAdapterFactory.java | 16 ++--- .../gson/internal/bind/DateTypeAdapter.java | 12 ++-- .../bind/ExcludedTypeAdapterFactory.java | 10 +-- .../gson/internal/bind/JsonElementReader.java | 16 ++--- .../gson/internal/bind/JsonElementWriter.java | 14 ++-- .../internal/bind/MapTypeAdapterFactory.java | 24 +++---- .../lib/gson/internal/bind/MiniGson.java | 10 +-- .../gson/internal/bind/ObjectTypeAdapter.java | 10 +-- .../lib/gson/internal/bind/Reflection.java | 2 +- .../bind/ReflectiveTypeAdapterFactory.java | 20 +++--- .../internal/bind/SqlDateTypeAdapter.java | 12 ++-- .../StringToValueMapTypeAdapterFactory.java | 16 ++--- .../gson/internal/bind/TimeTypeAdapter.java | 12 ++-- .../lib/gson/internal/bind/TypeAdapter.java | 12 ++-- .../bind/TypeAdapterRuntimeTypeWrapper.java | 8 +-- .../lib/gson/internal/bind/TypeAdapters.java | 26 +++---- .../lib/gson/internal/package-info.java | 2 +- .../mcore2dev/lib/gson/package-info.java | 11 +++ .../lib/gson/reflect/TypeToken.java | 6 +- .../lib/gson/reflect/package-info.java | 2 +- .../lib/gson/stream/JsonReader.java | 2 +- .../lib/gson/stream/JsonScope.java | 2 +- .../lib/gson/stream/JsonToken.java | 2 +- .../lib/gson/stream/JsonWriter.java | 2 +- .../gson/stream/MalformedJsonException.java | 2 +- .../lib/gson/stream/StringPool.java | 2 +- .../{mcore1 => mcore2dev}/persist/Entity.java | 2 +- .../persist/IClassManager.java | 4 +- .../{mcore1 => mcore2dev}/persist/One.java | 6 +- .../persist/Persist.java | 4 +- .../persist/PlayerEntity.java | 4 +- .../persist/SaveTask.java | 2 +- .../persist/gson/GsonClassManager.java | 10 +-- .../persist/gson/GsonPlayerEntityManager.java | 8 +-- .../persist/gson/JsonFileFilter.java | 2 +- .../util/ClassLoadHack.java | 2 +- .../{mcore1 => mcore2dev}/util/DiscUtil.java | 2 +- .../{mcore1 => mcore2dev}/util/LibLoader.java | 4 +- .../{mcore1 => mcore2dev}/util/Perm.java | 4 +- .../util/PlayerUtil.java | 2 +- .../{mcore1 => mcore2dev}/util/SmokeUtil.java | 2 +- .../{mcore1 => mcore2dev}/util/Txt.java | 2 +- 136 files changed, 433 insertions(+), 434 deletions(-) delete mode 100644 src/com/massivecraft/mcore1/lib/gson/package-info.java rename src/com/massivecraft/{mcore1 => mcore2dev}/InternalListener.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/Lang.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/MCore.java (89%) rename src/com/massivecraft/{mcore1 => mcore2dev}/MPlugin.java (84%) rename src/com/massivecraft/{mcore1 => mcore2dev}/Predictate.java (61%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/Cmd.java (76%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/HelpCommand.java (83%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/MCommand.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/VisibilityMode.java (89%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHBase.java (78%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHBoolean.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHDouble.java (80%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHFloat.java (79%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHInteger.java (80%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHMaterial.java (81%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHPlayer.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHPlayerWrapper.java (78%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHPrimitive.java (82%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/AHWorld.java (79%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/arg/IArgHandler.java (75%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/req/IReq.java (76%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/req/ReqHasPerm.java (76%) rename src/com/massivecraft/{mcore1 => mcore2dev}/cmd/req/ReqIsPlayer.java (75%) rename src/com/massivecraft/{mcore1 => mcore2dev}/gson/InventoryTypeAdapter.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/AnonymousAndLocalClassExclusionStrategy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/Cache.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/CamelCaseSeparatorNamingPolicy.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/CompositionFieldNamingPolicy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/DefaultTypeAdapters.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/DisjunctionExclusionStrategy.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/ExclusionStrategy.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/FieldAttributes.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/FieldNamingPolicy.java (94%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/FieldNamingStrategy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/FieldNamingStrategy2.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/FieldNamingStrategy2Adapter.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/Gson.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/GsonBuilder.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/GsonToMiniGsonTypeAdapterFactory.java (85%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/InnerClassExclusionStrategy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/InstanceCreator.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JavaFieldNamingPolicy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonArray.java (99%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonDeserializationContext.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonDeserializer.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonDeserializerExceptionWrapper.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonElement.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonElementVisitor.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonIOException.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonNull.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonObject.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonParseException.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonParser.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonPrimitive.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonSerializationContext.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonSerializer.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonStreamParser.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/JsonSyntaxException.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/LongSerializationPolicy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/LowerCaseNamingPolicy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/LruCache.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/ModifierBasedExclusionStrategy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/ModifyFirstLetterNamingPolicy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/RecursiveFieldNamingPolicy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java (87%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/SyntheticFieldExclusionStrategy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/UpperCaseNamingPolicy.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/VersionConstants.java (94%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/VersionExclusionStrategy.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/annotations/Expose.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/annotations/SerializedName.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/annotations/Since.java (89%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/annotations/Until.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/annotations/package-info.java (53%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/$Gson$Preconditions.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/$Gson$Types.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/ConstructorConstructor.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/LazilyParsedNumber.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/ObjectConstructor.java (94%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/Pair.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/ParameterizedTypeHandlerMap.java (99%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/Primitives.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/Streams.java (83%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/UnsafeAllocator.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/ArrayTypeAdapter.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/BigDecimalTypeAdapter.java (80%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/BigIntegerTypeAdapter.java (80%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/CollectionTypeAdapterFactory.java (85%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/DateTypeAdapter.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java (89%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/JsonElementReader.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/JsonElementWriter.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/MapTypeAdapterFactory.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/MiniGson.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/ObjectTypeAdapter.java (89%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/Reflection.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/SqlDateTypeAdapter.java (84%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/TimeTypeAdapter.java (84%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/TypeAdapter.java (85%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/bind/TypeAdapters.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/internal/package-info.java (82%) create mode 100644 src/com/massivecraft/mcore2dev/lib/gson/package-info.java rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/reflect/TypeToken.java (98%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/reflect/package-info.java (73%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/JsonReader.java (99%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/JsonScope.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/JsonToken.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/JsonWriter.java (99%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/MalformedJsonException.java (96%) rename src/com/massivecraft/{mcore1 => mcore2dev}/lib/gson/stream/StringPool.java (97%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/Entity.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/IClassManager.java (94%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/One.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/Persist.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/PlayerEntity.java (88%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/SaveTask.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/gson/GsonClassManager.java (93%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/gson/GsonPlayerEntityManager.java (83%) rename src/com/massivecraft/{mcore1 => mcore2dev}/persist/gson/JsonFileFilter.java (86%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/ClassLoadHack.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/DiscUtil.java (92%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/LibLoader.java (85%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/Perm.java (90%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/PlayerUtil.java (91%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/SmokeUtil.java (95%) rename src/com/massivecraft/{mcore1 => mcore2dev}/util/Txt.java (96%) diff --git a/README.md b/README.md index 6c0588dc..5dfc80e1 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,4 @@ Read more about our plugin developent team at [MassiveCraft.com/plugins](http:// License ---------- This project is open source. We are using [The MIT Licence](http://www.opensource.org/licenses/MIT)
-This project includes [GSON](http://code.google.com/p/google-gson/) which has an [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0). - +This project includes [GSON](http://code.google.com/p/google-gson/) which has an [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0). \ No newline at end of file diff --git a/plugin.yml b/plugin.yml index b863ed1a..758c3784 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ -name: mcore1 +name: mcore2dev version: 1.0.0 -main: com.massivecraft.mcore1.MCore +main: com.massivecraft.mcore2dev.MCore authors: [Olof Larsson, Brett Flannigan] commands: mcoresilenteater: diff --git a/src/com/massivecraft/mcore1/lib/gson/package-info.java b/src/com/massivecraft/mcore1/lib/gson/package-info.java deleted file mode 100644 index c5dae24d..00000000 --- a/src/com/massivecraft/mcore1/lib/gson/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * This package provides the {@link com.massivecraft.mcore1.lib.gson.Gson} class to convert Json to Java and - * vice-versa. - * - *

The primary class to use is {@link com.massivecraft.mcore1.lib.gson.Gson} which can be constructed with - * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore1.lib.gson.GsonBuilder} - * (to configure various options such as using versioning and so on).

- * - * @author Inderjeet Singh, Joel Leitch - */ -package com.massivecraft.mcore1.lib.gson; \ No newline at end of file diff --git a/src/com/massivecraft/mcore1/InternalListener.java b/src/com/massivecraft/mcore2dev/InternalListener.java similarity index 86% rename from src/com/massivecraft/mcore1/InternalListener.java rename to src/com/massivecraft/mcore2dev/InternalListener.java index 6554ab9f..acb78cb9 100644 --- a/src/com/massivecraft/mcore1/InternalListener.java +++ b/src/com/massivecraft/mcore2dev/InternalListener.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1; +package com.massivecraft.mcore2dev; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -9,9 +9,9 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerPreLoginEvent; import org.bukkit.event.server.ServerCommandEvent; -import com.massivecraft.mcore1.persist.IClassManager; -import com.massivecraft.mcore1.persist.Persist; -import com.massivecraft.mcore1.util.PlayerUtil; +import com.massivecraft.mcore2dev.persist.IClassManager; +import com.massivecraft.mcore2dev.persist.Persist; +import com.massivecraft.mcore2dev.util.PlayerUtil; public class InternalListener implements Listener { diff --git a/src/com/massivecraft/mcore1/Lang.java b/src/com/massivecraft/mcore2dev/Lang.java similarity index 90% rename from src/com/massivecraft/mcore1/Lang.java rename to src/com/massivecraft/mcore2dev/Lang.java index 8f64a339..6131e89b 100644 --- a/src/com/massivecraft/mcore1/Lang.java +++ b/src/com/massivecraft/mcore2dev/Lang.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1; +package com.massivecraft.mcore2dev; public class Lang { diff --git a/src/com/massivecraft/mcore1/MCore.java b/src/com/massivecraft/mcore2dev/MCore.java similarity index 89% rename from src/com/massivecraft/mcore1/MCore.java rename to src/com/massivecraft/mcore2dev/MCore.java index fdcef43c..c74c5211 100644 --- a/src/com/massivecraft/mcore1/MCore.java +++ b/src/com/massivecraft/mcore2dev/MCore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1; +package com.massivecraft.mcore2dev; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -13,13 +13,13 @@ import java.util.logging.Logger; import org.bukkit.command.CommandSender; import org.bukkit.plugin.java.JavaPlugin; -import com.massivecraft.mcore1.cmd.Cmd; -import com.massivecraft.mcore1.lib.gson.GsonBuilder; -import com.massivecraft.mcore1.persist.One; -import com.massivecraft.mcore1.persist.Persist; -import com.massivecraft.mcore1.util.LibLoader; -import com.massivecraft.mcore1.util.PlayerUtil; -import com.massivecraft.mcore1.util.Txt; +import com.massivecraft.mcore2dev.cmd.Cmd; +import com.massivecraft.mcore2dev.lib.gson.GsonBuilder; +import com.massivecraft.mcore2dev.persist.One; +import com.massivecraft.mcore2dev.persist.Persist; +import com.massivecraft.mcore2dev.util.LibLoader; +import com.massivecraft.mcore2dev.util.PlayerUtil; +import com.massivecraft.mcore2dev.util.Txt; public class MCore extends JavaPlugin { diff --git a/src/com/massivecraft/mcore1/MPlugin.java b/src/com/massivecraft/mcore2dev/MPlugin.java similarity index 84% rename from src/com/massivecraft/mcore1/MPlugin.java rename to src/com/massivecraft/mcore2dev/MPlugin.java index b7996650..c99e9a81 100644 --- a/src/com/massivecraft/mcore1/MPlugin.java +++ b/src/com/massivecraft/mcore2dev/MPlugin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1; +package com.massivecraft.mcore2dev; import java.util.logging.Level; import java.util.logging.Logger; @@ -8,13 +8,13 @@ import org.bukkit.event.Event; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import com.massivecraft.mcore1.cmd.Cmd; -import com.massivecraft.mcore1.lib.gson.Gson; -import com.massivecraft.mcore1.lib.gson.GsonBuilder; -import com.massivecraft.mcore1.persist.One; -import com.massivecraft.mcore1.persist.Persist; -import com.massivecraft.mcore1.util.LibLoader; -import com.massivecraft.mcore1.util.Txt; +import com.massivecraft.mcore2dev.cmd.Cmd; +import com.massivecraft.mcore2dev.lib.gson.Gson; +import com.massivecraft.mcore2dev.lib.gson.GsonBuilder; +import com.massivecraft.mcore2dev.persist.One; +import com.massivecraft.mcore2dev.persist.Persist; +import com.massivecraft.mcore2dev.util.LibLoader; +import com.massivecraft.mcore2dev.util.Txt; public abstract class MPlugin extends JavaPlugin diff --git a/src/com/massivecraft/mcore1/Predictate.java b/src/com/massivecraft/mcore2dev/Predictate.java similarity index 61% rename from src/com/massivecraft/mcore1/Predictate.java rename to src/com/massivecraft/mcore2dev/Predictate.java index a0bf9f8a..3d523c60 100644 --- a/src/com/massivecraft/mcore1/Predictate.java +++ b/src/com/massivecraft/mcore2dev/Predictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1; +package com.massivecraft.mcore2dev; public interface Predictate { diff --git a/src/com/massivecraft/mcore1/cmd/Cmd.java b/src/com/massivecraft/mcore2dev/cmd/Cmd.java similarity index 76% rename from src/com/massivecraft/mcore1/cmd/Cmd.java rename to src/com/massivecraft/mcore2dev/cmd/Cmd.java index 9c1e15f4..c3ec77cc 100644 --- a/src/com/massivecraft/mcore1/cmd/Cmd.java +++ b/src/com/massivecraft/mcore2dev/cmd/Cmd.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd; +package com.massivecraft.mcore2dev.cmd; import java.util.HashMap; import java.util.HashSet; @@ -11,14 +11,14 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore1.cmd.arg.AHBoolean; -import com.massivecraft.mcore1.cmd.arg.AHDouble; -import com.massivecraft.mcore1.cmd.arg.AHFloat; -import com.massivecraft.mcore1.cmd.arg.AHInteger; -import com.massivecraft.mcore1.cmd.arg.AHMaterial; -import com.massivecraft.mcore1.cmd.arg.AHPlayer; -import com.massivecraft.mcore1.cmd.arg.AHWorld; -import com.massivecraft.mcore1.cmd.arg.IArgHandler; +import com.massivecraft.mcore2dev.cmd.arg.AHBoolean; +import com.massivecraft.mcore2dev.cmd.arg.AHDouble; +import com.massivecraft.mcore2dev.cmd.arg.AHFloat; +import com.massivecraft.mcore2dev.cmd.arg.AHInteger; +import com.massivecraft.mcore2dev.cmd.arg.AHMaterial; +import com.massivecraft.mcore2dev.cmd.arg.AHPlayer; +import com.massivecraft.mcore2dev.cmd.arg.AHWorld; +import com.massivecraft.mcore2dev.cmd.arg.IArgHandler; public class Cmd { diff --git a/src/com/massivecraft/mcore1/cmd/HelpCommand.java b/src/com/massivecraft/mcore2dev/cmd/HelpCommand.java similarity index 83% rename from src/com/massivecraft/mcore1/cmd/HelpCommand.java rename to src/com/massivecraft/mcore2dev/cmd/HelpCommand.java index a0bc64bc..5f89afc0 100644 --- a/src/com/massivecraft/mcore1/cmd/HelpCommand.java +++ b/src/com/massivecraft/mcore2dev/cmd/HelpCommand.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore1.cmd; +package com.massivecraft.mcore2dev.cmd; import java.util.ArrayList; -import com.massivecraft.mcore1.MPlugin; -import com.massivecraft.mcore1.cmd.MCommand; -import com.massivecraft.mcore1.util.Txt; +import com.massivecraft.mcore2dev.MPlugin; +import com.massivecraft.mcore2dev.cmd.MCommand; +import com.massivecraft.mcore2dev.util.Txt; public class HelpCommand extends MCommand { diff --git a/src/com/massivecraft/mcore1/cmd/MCommand.java b/src/com/massivecraft/mcore2dev/cmd/MCommand.java similarity index 93% rename from src/com/massivecraft/mcore1/cmd/MCommand.java rename to src/com/massivecraft/mcore2dev/cmd/MCommand.java index 3e0ae12c..6d4f5ecc 100644 --- a/src/com/massivecraft/mcore1/cmd/MCommand.java +++ b/src/com/massivecraft/mcore2dev/cmd/MCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd; +package com.massivecraft.mcore2dev.cmd; import java.util.*; import java.util.Map.Entry; @@ -7,14 +7,14 @@ import java.util.logging.Level; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore1.Lang; -import com.massivecraft.mcore1.MCore; -import com.massivecraft.mcore1.MPlugin; -import com.massivecraft.mcore1.cmd.arg.IArgHandler; -import com.massivecraft.mcore1.cmd.req.IReq; -import com.massivecraft.mcore1.cmd.req.ReqHasPerm; -import com.massivecraft.mcore1.util.Perm; -import com.massivecraft.mcore1.util.Txt; +import com.massivecraft.mcore2dev.Lang; +import com.massivecraft.mcore2dev.MCore; +import com.massivecraft.mcore2dev.MPlugin; +import com.massivecraft.mcore2dev.cmd.arg.IArgHandler; +import com.massivecraft.mcore2dev.cmd.req.IReq; +import com.massivecraft.mcore2dev.cmd.req.ReqHasPerm; +import com.massivecraft.mcore2dev.util.Perm; +import com.massivecraft.mcore2dev.util.Txt; public abstract class MCommand { diff --git a/src/com/massivecraft/mcore1/cmd/VisibilityMode.java b/src/com/massivecraft/mcore2dev/cmd/VisibilityMode.java similarity index 89% rename from src/com/massivecraft/mcore1/cmd/VisibilityMode.java rename to src/com/massivecraft/mcore2dev/cmd/VisibilityMode.java index 1cb0065d..6c32ee32 100644 --- a/src/com/massivecraft/mcore1/cmd/VisibilityMode.java +++ b/src/com/massivecraft/mcore2dev/cmd/VisibilityMode.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd; +package com.massivecraft.mcore2dev.cmd; public enum VisibilityMode { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHBase.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHBase.java similarity index 78% rename from src/com/massivecraft/mcore1/cmd/arg/AHBase.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHBase.java index 11687615..1c388b1f 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHBase.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHBase.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import java.util.ArrayList; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public abstract class AHBase implements IArgHandler { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHBoolean.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHBoolean.java similarity index 86% rename from src/com/massivecraft/mcore1/cmd/arg/AHBoolean.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHBoolean.java index 23dff2e4..93a8574f 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHBoolean.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHBoolean.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; public class AHBoolean extends AHPrimitive { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHDouble.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHDouble.java similarity index 80% rename from src/com/massivecraft/mcore1/cmd/arg/AHDouble.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHDouble.java index 5f7a7405..6c3f3b77 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHDouble.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHDouble.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; public class AHDouble extends AHPrimitive { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHFloat.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHFloat.java similarity index 79% rename from src/com/massivecraft/mcore1/cmd/arg/AHFloat.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHFloat.java index da5b3213..ca532dff 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHFloat.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHFloat.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; public class AHFloat extends AHPrimitive { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHInteger.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHInteger.java similarity index 80% rename from src/com/massivecraft/mcore1/cmd/arg/AHInteger.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHInteger.java index af9f26e9..3a349cbb 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHInteger.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHInteger.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; public class AHInteger extends AHPrimitive { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHMaterial.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHMaterial.java similarity index 81% rename from src/com/massivecraft/mcore1/cmd/arg/AHMaterial.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHMaterial.java index 53ab88a9..dfacf9d9 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHMaterial.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHMaterial.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import org.bukkit.Material; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public class AHMaterial extends AHBase { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHPlayer.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHPlayer.java similarity index 86% rename from src/com/massivecraft/mcore1/cmd/arg/AHPlayer.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHPlayer.java index e59f151f..fc8b1ad8 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHPlayer.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import java.util.List; @@ -6,7 +6,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public class AHPlayer extends AHBase { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHPlayerWrapper.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHPlayerWrapper.java similarity index 78% rename from src/com/massivecraft/mcore1/cmd/arg/AHPlayerWrapper.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHPlayerWrapper.java index e85af73d..27cc6036 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHPlayerWrapper.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHPlayerWrapper.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; -import com.massivecraft.mcore1.persist.IClassManager; -import com.massivecraft.mcore1.persist.Persist; -import com.massivecraft.mcore1.util.PlayerUtil; +import com.massivecraft.mcore2dev.MPlugin; +import com.massivecraft.mcore2dev.persist.IClassManager; +import com.massivecraft.mcore2dev.persist.Persist; +import com.massivecraft.mcore2dev.util.PlayerUtil; public abstract class AHPlayerWrapper extends AHBase { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHPrimitive.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHPrimitive.java similarity index 82% rename from src/com/massivecraft/mcore1/cmd/arg/AHPrimitive.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHPrimitive.java index 94e4e680..677478ed 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHPrimitive.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHPrimitive.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public abstract class AHPrimitive extends AHBase { diff --git a/src/com/massivecraft/mcore1/cmd/arg/AHWorld.java b/src/com/massivecraft/mcore2dev/cmd/arg/AHWorld.java similarity index 79% rename from src/com/massivecraft/mcore1/cmd/arg/AHWorld.java rename to src/com/massivecraft/mcore2dev/cmd/arg/AHWorld.java index 4c9054ed..065d5c1a 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/AHWorld.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/AHWorld.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public class AHWorld extends AHBase { diff --git a/src/com/massivecraft/mcore1/cmd/arg/IArgHandler.java b/src/com/massivecraft/mcore2dev/cmd/arg/IArgHandler.java similarity index 75% rename from src/com/massivecraft/mcore1/cmd/arg/IArgHandler.java rename to src/com/massivecraft/mcore2dev/cmd/arg/IArgHandler.java index 297aa3b4..4e0d50cc 100644 --- a/src/com/massivecraft/mcore1/cmd/arg/IArgHandler.java +++ b/src/com/massivecraft/mcore2dev/cmd/arg/IArgHandler.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore1.cmd.arg; +package com.massivecraft.mcore2dev.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.MPlugin; +import com.massivecraft.mcore2dev.MPlugin; public interface IArgHandler { diff --git a/src/com/massivecraft/mcore1/cmd/req/IReq.java b/src/com/massivecraft/mcore2dev/cmd/req/IReq.java similarity index 76% rename from src/com/massivecraft/mcore1/cmd/req/IReq.java rename to src/com/massivecraft/mcore2dev/cmd/req/IReq.java index 54edd137..79b0f9a9 100644 --- a/src/com/massivecraft/mcore1/cmd/req/IReq.java +++ b/src/com/massivecraft/mcore2dev/cmd/req/IReq.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore1.cmd.req; +package com.massivecraft.mcore2dev.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.cmd.MCommand; +import com.massivecraft.mcore2dev.cmd.MCommand; public interface IReq { diff --git a/src/com/massivecraft/mcore1/cmd/req/ReqHasPerm.java b/src/com/massivecraft/mcore2dev/cmd/req/ReqHasPerm.java similarity index 76% rename from src/com/massivecraft/mcore1/cmd/req/ReqHasPerm.java rename to src/com/massivecraft/mcore2dev/cmd/req/ReqHasPerm.java index 7ed80047..5aab1f42 100644 --- a/src/com/massivecraft/mcore1/cmd/req/ReqHasPerm.java +++ b/src/com/massivecraft/mcore2dev/cmd/req/ReqHasPerm.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore1.cmd.req; +package com.massivecraft.mcore2dev.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore1.cmd.MCommand; -import com.massivecraft.mcore1.util.Perm; +import com.massivecraft.mcore2dev.cmd.MCommand; +import com.massivecraft.mcore2dev.util.Perm; public class ReqHasPerm implements IReq { diff --git a/src/com/massivecraft/mcore1/cmd/req/ReqIsPlayer.java b/src/com/massivecraft/mcore2dev/cmd/req/ReqIsPlayer.java similarity index 75% rename from src/com/massivecraft/mcore1/cmd/req/ReqIsPlayer.java rename to src/com/massivecraft/mcore2dev/cmd/req/ReqIsPlayer.java index 8bec21d5..fb1b665f 100644 --- a/src/com/massivecraft/mcore1/cmd/req/ReqIsPlayer.java +++ b/src/com/massivecraft/mcore2dev/cmd/req/ReqIsPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore1.cmd.req; +package com.massivecraft.mcore2dev.cmd.req; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore1.Lang; -import com.massivecraft.mcore1.cmd.MCommand; +import com.massivecraft.mcore2dev.Lang; +import com.massivecraft.mcore2dev.cmd.MCommand; public class ReqIsPlayer implements IReq { diff --git a/src/com/massivecraft/mcore1/gson/InventoryTypeAdapter.java b/src/com/massivecraft/mcore2dev/gson/InventoryTypeAdapter.java similarity index 88% rename from src/com/massivecraft/mcore1/gson/InventoryTypeAdapter.java rename to src/com/massivecraft/mcore2dev/gson/InventoryTypeAdapter.java index a0ee723f..c01fc998 100644 --- a/src/com/massivecraft/mcore1/gson/InventoryTypeAdapter.java +++ b/src/com/massivecraft/mcore2dev/gson/InventoryTypeAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore1.gson; +package com.massivecraft.mcore2dev.gson; import java.lang.reflect.Type; import java.util.ArrayList; @@ -11,14 +11,14 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.getspout.spoutapi.SpoutManager; -import com.massivecraft.mcore1.lib.gson.JsonDeserializationContext; -import com.massivecraft.mcore1.lib.gson.JsonDeserializer; -import com.massivecraft.mcore1.lib.gson.JsonElement; -import com.massivecraft.mcore1.lib.gson.JsonObject; -import com.massivecraft.mcore1.lib.gson.JsonParseException; -import com.massivecraft.mcore1.lib.gson.JsonPrimitive; -import com.massivecraft.mcore1.lib.gson.JsonSerializationContext; -import com.massivecraft.mcore1.lib.gson.JsonSerializer; +import com.massivecraft.mcore2dev.lib.gson.JsonDeserializationContext; +import com.massivecraft.mcore2dev.lib.gson.JsonDeserializer; +import com.massivecraft.mcore2dev.lib.gson.JsonElement; +import com.massivecraft.mcore2dev.lib.gson.JsonObject; +import com.massivecraft.mcore2dev.lib.gson.JsonParseException; +import com.massivecraft.mcore2dev.lib.gson.JsonPrimitive; +import com.massivecraft.mcore2dev.lib.gson.JsonSerializationContext; +import com.massivecraft.mcore2dev.lib.gson.JsonSerializer; public class InventoryTypeAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore1/lib/gson/AnonymousAndLocalClassExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/AnonymousAndLocalClassExclusionStrategy.java similarity index 96% rename from src/com/massivecraft/mcore1/lib/gson/AnonymousAndLocalClassExclusionStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/AnonymousAndLocalClassExclusionStrategy.java index 9acc934c..0eb4e7fe 100644 --- a/src/com/massivecraft/mcore1/lib/gson/AnonymousAndLocalClassExclusionStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/AnonymousAndLocalClassExclusionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; /** * Strategy for excluding anonymous and local classes. diff --git a/src/com/massivecraft/mcore1/lib/gson/Cache.java b/src/com/massivecraft/mcore2dev/lib/gson/Cache.java similarity index 96% rename from src/com/massivecraft/mcore1/lib/gson/Cache.java rename to src/com/massivecraft/mcore2dev/lib/gson/Cache.java index 22e704fd..3a7f67f5 100644 --- a/src/com/massivecraft/mcore1/lib/gson/Cache.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/Cache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; /** * Defines generic cache interface. diff --git a/src/com/massivecraft/mcore1/lib/gson/CamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/CamelCaseSeparatorNamingPolicy.java similarity index 95% rename from src/com/massivecraft/mcore1/lib/gson/CamelCaseSeparatorNamingPolicy.java rename to src/com/massivecraft/mcore2dev/lib/gson/CamelCaseSeparatorNamingPolicy.java index b81d84fa..73f43972 100644 --- a/src/com/massivecraft/mcore1/lib/gson/CamelCaseSeparatorNamingPolicy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/CamelCaseSeparatorNamingPolicy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/mcore1/lib/gson/CompositionFieldNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/CompositionFieldNamingPolicy.java similarity index 97% rename from src/com/massivecraft/mcore1/lib/gson/CompositionFieldNamingPolicy.java rename to src/com/massivecraft/mcore2dev/lib/gson/CompositionFieldNamingPolicy.java index 78283443..87a0b7ac 100644 --- a/src/com/massivecraft/mcore1/lib/gson/CompositionFieldNamingPolicy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/CompositionFieldNamingPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/mcore1/lib/gson/DefaultTypeAdapters.java b/src/com/massivecraft/mcore2dev/lib/gson/DefaultTypeAdapters.java similarity index 98% rename from src/com/massivecraft/mcore1/lib/gson/DefaultTypeAdapters.java rename to src/com/massivecraft/mcore2dev/lib/gson/DefaultTypeAdapters.java index cd3d81f5..67bf1a71 100644 --- a/src/com/massivecraft/mcore1/lib/gson/DefaultTypeAdapters.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/DefaultTypeAdapters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; import java.lang.reflect.Type; import java.sql.Timestamp; diff --git a/src/com/massivecraft/mcore1/lib/gson/DisjunctionExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/DisjunctionExclusionStrategy.java similarity index 92% rename from src/com/massivecraft/mcore1/lib/gson/DisjunctionExclusionStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/DisjunctionExclusionStrategy.java index fd7a559a..d9b817ad 100644 --- a/src/com/massivecraft/mcore1/lib/gson/DisjunctionExclusionStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/DisjunctionExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions; import java.util.Collection; diff --git a/src/com/massivecraft/mcore1/lib/gson/ExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/ExclusionStrategy.java similarity index 98% rename from src/com/massivecraft/mcore1/lib/gson/ExclusionStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/ExclusionStrategy.java index d2470229..a6c22a68 100644 --- a/src/com/massivecraft/mcore1/lib/gson/ExclusionStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/ExclusionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; /** * A strategy (or policy) definition that is used to decide whether or not a field or top-level diff --git a/src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java similarity index 90% rename from src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java index 3b7e785d..a158e86b 100644 --- a/src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationDeserializationExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.annotations.Expose; +import com.massivecraft.mcore2dev.lib.gson.annotations.Expose; /** * Excludes fields that do not have the {@link Expose} annotation diff --git a/src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java similarity index 90% rename from src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java index 16025a91..57fc6cd5 100644 --- a/src/com/massivecraft/mcore1/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/ExposeAnnotationSerializationExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.annotations.Expose; +import com.massivecraft.mcore2dev.lib.gson.annotations.Expose; /** * Excludes fields that do not have the {@link Expose} annotation diff --git a/src/com/massivecraft/mcore1/lib/gson/FieldAttributes.java b/src/com/massivecraft/mcore2dev/lib/gson/FieldAttributes.java similarity index 97% rename from src/com/massivecraft/mcore1/lib/gson/FieldAttributes.java rename to src/com/massivecraft/mcore2dev/lib/gson/FieldAttributes.java index 3bbb55b1..e33b79be 100644 --- a/src/com/massivecraft/mcore1/lib/gson/FieldAttributes.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/FieldAttributes.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions; -import com.massivecraft.mcore1.lib.gson.internal.Pair; +import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore2dev.lib.gson.internal.Pair; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore1/lib/gson/FieldNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingPolicy.java similarity index 94% rename from src/com/massivecraft/mcore1/lib/gson/FieldNamingPolicy.java rename to src/com/massivecraft/mcore2dev/lib/gson/FieldNamingPolicy.java index bc3ad8c7..7f0df632 100644 --- a/src/com/massivecraft/mcore1/lib/gson/FieldNamingPolicy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingPolicy.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; /** * An enumeration that defines a few standard naming conventions for JSON field names. - * This enumeration should be used in conjunction with {@link com.massivecraft.mcore1.lib.gson.GsonBuilder} - * to configure a {@link com.massivecraft.mcore1.lib.gson.Gson} instance to properly translate Java field + * This enumeration should be used in conjunction with {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder} + * to configure a {@link com.massivecraft.mcore2dev.lib.gson.Gson} instance to properly translate Java field * names into the desired JSON field names. * * @author Inderjeet Singh diff --git a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy.java similarity index 96% rename from src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy.java rename to src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy.java index b440f6d2..9e860f7d 100644 --- a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2.java b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2.java similarity index 96% rename from src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2.java rename to src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2.java index 6a303e65..5b3009cd 100644 --- a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; /** * The new mechanism for providing custom field naming in Gson. This allows the client code diff --git a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2Adapter.java b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2Adapter.java similarity index 90% rename from src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2Adapter.java rename to src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2Adapter.java index d3fa5d0a..a69bc032 100644 --- a/src/com/massivecraft/mcore1/lib/gson/FieldNamingStrategy2Adapter.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/FieldNamingStrategy2Adapter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions; /** * Adapts the old FieldNamingStrategy to the new {@link FieldNamingStrategy2} diff --git a/src/com/massivecraft/mcore1/lib/gson/Gson.java b/src/com/massivecraft/mcore2dev/lib/gson/Gson.java similarity index 92% rename from src/com/massivecraft/mcore1/lib/gson/Gson.java rename to src/com/massivecraft/mcore2dev/lib/gson/Gson.java index f15e345c..aa27040e 100644 --- a/src/com/massivecraft/mcore1/lib/gson/Gson.java +++ b/src/com/massivecraft/mcore2dev/lib/gson/Gson.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package com.massivecraft.mcore1.lib.gson; +package com.massivecraft.mcore2dev.lib.gson; -import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor; -import com.massivecraft.mcore1.lib.gson.internal.ParameterizedTypeHandlerMap; -import com.massivecraft.mcore1.lib.gson.internal.Primitives; -import com.massivecraft.mcore1.lib.gson.internal.Streams; -import com.massivecraft.mcore1.lib.gson.internal.bind.ArrayTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.BigDecimalTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.BigIntegerTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.CollectionTypeAdapterFactory; -import com.massivecraft.mcore1.lib.gson.internal.bind.DateTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.ExcludedTypeAdapterFactory; -import com.massivecraft.mcore1.lib.gson.internal.bind.JsonElementReader; -import com.massivecraft.mcore1.lib.gson.internal.bind.JsonElementWriter; -import com.massivecraft.mcore1.lib.gson.internal.bind.MapTypeAdapterFactory; -import com.massivecraft.mcore1.lib.gson.internal.bind.MiniGson; -import com.massivecraft.mcore1.lib.gson.internal.bind.ObjectTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.ReflectiveTypeAdapterFactory; -import com.massivecraft.mcore1.lib.gson.internal.bind.SqlDateTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.TimeTypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.TypeAdapter; -import com.massivecraft.mcore1.lib.gson.internal.bind.TypeAdapters; -import com.massivecraft.mcore1.lib.gson.reflect.TypeToken; -import com.massivecraft.mcore1.lib.gson.stream.JsonReader; -import com.massivecraft.mcore1.lib.gson.stream.JsonToken; -import com.massivecraft.mcore1.lib.gson.stream.JsonWriter; -import com.massivecraft.mcore1.lib.gson.stream.MalformedJsonException; +import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor; +import com.massivecraft.mcore2dev.lib.gson.internal.ParameterizedTypeHandlerMap; +import com.massivecraft.mcore2dev.lib.gson.internal.Primitives; +import com.massivecraft.mcore2dev.lib.gson.internal.Streams; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.ArrayTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.BigDecimalTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.BigIntegerTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.CollectionTypeAdapterFactory; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.DateTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.ExcludedTypeAdapterFactory; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.JsonElementReader; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.JsonElementWriter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.MapTypeAdapterFactory; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.MiniGson; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.ObjectTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.ReflectiveTypeAdapterFactory; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.SqlDateTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.TimeTypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.TypeAdapter; +import com.massivecraft.mcore2dev.lib.gson.internal.bind.TypeAdapters; +import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken; +import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader; +import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken; +import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter; +import com.massivecraft.mcore2dev.lib.gson.stream.MalformedJsonException; import java.io.EOFException; import java.io.IOException; @@ -95,7 +95,7 @@ import java.util.Map; *

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

* - * @see com.massivecraft.mcore1.lib.gson.reflect.TypeToken + * @see com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken * * @author Inderjeet Singh * @author Joel Leitch @@ -158,10 +158,10 @@ public final class Gson { * ignores the millisecond portion of the date during serialization. You can change * this by invoking {@link GsonBuilder#setDateFormat(int)} or * {@link GsonBuilder#setDateFormat(String)}. - *
  • By default, Gson ignores the {@link com.massivecraft.mcore1.lib.gson.annotations.Expose} annotation. + *
  • By default, Gson ignores the {@link com.massivecraft.mcore2dev.lib.gson.annotations.Expose} annotation. * You can enable Gson to serialize/deserialize only those fields marked with this annotation * through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}.
    • - *
  • By default, Gson ignores the {@link com.massivecraft.mcore1.lib.gson.annotations.Since} annotation. You + *
  • By default, Gson ignores the {@link com.massivecraft.mcore2dev.lib.gson.annotations.Since} annotation. You * can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.
    • *
  • The default field naming policy for the output Json is same as in Java. So, a Java class * field versionNumber will be output as "versionNumber@quot; in @@ -392,7 +392,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.mcore1.lib.gson.reflect.TypeToken} class. For example, + * this type by using the {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example, * to get the type for {@code Collection}, you should use: * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -435,7 +435,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.mcore1.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -477,7 +477,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.mcore1.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -619,7 +619,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the string from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore1.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -672,7 +672,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the reader producing Json from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore1.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -769,7 +769,7 @@ public  T fromJson(Reader json, Type typeOfT) throws JsonIOException, JsonSyn
    * @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.mcore1.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
diff --git a/src/com/massivecraft/mcore1/lib/gson/GsonBuilder.java b/src/com/massivecraft/mcore2dev/lib/gson/GsonBuilder.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/GsonBuilder.java
rename to src/com/massivecraft/mcore2dev/lib/gson/GsonBuilder.java
index 84ad4674..e9ae1dfa 100644
--- a/src/com/massivecraft/mcore1/lib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/GsonBuilder.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore1.lib.gson.internal.ParameterizedTypeHandlerMap;
-import com.massivecraft.mcore1.lib.gson.internal.Primitives;
-import com.massivecraft.mcore1.lib.gson.internal.bind.TypeAdapter;
+import com.massivecraft.mcore2dev.lib.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.ParameterizedTypeHandlerMap;
+import com.massivecraft.mcore2dev.lib.gson.internal.Primitives;
+import com.massivecraft.mcore2dev.lib.gson.internal.bind.TypeAdapter;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -178,7 +178,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.mcore1.lib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.mcore2dev.lib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/massivecraft/mcore1/lib/gson/GsonToMiniGsonTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/GsonToMiniGsonTypeAdapterFactory.java
similarity index 85%
rename from src/com/massivecraft/mcore1/lib/gson/GsonToMiniGsonTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/GsonToMiniGsonTypeAdapterFactory.java
index 1094c99b..875c4107 100644
--- a/src/com/massivecraft/mcore1/lib/gson/GsonToMiniGsonTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/GsonToMiniGsonTypeAdapterFactory.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.ParameterizedTypeHandlerMap;
-import com.massivecraft.mcore1.lib.gson.internal.Streams;
-import com.massivecraft.mcore1.lib.gson.internal.bind.MiniGson;
-import com.massivecraft.mcore1.lib.gson.internal.bind.TypeAdapter;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.ParameterizedTypeHandlerMap;
+import com.massivecraft.mcore2dev.lib.gson.internal.Streams;
+import com.massivecraft.mcore2dev.lib.gson.internal.bind.MiniGson;
+import com.massivecraft.mcore2dev.lib.gson.internal.bind.TypeAdapter;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/InnerClassExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/InnerClassExclusionStrategy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/InnerClassExclusionStrategy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/InnerClassExclusionStrategy.java
index f97d11ce..6cbf3587 100644
--- a/src/com/massivecraft/mcore1/lib/gson/InnerClassExclusionStrategy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/InnerClassExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Modifier;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/InstanceCreator.java b/src/com/massivecraft/mcore2dev/lib/gson/InstanceCreator.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/InstanceCreator.java
rename to src/com/massivecraft/mcore2dev/lib/gson/InstanceCreator.java
index 42fe6e0a..afc61dbd 100644
--- a/src/com/massivecraft/mcore1/lib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/InstanceCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JavaFieldNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/JavaFieldNamingPolicy.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/JavaFieldNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JavaFieldNamingPolicy.java
index 5505c6eb..aa85bee4 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JavaFieldNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JavaFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonArray.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonArray.java
similarity index 99%
rename from src/com/massivecraft/mcore1/lib/gson/JsonArray.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonArray.java
index f90253ac..f394d070 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonArray.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializationContext.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializationContext.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializationContext.java
index fc1d4c8a..a39a2052 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializer.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializer.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/JsonDeserializer.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializer.java
index 69c45924..466e8526 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializerExceptionWrapper.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializerExceptionWrapper.java
similarity index 95%
rename from src/com/massivecraft/mcore1/lib/gson/JsonDeserializerExceptionWrapper.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializerExceptionWrapper.java
index 6215b871..d3bafb8c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonDeserializerExceptionWrapper.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonDeserializerExceptionWrapper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonElement.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonElement.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/JsonElement.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonElement.java
index 796ac3df..43ae4d1f 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonElement.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonElement.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.Streams;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.Streams;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonElementVisitor.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonElementVisitor.java
similarity index 95%
rename from src/com/massivecraft/mcore1/lib/gson/JsonElementVisitor.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonElementVisitor.java
index 0c71fa9e..9062e392 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonElementVisitor.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonElementVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonIOException.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonIOException.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/JsonIOException.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonIOException.java
index d7eb0426..c9ac32f7 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonIOException.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonIOException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonNull.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonNull.java
similarity index 93%
rename from src/com/massivecraft/mcore1/lib/gson/JsonNull.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonNull.java
index b4be4add..41ba3c9b 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonNull.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonNull.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * A class representing a Json {@code null} value.
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonObject.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonObject.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/JsonObject.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonObject.java
index 71272bb6..6e5eff95 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonObject.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonObject.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonParseException.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonParseException.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/JsonParseException.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonParseException.java
index fc1c4b3e..62fc07bb 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonParseException.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonParseException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonParser.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonParser.java
similarity index 88%
rename from src/com/massivecraft/mcore1/lib/gson/JsonParser.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonParser.java
index 1b894b3c..e56d9717 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonParser.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonParser.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.Streams;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore2dev.lib.gson.internal.Streams;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonPrimitive.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonPrimitive.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/JsonPrimitive.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonPrimitive.java
index 402d3b8b..11cfb8fb 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonPrimitive.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore1.lib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.LazilyParsedNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonSerializationContext.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonSerializationContext.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonSerializationContext.java
index 9e2378d7..f8d3be3a 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonSerializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonSerializer.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonSerializer.java
similarity index 95%
rename from src/com/massivecraft/mcore1/lib/gson/JsonSerializer.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonSerializer.java
index 92f9a518..bad87304 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonSerializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.reflect.Type;
 
 /**
  * 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.mcore1.lib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * 
    Let us look at example where defining a serializer will be useful. The {@code Id} class
  * defined below has two fields: {@code clazz} and {@code value}.
    
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonStreamParser.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonStreamParser.java
similarity index 92%
rename from src/com/massivecraft/mcore1/lib/gson/JsonStreamParser.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonStreamParser.java
index ef9bb355..6b5c76a5 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,10 +22,10 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.massivecraft.mcore1.lib.gson.internal.Streams;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore2dev.lib.gson.internal.Streams;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.MalformedJsonException;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/com/massivecraft/mcore1/lib/gson/JsonSyntaxException.java b/src/com/massivecraft/mcore2dev/lib/gson/JsonSyntaxException.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/JsonSyntaxException.java
rename to src/com/massivecraft/mcore2dev/lib/gson/JsonSyntaxException.java
index 6a74f951..0fe9dd1c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/JsonSyntaxException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/massivecraft/mcore1/lib/gson/LongSerializationPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/LongSerializationPolicy.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/LongSerializationPolicy.java
index e492ae77..6fee6d99 100644
--- a/src/com/massivecraft/mcore1/lib/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/LongSerializationPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/massivecraft/mcore1/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java
index a2d656ad..d92e124c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/LowerCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only
diff --git a/src/com/massivecraft/mcore1/lib/gson/LowerCaseNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/LowerCaseNamingPolicy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/LowerCaseNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/LowerCaseNamingPolicy.java
index 424ebcb0..788aaefc 100644
--- a/src/com/massivecraft/mcore1/lib/gson/LowerCaseNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/LowerCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/LruCache.java b/src/com/massivecraft/mcore2dev/lib/gson/LruCache.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/LruCache.java
rename to src/com/massivecraft/mcore2dev/lib/gson/LruCache.java
index e0323d7a..9ee40403 100644
--- a/src/com/massivecraft/mcore1/lib/gson/LruCache.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/LruCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 
 import java.util.LinkedHashMap;
diff --git a/src/com/massivecraft/mcore1/lib/gson/ModifierBasedExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/ModifierBasedExclusionStrategy.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/ModifierBasedExclusionStrategy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/ModifierBasedExclusionStrategy.java
index f4f649a9..f0fd62de 100644
--- a/src/com/massivecraft/mcore1/lib/gson/ModifierBasedExclusionStrategy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/ModifierBasedExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/com/massivecraft/mcore1/lib/gson/ModifyFirstLetterNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/ModifyFirstLetterNamingPolicy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/ModifyFirstLetterNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/ModifyFirstLetterNamingPolicy.java
index 6895461a..34f77a28 100644
--- a/src/com/massivecraft/mcore1/lib/gson/ModifyFirstLetterNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/ModifyFirstLetterNamingPolicy.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/RecursiveFieldNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/RecursiveFieldNamingPolicy.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/RecursiveFieldNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/RecursiveFieldNamingPolicy.java
index 0fc8c5ab..c0947da6 100644
--- a/src/com/massivecraft/mcore1/lib/gson/RecursiveFieldNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/RecursiveFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
similarity index 87%
rename from src/com/massivecraft/mcore1/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
index 1a3c4001..ff7451a4 100644
--- a/src/com/massivecraft/mcore1/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.annotations.SerializedName;
+import com.massivecraft.mcore2dev.lib.gson.annotations.SerializedName;
 
 /**
  * A {@link FieldNamingStrategy2} that acts as a chain of responsibility. If the
- * {@link com.massivecraft.mcore1.lib.gson.annotations.SerializedName} annotation is applied to a
+ * {@link com.massivecraft.mcore2dev.lib.gson.annotations.SerializedName} annotation is applied to a
  * field then this strategy will translate the name to the {@code
  * serializedName.value()}; otherwise it delegates to the wrapped
  * {@link FieldNamingStrategy2}.
diff --git a/src/com/massivecraft/mcore1/lib/gson/SyntheticFieldExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/SyntheticFieldExclusionStrategy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/SyntheticFieldExclusionStrategy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/SyntheticFieldExclusionStrategy.java
index cfd106b4..df75af6c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/SyntheticFieldExclusionStrategy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/SyntheticFieldExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * A data object that stores attributes of a field.
diff --git a/src/com/massivecraft/mcore1/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java
index fd9e2c17..d87cba42 100644
--- a/src/com/massivecraft/mcore1/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/UpperCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of mixed
diff --git a/src/com/massivecraft/mcore1/lib/gson/UpperCaseNamingPolicy.java b/src/com/massivecraft/mcore2dev/lib/gson/UpperCaseNamingPolicy.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/UpperCaseNamingPolicy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/UpperCaseNamingPolicy.java
index 4dbced0f..7fb351cc 100644
--- a/src/com/massivecraft/mcore1/lib/gson/UpperCaseNamingPolicy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/UpperCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/VersionConstants.java b/src/com/massivecraft/mcore2dev/lib/gson/VersionConstants.java
similarity index 94%
rename from src/com/massivecraft/mcore1/lib/gson/VersionConstants.java
rename to src/com/massivecraft/mcore2dev/lib/gson/VersionConstants.java
index 99a3815b..a01a9da9 100644
--- a/src/com/massivecraft/mcore1/lib/gson/VersionConstants.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/VersionConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
 /**
  * Class contain all constants for versioning support.
diff --git a/src/com/massivecraft/mcore1/lib/gson/VersionExclusionStrategy.java b/src/com/massivecraft/mcore2dev/lib/gson/VersionExclusionStrategy.java
similarity index 88%
rename from src/com/massivecraft/mcore1/lib/gson/VersionExclusionStrategy.java
rename to src/com/massivecraft/mcore2dev/lib/gson/VersionExclusionStrategy.java
index f1f0fd84..2002a947 100644
--- a/src/com/massivecraft/mcore1/lib/gson/VersionExclusionStrategy.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/VersionExclusionStrategy.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson;
+package com.massivecraft.mcore2dev.lib.gson;
 
-import com.massivecraft.mcore1.lib.gson.annotations.Since;
-import com.massivecraft.mcore1.lib.gson.annotations.Until;
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.annotations.Since;
+import com.massivecraft.mcore2dev.lib.gson.annotations.Until;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
 
 /**
  * This strategy will exclude any files and/or class that are passed the
diff --git a/src/com/massivecraft/mcore1/lib/gson/annotations/Expose.java b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Expose.java
similarity index 92%
rename from src/com/massivecraft/mcore1/lib/gson/annotations/Expose.java
rename to src/com/massivecraft/mcore2dev/lib/gson/annotations/Expose.java
index eb1cc855..f15a1bcd 100644
--- a/src/com/massivecraft/mcore1/lib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.annotations;
+package com.massivecraft.mcore2dev.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be exposed for JSON
  * serialization or deserialization.
  *
- * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore1.lib.gson.Gson}
- * with a {@link com.massivecraft.mcore1.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore2dev.lib.gson.Gson}
+ * with a {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore1/lib/gson/annotations/SerializedName.java b/src/com/massivecraft/mcore2dev/lib/gson/annotations/SerializedName.java
similarity index 86%
rename from src/com/massivecraft/mcore1/lib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/mcore2dev/lib/gson/annotations/SerializedName.java
index 15fb7aa3..6d882b45 100644
--- a/src/com/massivecraft/mcore1/lib/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.annotations;
+package com.massivecraft.mcore2dev.lib.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.mcore1.lib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore1.lib.gson.Gson}
+ * 
    This annotation will override any {@link com.massivecraft.mcore2dev.lib.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore2dev.lib.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore1.lib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore2dev.lib.gson.FieldNamingPolicy)}
  * for more information.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * 
    NOTE: The value you specify in this annotation must be a valid JSON field name.
    
  *
- * @see com.massivecraft.mcore1.lib.gson.FieldNamingPolicy
+ * @see com.massivecraft.mcore2dev.lib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/massivecraft/mcore1/lib/gson/annotations/Since.java b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Since.java
similarity index 89%
rename from src/com/massivecraft/mcore1/lib/gson/annotations/Since.java
rename to src/com/massivecraft/mcore2dev/lib/gson/annotations/Since.java
index 39c48f8e..d7c7a33d 100644
--- a/src/com/massivecraft/mcore1/lib/gson/annotations/Since.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.annotations;
+package com.massivecraft.mcore2dev.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,9 +26,9 @@ import java.lang.annotation.Target;
  * This annotation is useful to manage versioning of your Json classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore1.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore2dev.lib.gson.Gson} with a
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore1/lib/gson/annotations/Until.java b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Until.java
similarity index 90%
rename from src/com/massivecraft/mcore1/lib/gson/annotations/Until.java
rename to src/com/massivecraft/mcore2dev/lib/gson/annotations/Until.java
index 093a4d1e..8a4b7cce 100644
--- a/src/com/massivecraft/mcore1/lib/gson/annotations/Until.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.annotations;
+package com.massivecraft.mcore2dev.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
  * is useful to manage versioning of your JSON classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore1.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore1.lib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore2dev.lib.gson.Gson} with a
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore1/lib/gson/annotations/package-info.java b/src/com/massivecraft/mcore2dev/lib/gson/annotations/package-info.java
similarity index 53%
rename from src/com/massivecraft/mcore1/lib/gson/annotations/package-info.java
rename to src/com/massivecraft/mcore2dev/lib/gson/annotations/package-info.java
index 7cf7ec46..b87283a2 100644
--- a/src/com/massivecraft/mcore1/lib/gson/annotations/package-info.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore1.lib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.mcore2dev.lib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore1.lib.gson.annotations;
\ No newline at end of file
+package com.massivecraft.mcore2dev.lib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Preconditions.java
index 038573e3..946d5091 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Types.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Types.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Types.java
index a01e7c87..0b7046e7 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
-import static com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/ConstructorConstructor.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/ConstructorConstructor.java
index bae551b3..3d57512c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/ConstructorConstructor.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
-import com.massivecraft.mcore1.lib.gson.InstanceCreator;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.InstanceCreator;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/LazilyParsedNumber.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/LazilyParsedNumber.java
index 11ba1559..fc1ce4df 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/mcore2dev/lib/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.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 import java.math.BigInteger;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/ObjectConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore1/lib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/ObjectConstructor.java
index b3aa841e..64571d6b 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 /**
  * Defines a generic object construction factory.  The purpose of this class
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/Pair.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/Pair.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/internal/Pair.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/Pair.java
index 9d302690..e821d242 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/Pair.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/Pair.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/ParameterizedTypeHandlerMap.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/ParameterizedTypeHandlerMap.java
similarity index 99%
rename from src/com/massivecraft/mcore1/lib/gson/internal/ParameterizedTypeHandlerMap.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/ParameterizedTypeHandlerMap.java
index 1ac2ce44..012f2529 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/ParameterizedTypeHandlerMap.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/ParameterizedTypeHandlerMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/Primitives.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/Primitives.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/internal/Primitives.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/Primitives.java
index c9bda5a2..496ad0ac 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/Streams.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/Streams.java
similarity index 83%
rename from src/com/massivecraft/mcore1/lib/gson/internal/Streams.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/Streams.java
index ef3b85e8..8d33c44a 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/Streams.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonIOException;
-import com.massivecraft.mcore1.lib.gson.JsonNull;
-import com.massivecraft.mcore1.lib.gson.JsonParseException;
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
-import com.massivecraft.mcore1.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonIOException;
+import com.massivecraft.mcore2dev.lib.gson.JsonNull;
+import com.massivecraft.mcore2dev.lib.gson.JsonParseException;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/UnsafeAllocator.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/UnsafeAllocator.java
index 04aa1ec0..37b7aba4 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/UnsafeAllocator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal;
+package com.massivecraft.mcore2dev.lib.gson.internal;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 88%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ArrayTypeAdapter.java
index be5fc6af..11c82cd2 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -23,11 +23,11 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 /**
  * Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 80%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigDecimalTypeAdapter.java
index cb70b3fe..0ee20b9d 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 80%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigIntegerTypeAdapter.java
index 4bbb5158..a03fc76d 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 85%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
index b8d84888..8e274835 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/DateTypeAdapter.java
similarity index 88%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/DateTypeAdapter.java
index 12c99e88..16733592 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/DateTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java
similarity index 89%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java
index d80d587f..2af63ead 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ExcludedTypeAdapterFactory.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.ExclusionStrategy;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementReader.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementReader.java
similarity index 93%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementReader.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementReader.java
index ec96c6ee..bddf67f0 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementReader.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonArray;
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonNull;
-import com.massivecraft.mcore1.lib.gson.JsonObject;
-import com.massivecraft.mcore1.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.JsonArray;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonNull;
+import com.massivecraft.mcore2dev.lib.gson.JsonObject;
+import com.massivecraft.mcore2dev.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementWriter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementWriter.java
similarity index 93%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementWriter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementWriter.java
index a702cdcd..688d72bd 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/JsonElementWriter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/JsonElementWriter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonArray;
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonNull;
-import com.massivecraft.mcore1.lib.gson.JsonObject;
-import com.massivecraft.mcore1.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonArray;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonNull;
+import com.massivecraft.mcore2dev.lib.gson.JsonObject;
+import com.massivecraft.mcore2dev.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 92%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MapTypeAdapterFactory.java
index e42b5800..1eb51030 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.Streams;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.Streams;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/MiniGson.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MiniGson.java
similarity index 95%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/MiniGson.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MiniGson.java
index b27965f4..f9e7e6cf 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/MiniGson.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/MiniGson.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 89%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ObjectTypeAdapter.java
index add42211..ea01057e 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/Reflection.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/Reflection.java
similarity index 91%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/Reflection.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/Reflection.java
index 9f752267..998e99db 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/Reflection.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/Reflection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 91%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index ab2756ac..111daa50 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.Primitives;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.Primitives;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.AccessibleObject;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 84%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/SqlDateTypeAdapter.java
index 66e993e3..961a13fc 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java
similarity index 86%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java
index 1f92396c..4195838e 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/StringToValueMapTypeAdapterFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore1.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore1.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore2dev.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TimeTypeAdapter.java
similarity index 84%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TimeTypeAdapter.java
index 81700406..eb6bb237 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.sql.Time;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapter.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapter.java
similarity index 85%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapter.java
index dd1daeb9..bbef8ce8 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonIOException;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonIOException;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 88%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 4d81a6eb..46291b6b 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapters.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapters.java
index 2648e0cd..6890913b 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/bind/TypeAdapters.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.internal.bind;
+package com.massivecraft.mcore2dev.lib.gson.internal.bind;
 
-import com.massivecraft.mcore1.lib.gson.JsonArray;
-import com.massivecraft.mcore1.lib.gson.JsonElement;
-import com.massivecraft.mcore1.lib.gson.JsonIOException;
-import com.massivecraft.mcore1.lib.gson.JsonNull;
-import com.massivecraft.mcore1.lib.gson.JsonObject;
-import com.massivecraft.mcore1.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore1.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore1.lib.gson.internal.LazilyParsedNumber;
-import com.massivecraft.mcore1.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore1.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore1.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore2dev.lib.gson.JsonArray;
+import com.massivecraft.mcore2dev.lib.gson.JsonElement;
+import com.massivecraft.mcore2dev.lib.gson.JsonIOException;
+import com.massivecraft.mcore2dev.lib.gson.JsonNull;
+import com.massivecraft.mcore2dev.lib.gson.JsonObject;
+import com.massivecraft.mcore2dev.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore2dev.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore2dev.lib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore2dev.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore2dev.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/src/com/massivecraft/mcore1/lib/gson/internal/package-info.java b/src/com/massivecraft/mcore2dev/lib/gson/internal/package-info.java
similarity index 82%
rename from src/com/massivecraft/mcore1/lib/gson/internal/package-info.java
rename to src/com/massivecraft/mcore2dev/lib/gson/internal/package-info.java
index 64b850c1..f8ba6520 100644
--- a/src/com/massivecraft/mcore1/lib/gson/internal/package-info.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package com.massivecraft.mcore1.lib.gson.internal;
\ No newline at end of file
+package com.massivecraft.mcore2dev.lib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2dev/lib/gson/package-info.java b/src/com/massivecraft/mcore2dev/lib/gson/package-info.java
new file mode 100644
index 00000000..355aca45
--- /dev/null
+++ b/src/com/massivecraft/mcore2dev/lib/gson/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This package provides the {@link com.massivecraft.mcore2dev.lib.gson.Gson} class to convert Json to Java and
+ * vice-versa.
+ *
+ * 
    The primary class to use is {@link com.massivecraft.mcore2dev.lib.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore2dev.lib.gson.GsonBuilder}
+ * (to configure various options such as using versioning and so on).
    
+ *
+ * @author Inderjeet Singh, Joel Leitch
+ */
+package com.massivecraft.mcore2dev.lib.gson;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore1/lib/gson/reflect/TypeToken.java b/src/com/massivecraft/mcore2dev/lib/gson/reflect/TypeToken.java
similarity index 98%
rename from src/com/massivecraft/mcore1/lib/gson/reflect/TypeToken.java
rename to src/com/massivecraft/mcore2dev/lib/gson/reflect/TypeToken.java
index c5207b6d..b174cbba 100644
--- a/src/com/massivecraft/mcore1/lib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/reflect/TypeToken.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.reflect;
+package com.massivecraft.mcore2dev.lib.gson.reflect;
 
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore1.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore2dev.lib.gson.internal.$Gson$Types;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore1/lib/gson/reflect/package-info.java b/src/com/massivecraft/mcore2dev/lib/gson/reflect/package-info.java
similarity index 73%
rename from src/com/massivecraft/mcore1/lib/gson/reflect/package-info.java
rename to src/com/massivecraft/mcore2dev/lib/gson/reflect/package-info.java
index a6898b11..af92b470 100644
--- a/src/com/massivecraft/mcore1/lib/gson/reflect/package-info.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore1.lib.gson.reflect;
\ No newline at end of file
+package com.massivecraft.mcore2dev.lib.gson.reflect;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/JsonReader.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonReader.java
similarity index 99%
rename from src/com/massivecraft/mcore1/lib/gson/stream/JsonReader.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/JsonReader.java
index af48f3b1..1700fa3c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/JsonScope.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonScope.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/stream/JsonScope.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/JsonScope.java
index 9ba0552c..fbd3e05c 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/JsonToken.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonToken.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/stream/JsonToken.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/JsonToken.java
index 78b95f2d..042a00ed 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/JsonWriter.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonWriter.java
similarity index 99%
rename from src/com/massivecraft/mcore1/lib/gson/stream/JsonWriter.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/JsonWriter.java
index 496c01af..2779109f 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/MalformedJsonException.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/MalformedJsonException.java
similarity index 96%
rename from src/com/massivecraft/mcore1/lib/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/MalformedJsonException.java
index 02b43800..d9083b53 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/MalformedJsonException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore1/lib/gson/stream/StringPool.java b/src/com/massivecraft/mcore2dev/lib/gson/stream/StringPool.java
similarity index 97%
rename from src/com/massivecraft/mcore1/lib/gson/stream/StringPool.java
rename to src/com/massivecraft/mcore2dev/lib/gson/stream/StringPool.java
index 472465f5..3e2abe0e 100644
--- a/src/com/massivecraft/mcore1/lib/gson/stream/StringPool.java
+++ b/src/com/massivecraft/mcore2dev/lib/gson/stream/StringPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore1.lib.gson.stream;
+package com.massivecraft.mcore2dev.lib.gson.stream;
 
 /**
  * A pool of string instances. Unlike the {@link String#intern() VM's
diff --git a/src/com/massivecraft/mcore1/persist/Entity.java b/src/com/massivecraft/mcore2dev/persist/Entity.java
similarity index 91%
rename from src/com/massivecraft/mcore1/persist/Entity.java
rename to src/com/massivecraft/mcore2dev/persist/Entity.java
index 835bd08a..76ac67a6 100644
--- a/src/com/massivecraft/mcore1/persist/Entity.java
+++ b/src/com/massivecraft/mcore2dev/persist/Entity.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 /**
  * Usage of this class is highly optional. You may persist anything. If you are 
diff --git a/src/com/massivecraft/mcore1/persist/IClassManager.java b/src/com/massivecraft/mcore2dev/persist/IClassManager.java
similarity index 94%
rename from src/com/massivecraft/mcore1/persist/IClassManager.java
rename to src/com/massivecraft/mcore2dev/persist/IClassManager.java
index 593ef1f2..ce22eb9b 100644
--- a/src/com/massivecraft/mcore1/persist/IClassManager.java
+++ b/src/com/massivecraft/mcore2dev/persist/IClassManager.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Map;
 
-import com.massivecraft.mcore1.Predictate;
+import com.massivecraft.mcore2dev.Predictate;
 
 public interface IClassManager
 {
diff --git a/src/com/massivecraft/mcore1/persist/One.java b/src/com/massivecraft/mcore2dev/persist/One.java
similarity index 91%
rename from src/com/massivecraft/mcore1/persist/One.java
rename to src/com/massivecraft/mcore2dev/persist/One.java
index 6a5fdec2..45aa10c9 100644
--- a/src/com/massivecraft/mcore1/persist/One.java
+++ b/src/com/massivecraft/mcore2dev/persist/One.java
@@ -1,11 +1,11 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 
-import com.massivecraft.mcore1.MPlugin;
-import com.massivecraft.mcore1.util.DiscUtil;
+import com.massivecraft.mcore2dev.MPlugin;
+import com.massivecraft.mcore2dev.util.DiscUtil;
 
 // TODO: Give better name and place to differenciate from the entity-orm-ish system in "com.massivecraft.core.persist".
 
diff --git a/src/com/massivecraft/mcore1/persist/Persist.java b/src/com/massivecraft/mcore2dev/persist/Persist.java
similarity index 93%
rename from src/com/massivecraft/mcore1/persist/Persist.java
rename to src/com/massivecraft/mcore2dev/persist/Persist.java
index 6cab81c9..f477cc9a 100644
--- a/src/com/massivecraft/mcore1/persist/Persist.java
+++ b/src/com/massivecraft/mcore2dev/persist/Persist.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;
 
-import com.massivecraft.mcore1.Predictate;
+import com.massivecraft.mcore2dev.Predictate;
 
 public class Persist
 {
diff --git a/src/com/massivecraft/mcore1/persist/PlayerEntity.java b/src/com/massivecraft/mcore2dev/persist/PlayerEntity.java
similarity index 88%
rename from src/com/massivecraft/mcore1/persist/PlayerEntity.java
rename to src/com/massivecraft/mcore2dev/persist/PlayerEntity.java
index a9e5f489..01c6d1ef 100644
--- a/src/com/massivecraft/mcore1/persist/PlayerEntity.java
+++ b/src/com/massivecraft/mcore2dev/persist/PlayerEntity.java
@@ -1,11 +1,11 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 import java.util.Collection;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore1.util.Txt;
+import com.massivecraft.mcore2dev.util.Txt;
 
 
 public abstract class PlayerEntity> extends Entity
diff --git a/src/com/massivecraft/mcore1/persist/SaveTask.java b/src/com/massivecraft/mcore2dev/persist/SaveTask.java
similarity index 86%
rename from src/com/massivecraft/mcore1/persist/SaveTask.java
rename to src/com/massivecraft/mcore2dev/persist/SaveTask.java
index 96d9fb67..3114bb17 100644
--- a/src/com/massivecraft/mcore1/persist/SaveTask.java
+++ b/src/com/massivecraft/mcore2dev/persist/SaveTask.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist;
+package com.massivecraft.mcore2dev.persist;
 
 import java.util.TimerTask;
 
diff --git a/src/com/massivecraft/mcore1/persist/gson/GsonClassManager.java b/src/com/massivecraft/mcore2dev/persist/gson/GsonClassManager.java
similarity index 93%
rename from src/com/massivecraft/mcore1/persist/gson/GsonClassManager.java
rename to src/com/massivecraft/mcore2dev/persist/gson/GsonClassManager.java
index 65965588..5cb3d7dd 100644
--- a/src/com/massivecraft/mcore1/persist/gson/GsonClassManager.java
+++ b/src/com/massivecraft/mcore2dev/persist/gson/GsonClassManager.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist.gson;
+package com.massivecraft.mcore2dev.persist.gson;
 
 import java.io.File;
 import java.util.Collection;
@@ -11,10 +11,10 @@ import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import com.massivecraft.mcore1.Predictate;
-import com.massivecraft.mcore1.lib.gson.Gson;
-import com.massivecraft.mcore1.persist.IClassManager;
-import com.massivecraft.mcore1.persist.Persist;
+import com.massivecraft.mcore2dev.Predictate;
+import com.massivecraft.mcore2dev.lib.gson.Gson;
+import com.massivecraft.mcore2dev.persist.IClassManager;
+import com.massivecraft.mcore2dev.persist.Persist;
 
 public abstract class GsonClassManager implements IClassManager
 {
diff --git a/src/com/massivecraft/mcore1/persist/gson/GsonPlayerEntityManager.java b/src/com/massivecraft/mcore2dev/persist/gson/GsonPlayerEntityManager.java
similarity index 83%
rename from src/com/massivecraft/mcore1/persist/gson/GsonPlayerEntityManager.java
rename to src/com/massivecraft/mcore2dev/persist/gson/GsonPlayerEntityManager.java
index 211926cd..30e2aa43 100644
--- a/src/com/massivecraft/mcore1/persist/gson/GsonPlayerEntityManager.java
+++ b/src/com/massivecraft/mcore2dev/persist/gson/GsonPlayerEntityManager.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist.gson;
+package com.massivecraft.mcore2dev.persist.gson;
 
 import java.io.File;
 import java.util.Collection;
@@ -7,9 +7,9 @@ import java.util.Set;
 
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore1.Predictate;
-import com.massivecraft.mcore1.lib.gson.Gson;
-import com.massivecraft.mcore1.persist.PlayerEntity;
+import com.massivecraft.mcore2dev.Predictate;
+import com.massivecraft.mcore2dev.lib.gson.Gson;
+import com.massivecraft.mcore2dev.persist.PlayerEntity;
 
 public abstract class GsonPlayerEntityManager> extends GsonClassManager
 {
diff --git a/src/com/massivecraft/mcore1/persist/gson/JsonFileFilter.java b/src/com/massivecraft/mcore2dev/persist/gson/JsonFileFilter.java
similarity index 86%
rename from src/com/massivecraft/mcore1/persist/gson/JsonFileFilter.java
rename to src/com/massivecraft/mcore2dev/persist/gson/JsonFileFilter.java
index 8d245016..ab1264cd 100644
--- a/src/com/massivecraft/mcore1/persist/gson/JsonFileFilter.java
+++ b/src/com/massivecraft/mcore2dev/persist/gson/JsonFileFilter.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.persist.gson;
+package com.massivecraft.mcore2dev.persist.gson;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/src/com/massivecraft/mcore1/util/ClassLoadHack.java b/src/com/massivecraft/mcore2dev/util/ClassLoadHack.java
similarity index 91%
rename from src/com/massivecraft/mcore1/util/ClassLoadHack.java
rename to src/com/massivecraft/mcore2dev/util/ClassLoadHack.java
index 2a00e5ad..a2a4e88f 100644
--- a/src/com/massivecraft/mcore1/util/ClassLoadHack.java
+++ b/src/com/massivecraft/mcore2dev/util/ClassLoadHack.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.io.File;
 import java.lang.reflect.Method;
diff --git a/src/com/massivecraft/mcore1/util/DiscUtil.java b/src/com/massivecraft/mcore2dev/util/DiscUtil.java
similarity index 92%
rename from src/com/massivecraft/mcore1/util/DiscUtil.java
rename to src/com/massivecraft/mcore2dev/util/DiscUtil.java
index e0ac1575..09d7efdd 100644
--- a/src/com/massivecraft/mcore1/util/DiscUtil.java
+++ b/src/com/massivecraft/mcore2dev/util/DiscUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.io.*;
 import java.net.URL;
diff --git a/src/com/massivecraft/mcore1/util/LibLoader.java b/src/com/massivecraft/mcore2dev/util/LibLoader.java
similarity index 85%
rename from src/com/massivecraft/mcore1/util/LibLoader.java
rename to src/com/massivecraft/mcore2dev/util/LibLoader.java
index 73673211..02113a0e 100644
--- a/src/com/massivecraft/mcore1/util/LibLoader.java
+++ b/src/com/massivecraft/mcore2dev/util/LibLoader.java
@@ -1,8 +1,8 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.io.File;
 
-import com.massivecraft.mcore1.MPlugin;
+import com.massivecraft.mcore2dev.MPlugin;
 
 public class LibLoader
 {	
diff --git a/src/com/massivecraft/mcore1/util/Perm.java b/src/com/massivecraft/mcore2dev/util/Perm.java
similarity index 90%
rename from src/com/massivecraft/mcore1/util/Perm.java
rename to src/com/massivecraft/mcore2dev/util/Perm.java
index a5b1fa44..d039e5d4 100644
--- a/src/com/massivecraft/mcore1/util/Perm.java
+++ b/src/com/massivecraft/mcore2dev/util/Perm.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -7,7 +7,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 
-import com.massivecraft.mcore1.Lang;
+import com.massivecraft.mcore2dev.Lang;
 
 public class Perm
 {
diff --git a/src/com/massivecraft/mcore1/util/PlayerUtil.java b/src/com/massivecraft/mcore2dev/util/PlayerUtil.java
similarity index 91%
rename from src/com/massivecraft/mcore1/util/PlayerUtil.java
rename to src/com/massivecraft/mcore2dev/util/PlayerUtil.java
index 6aacadb7..bc7b8ed1 100644
--- a/src/com/massivecraft/mcore1/util/PlayerUtil.java
+++ b/src/com/massivecraft/mcore2dev/util/PlayerUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.io.File;
 import java.util.Set;
diff --git a/src/com/massivecraft/mcore1/util/SmokeUtil.java b/src/com/massivecraft/mcore2dev/util/SmokeUtil.java
similarity index 95%
rename from src/com/massivecraft/mcore1/util/SmokeUtil.java
rename to src/com/massivecraft/mcore2dev/util/SmokeUtil.java
index ce44bc6e..da8aae57 100644
--- a/src/com/massivecraft/mcore1/util/SmokeUtil.java
+++ b/src/com/massivecraft/mcore2dev/util/SmokeUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/com/massivecraft/mcore1/util/Txt.java b/src/com/massivecraft/mcore2dev/util/Txt.java
similarity index 96%
rename from src/com/massivecraft/mcore1/util/Txt.java
rename to src/com/massivecraft/mcore2dev/util/Txt.java
index a0a94c1d..dbb2f3ce 100644
--- a/src/com/massivecraft/mcore1/util/Txt.java
+++ b/src/com/massivecraft/mcore2dev/util/Txt.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore1.util;
+package com.massivecraft.mcore2dev.util;
 
 import java.util.*;
 import java.util.Map.Entry;