From 4ba21f9760bbbb5e1f97d782b33e45366b4ef67f Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Tue, 18 Dec 2018 14:20:24 +0100 Subject: [PATCH] Change away from MassiveCoreXlib --- pom.xml | 13 ++++---- src/com/massivecraft/massivecore/Aspect.java | 2 +- src/com/massivecraft/massivecore/Button.java | 2 +- .../massivecraft/massivecore/MassiveCore.java | 16 ++++----- .../massivecore/MassiveCoreMConf.java | 2 +- .../massivecore/MassivePlugin.java | 4 +-- .../massivecore/PriorityLines.java | 2 +- .../massivecore/SimpleConfig.java | 2 +- .../adapter/AdapterBackstringSet.java | 14 ++++---- .../adapter/AdapterBannerPatterns.java | 14 ++++---- .../adapter/AdapterEntityInternalMap.java | 9 ++++- .../massivecore/adapter/AdapterEntry.java | 16 ++++----- .../massivecore/adapter/AdapterInventory.java | 16 ++++----- .../massivecore/adapter/AdapterItemStack.java | 13 ++++---- .../adapter/AdapterJsonElement.java | 12 +++---- .../adapter/AdapterLowercaseEnum.java | 16 ++++----- .../adapter/AdapterMassiveList.java | 4 +-- .../adapter/AdapterMassiveMap.java | 4 +-- .../adapter/AdapterMassiveSet.java | 4 +-- .../adapter/AdapterMassiveTreeMap.java | 4 +-- .../adapter/AdapterMassiveTreeSet.java | 4 +-- .../massivecore/adapter/AdapterMassiveX.java | 16 ++++----- .../adapter/AdapterModdedEnumType.java | 16 ++++----- .../massivecore/adapter/AdapterMson.java | 12 +++---- .../massivecore/adapter/AdapterMsonEvent.java | 12 +++---- .../adapter/AdapterMsonEventFix.java | 12 +++---- .../adapter/AdapterPlayerInventory.java | 12 +++---- .../adapter/AdapterPolymorphic.java | 18 +++++----- .../massivecore/adapter/AdapterSound.java | 16 ++++----- .../massivecore/adapter/AdapterUUID.java | 14 ++++---- .../cmd/CmdMassiveCoreStoreCopydb.java | 2 +- .../command/type/RegistryType.java | 2 +- .../command/type/TypeAbstract.java | 2 -- .../engine/EngineMassiveCoreDatabase.java | 2 +- .../MigratorDataItemStack001StringId.java | 6 ++-- .../MigratorInventory001StringId.java | 5 ++- ...ePlayerCleanInactivityToleranceMillis.java | 1 - .../massivecore/fetcher/FetcherById.java | 1 - .../fetcher/FetcherByNameSingle.java | 1 - .../massivecore/item/DataFireworkEffect.java | 2 +- .../massivecore/item/DataItemStack.java | 2 +- .../massivecore/item/PotionUtil.java | 4 +-- .../massivecraft/massivecore/mson/Mson.java | 12 +++---- .../massivecore/mson/MsonEvent.java | 2 +- .../massivecraft/massivecore/mson/Test.java | 5 +-- .../massivecore/nms/NmsBoard17R4.java | 2 +- .../massivecore/nms/NmsChat112R1P.java | 2 -- .../massivecore/nms/NmsSkullMetaAbstract.java | 2 -- .../massivecore/predicate/PredicateAnd.java | 2 +- src/com/massivecraft/massivecore/ps/PS.java | 7 ++-- .../massivecore/ps/PSAdapter.java | 8 ++--- .../massivecraft/massivecore/store/Coll.java | 8 ++--- .../massivecore/store/CollAbstract.java | 2 +- .../massivecore/store/CollInterface.java | 2 +- .../massivecraft/massivecore/store/Db.java | 2 +- .../massivecore/store/DbAbstract.java | 2 +- .../massivecore/store/DbMongo.java | 2 +- .../massivecore/store/Driver.java | 2 +- .../massivecore/store/DriverFlatfile.java | 6 ++-- .../massivecore/store/DriverMongo.java | 33 +++++++++---------- .../massivecore/store/Entity.java | 3 +- .../massivecore/store/EntityInternal.java | 2 +- .../massivecore/store/GsonCloner.java | 10 +++--- .../massivecore/store/GsonEqualsChecker.java | 12 +++---- .../massivecore/store/GsonMongoConverter.java | 20 +++++------ .../massivecore/store/MStore.java | 2 +- .../store/ModificationPollerAbstract.java | 2 -- .../store/ModificationPollerLocal.java | 1 - .../massivecore/store/SenderEntity.java | 2 +- .../massivecore/store/accessor/Accessor.java | 1 - .../massivecore/store/migrator/Migrator.java | 3 +- .../store/migrator/MigratorFieldConvert.java | 9 ++--- .../store/migrator/MigratorFieldRename.java | 4 +-- .../store/migrator/MigratorRoot.java | 4 +-- .../store/migrator/MigratorUtil.java | 19 +++++------ .../massivecraft/massivecore/util/IdUtil.java | 3 +- .../massivecraft/massivecore/util/MUtil.java | 1 - .../massivecore/util/ReflectionUtil.java | 7 ++-- .../massivecore/util/SenderMap.java | 2 +- .../massivecraft/massivecore/util/Txt.java | 2 +- 80 files changed, 261 insertions(+), 280 deletions(-) diff --git a/pom.xml b/pom.xml index 628e1e05..4fe5d067 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,6 @@ - - - com.massivecraft.massivecore - MassiveCoreXlib - org.spigotmc @@ -36,6 +31,12 @@ net.milkbowl.vault Vault + + + org.mongodb + mongo-java-driver + 2.14.0 + @@ -98,5 +99,5 @@ - + diff --git a/src/com/massivecraft/massivecore/Aspect.java b/src/com/massivecraft/massivecore/Aspect.java index 5169eca4..20034234 100644 --- a/src/com/massivecraft/massivecore/Aspect.java +++ b/src/com/massivecraft/massivecore/Aspect.java @@ -1,7 +1,7 @@ package com.massivecraft.massivecore; +import com.google.gson.annotations.SerializedName; import com.massivecraft.massivecore.store.Entity; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/massivecore/Button.java b/src/com/massivecraft/massivecore/Button.java index 20bdaa29..3563f685 100644 --- a/src/com/massivecraft/massivecore/Button.java +++ b/src/com/massivecraft/massivecore/Button.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore; +import com.massivecraft.massivecore.cmd.CmdMassiveCore; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.cmd.CmdMassiveCore; import com.massivecraft.massivecore.command.requirement.Requirement; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/com/massivecraft/massivecore/MassiveCore.java b/src/com/massivecraft/massivecore/MassiveCore.java index bf73a16f..282f8f3b 100644 --- a/src/com/massivecraft/massivecore/MassiveCore.java +++ b/src/com/massivecraft/massivecore/MassiveCore.java @@ -1,9 +1,16 @@ package com.massivecraft.massivecore; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.adapter.AdapterBackstringSet; import com.massivecraft.massivecore.adapter.AdapterBannerPatterns; -import com.massivecraft.massivecore.adapter.AdapterEntry; import com.massivecraft.massivecore.adapter.AdapterEntityInternalMap; +import com.massivecraft.massivecore.adapter.AdapterEntry; import com.massivecraft.massivecore.adapter.AdapterInventory; import com.massivecraft.massivecore.adapter.AdapterItemStack; import com.massivecraft.massivecore.adapter.AdapterJsonElement; @@ -61,13 +68,6 @@ import com.massivecraft.massivecore.util.SmokeUtil; import com.massivecraft.massivecore.util.TimeDiffUtil; import com.massivecraft.massivecore.util.TimeUnit; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.GsonBuilder; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.inventory.Inventory; diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java index e4d8faac..b6fdd6d1 100644 --- a/src/com/massivecraft/massivecore/MassiveCoreMConf.java +++ b/src/com/massivecraft/massivecore/MassiveCoreMConf.java @@ -9,7 +9,7 @@ import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.PermissionUtil; import com.massivecraft.massivecore.util.TimeUnit; -import com.massivecraft.massivecore.xlib.mongodb.WriteConcern; +import com.mongodb.WriteConcern; import org.bukkit.permissions.Permissible; import java.util.ArrayList; diff --git a/src/com/massivecraft/massivecore/MassivePlugin.java b/src/com/massivecraft/massivecore/MassivePlugin.java index b0993745..ecd10c7d 100644 --- a/src/com/massivecraft/massivecore/MassivePlugin.java +++ b/src/com/massivecraft/massivecore/MassivePlugin.java @@ -1,5 +1,7 @@ package com.massivecraft.massivecore; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mixin.Mixin; @@ -12,8 +14,6 @@ import com.massivecraft.massivecore.store.migrator.MigratorRoot; import com.massivecraft.massivecore.test.Test; import com.massivecraft.massivecore.util.ReflectionUtil; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.GsonBuilder; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/com/massivecraft/massivecore/PriorityLines.java b/src/com/massivecraft/massivecore/PriorityLines.java index d6122248..26b9b564 100644 --- a/src/com/massivecraft/massivecore/PriorityLines.java +++ b/src/com/massivecraft/massivecore/PriorityLines.java @@ -4,8 +4,8 @@ import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.comparator.ComparatorIdentity; import com.massivecraft.massivecore.comparator.ComparatorPrioritized; import com.massivecraft.massivecore.mson.Mson; -import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.FlattenUtil; +import com.massivecraft.massivecore.util.MUtil; import java.util.Collection; import java.util.List; diff --git a/src/com/massivecraft/massivecore/SimpleConfig.java b/src/com/massivecraft/massivecore/SimpleConfig.java index b216fcfc..6b008963 100644 --- a/src/com/massivecraft/massivecore/SimpleConfig.java +++ b/src/com/massivecraft/massivecore/SimpleConfig.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore; +import com.google.gson.Gson; import com.massivecraft.massivecore.store.accessor.Accessor; import com.massivecraft.massivecore.util.DiscUtil; -import com.massivecraft.massivecore.xlib.gson.Gson; import org.bukkit.plugin.Plugin; import java.io.File; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java b/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java index 9322c4c5..df2040cb 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.command.type.RegistryType; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java b/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java index a8b042c1..e0a9b4c0 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; import com.massivecraft.massivecore.collections.MassiveListDef; import com.massivecraft.massivecore.item.DataBannerPattern; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; import java.lang.reflect.Type; import java.util.Iterator; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterEntityInternalMap.java b/src/com/massivecraft/massivecore/adapter/AdapterEntityInternalMap.java index 793d66fd..4ce9d208 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterEntityInternalMap.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterEntityInternalMap.java @@ -1,8 +1,15 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.store.EntityInternal; import com.massivecraft.massivecore.store.EntityInternalMap; -import com.massivecraft.massivecore.xlib.gson.*; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java b/src/com/massivecraft/massivecore/adapter/AdapterEntry.java index 8bfce37b..79074bc5 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterEntry.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterInventory.java b/src/com/massivecraft/massivecore/adapter/AdapterInventory.java index 8faa847e..df8ef673 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterInventory.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterInventory.java @@ -1,17 +1,17 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.item.DataItemStack; import com.massivecraft.massivecore.mixin.MixinInventory; import com.massivecraft.massivecore.store.migrator.MigratorUtil; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java b/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java index 2ab9b78a..442e5f63 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.item.DataItemStack; -import com.massivecraft.massivecore.store.migrator.MigratorUtil; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import org.bukkit.inventory.ItemStack; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java b/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java index c117aca8..ed1c7d3c 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java b/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java index 7624baeb..cef09cdb 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java index ea6b14e2..05904202 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveListDef; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.lang.reflect.Type; import java.util.Collection; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java index eabc1516..88f630ac 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveMapDef; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.lang.reflect.Type; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java index bb3a2237..30446b02 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.collections.MassiveSetDef; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.lang.reflect.Type; import java.util.Collection; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java index 2492e74c..2a525f4a 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.collections.MassiveTreeMap; import com.massivecraft.massivecore.collections.MassiveTreeMapDef; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.lang.reflect.Type; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java index 056b52ad..4debffd8 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.collections.MassiveTreeSet; import com.massivecraft.massivecore.collections.MassiveTreeSetDef; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.lang.reflect.Type; import java.util.Collection; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java index fa88dad8..d944374e 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.google.gson.internal.$Gson$Types; import com.massivecraft.massivecore.collections.Def; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; -import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java b/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java index 1be06649..48c2da06 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.TypeAdapter; -import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; -import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; -import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; -import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.annotations.SerializedName; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.HashMap; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMson.java b/src/com/massivecraft/massivecore/adapter/AdapterMson.java index 0d377c40..363224b4 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMson.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMson.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.mson.Mson; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java b/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java index 7bb52643..eb466ab3 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.mson.MsonEvent; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java b/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java index 9969be79..183774f2 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.adapter; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.mson.MsonEvent; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java b/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java index 3e8e47c4..1fa70859 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import org.bukkit.inventory.PlayerInventory; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java b/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java index e57c9a99..076f2ba6 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterSound.java b/src/com/massivecraft/massivecore/adapter/AdapterSound.java index 8d2c3e5e..865989ba 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterSound.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterSound.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import org.bukkit.Sound; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterUUID.java b/src/com/massivecraft/massivecore/adapter/AdapterUUID.java index 928aa6f0..e61f489d 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterUUID.java +++ b/src/com/massivecraft/massivecore/adapter/AdapterUUID.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.adapter; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonSerializer; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStoreCopydb.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStoreCopydb.java index 448adf25..fcc943b4 100755 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStoreCopydb.java +++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStoreCopydb.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.cmd; +import com.google.gson.JsonObject; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; @@ -7,7 +8,6 @@ import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.store.Db; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.MStore; -import com.massivecraft.massivecore.xlib.gson.JsonObject; import java.util.Collection; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/command/type/RegistryType.java b/src/com/massivecraft/massivecore/command/type/RegistryType.java index f82be697..894e1532 100644 --- a/src/com/massivecraft/massivecore/command/type/RegistryType.java +++ b/src/com/massivecraft/massivecore/command/type/RegistryType.java @@ -33,12 +33,12 @@ import com.massivecraft.massivecore.command.type.enumeration.TypeHorseVariant; import com.massivecraft.massivecore.command.type.enumeration.TypeLlamaColor; import com.massivecraft.massivecore.command.type.enumeration.TypeMaterial; import com.massivecraft.massivecore.command.type.enumeration.TypeOcelotType; +import com.massivecraft.massivecore.command.type.enumeration.TypeParrotVariant; import com.massivecraft.massivecore.command.type.enumeration.TypeParticleEffect; import com.massivecraft.massivecore.command.type.enumeration.TypeRabbitType; import com.massivecraft.massivecore.command.type.enumeration.TypeSkeletonType; import com.massivecraft.massivecore.command.type.enumeration.TypeSound; import com.massivecraft.massivecore.command.type.enumeration.TypeSpawnReason; -import com.massivecraft.massivecore.command.type.enumeration.TypeParrotVariant; import com.massivecraft.massivecore.command.type.enumeration.TypeVillagerProfession; import com.massivecraft.massivecore.command.type.enumeration.TypeWorldType; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanTrue; diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java index 1697f7b4..8411b7d4 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java @@ -5,7 +5,6 @@ import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.editor.CommandEditAbstract; import com.massivecraft.massivecore.command.editor.CommandEditProperties; @@ -29,7 +28,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.LinkedHashSet; import java.util.List; import java.util.ListIterator; import java.util.Set; diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java index 4262b955..ee6002e9 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.engine; +import com.google.gson.JsonObject; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.collections.MassiveMap; @@ -10,7 +11,6 @@ import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.store.SenderColl; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonObject; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/com/massivecraft/massivecore/entity/migrator/MigratorDataItemStack001StringId.java b/src/com/massivecraft/massivecore/entity/migrator/MigratorDataItemStack001StringId.java index 7b73b6df..13fce7ab 100644 --- a/src/com/massivecraft/massivecore/entity/migrator/MigratorDataItemStack001StringId.java +++ b/src/com/massivecraft/massivecore/entity/migrator/MigratorDataItemStack001StringId.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.entity.migrator; import com.google.common.collect.ImmutableMap; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.item.DataItemStack; import com.massivecraft.massivecore.store.migrator.MigratorRoot; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/entity/migrator/MigratorInventory001StringId.java b/src/com/massivecraft/massivecore/entity/migrator/MigratorInventory001StringId.java index 7789d6d1..87c9fccf 100644 --- a/src/com/massivecraft/massivecore/entity/migrator/MigratorInventory001StringId.java +++ b/src/com/massivecraft/massivecore/entity/migrator/MigratorInventory001StringId.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.entity.migrator; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.massivecraft.massivecore.adapter.AdapterInventory; import com.massivecraft.massivecore.item.DataItemStack; import com.massivecraft.massivecore.store.migrator.MigratorRoot; import com.massivecraft.massivecore.store.migrator.MigratorUtil; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; import org.apache.commons.lang.StringUtils; import org.bukkit.inventory.Inventory; diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerCleanInactivityToleranceMillis.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerCleanInactivityToleranceMillis.java index 5ca4311b..f6fed4e5 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerCleanInactivityToleranceMillis.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerCleanInactivityToleranceMillis.java @@ -5,7 +5,6 @@ import com.massivecraft.massivecore.store.SenderColl; import com.massivecraft.massivecore.store.SenderEntity; import org.bukkit.event.HandlerList; -import java.util.LinkedHashMap; import java.util.Map; public class EventMassiveCorePlayerCleanInactivityToleranceMillis extends EventMassiveCore diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherById.java b/src/com/massivecraft/massivecore/fetcher/FetcherById.java index 9f38527a..af077e97 100644 --- a/src/com/massivecraft/massivecore/fetcher/FetcherById.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherById.java @@ -1,7 +1,6 @@ package com.massivecraft.massivecore.fetcher; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java index 2344786e..ddaa8ec8 100644 --- a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java @@ -11,7 +11,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/src/com/massivecraft/massivecore/item/DataFireworkEffect.java b/src/com/massivecraft/massivecore/item/DataFireworkEffect.java index 21ab65f6..df8a84c2 100644 --- a/src/com/massivecraft/massivecore/item/DataFireworkEffect.java +++ b/src/com/massivecraft/massivecore/item/DataFireworkEffect.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.item; +import com.google.gson.annotations.SerializedName; import com.massivecraft.massivecore.collections.MassiveListDef; import com.massivecraft.massivecore.command.editor.annotation.EditorMethods; import com.massivecraft.massivecore.command.editor.annotation.EditorType; @@ -8,7 +9,6 @@ import com.massivecraft.massivecore.command.type.convert.TypeConverterColor; import com.massivecraft.massivecore.command.type.convert.TypeConverterFireworkEffectType; import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; import org.bukkit.FireworkEffect; import java.util.Collections; diff --git a/src/com/massivecraft/massivecore/item/DataItemStack.java b/src/com/massivecraft/massivecore/item/DataItemStack.java index ffcbb504..f01a1363 100644 --- a/src/com/massivecraft/massivecore/item/DataItemStack.java +++ b/src/com/massivecraft/massivecore/item/DataItemStack.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.item; +import com.google.gson.annotations.SerializedName; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveListDef; import com.massivecraft.massivecore.collections.MassiveMap; @@ -20,7 +21,6 @@ import com.massivecraft.massivecore.command.type.primitive.TypeStringParsed; import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.InventoryUtil; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/massivecore/item/PotionUtil.java b/src/com/massivecraft/massivecore/item/PotionUtil.java index 90c215bb..4f788c71 100644 --- a/src/com/massivecraft/massivecore/item/PotionUtil.java +++ b/src/com/massivecraft/massivecore/item/PotionUtil.java @@ -1,7 +1,7 @@ package com.massivecraft.massivecore.item; -import com.massivecraft.massivecore.xlib.guava.collect.BiMap; -import com.massivecraft.massivecore.xlib.guava.collect.ImmutableBiMap; +import com.google.common.collect.BiMap; +import com.google.common.collect.ImmutableBiMap; import org.bukkit.potion.Potion; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java index 9f534e29..d9c4b291 100644 --- a/src/com/massivecraft/massivecore/mson/Mson.java +++ b/src/com/massivecraft/massivecore/mson/Mson.java @@ -1,5 +1,11 @@ package com.massivecraft.massivecore.mson; +import com.google.common.collect.ImmutableList; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonPrimitive; import com.massivecraft.massivecore.adapter.AdapterLowercaseEnum; import com.massivecraft.massivecore.adapter.AdapterMsonEventFix; import com.massivecraft.massivecore.collections.MassiveList; @@ -8,12 +14,6 @@ import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.GsonBuilder; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; import org.apache.commons.lang.mutable.MutableInt; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/massivecore/mson/MsonEvent.java b/src/com/massivecraft/massivecore/mson/MsonEvent.java index 41c5851b..b01dc1ff 100644 --- a/src/com/massivecraft/massivecore/mson/MsonEvent.java +++ b/src/com/massivecraft/massivecore/mson/MsonEvent.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.mson; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.nms.NmsItemStackTooltip; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; diff --git a/src/com/massivecraft/massivecore/mson/Test.java b/src/com/massivecraft/massivecore/mson/Test.java index 6333df83..8a615d60 100644 --- a/src/com/massivecraft/massivecore/mson/Test.java +++ b/src/com/massivecraft/massivecore/mson/Test.java @@ -6,10 +6,7 @@ import com.massivecraft.massivecore.util.Txt; import java.util.List; import static com.massivecraft.massivecore.mson.Mson.mson; -import static org.bukkit.ChatColor.BLUE; -import static org.bukkit.ChatColor.GREEN; -import static org.bukkit.ChatColor.RED; -import static org.bukkit.ChatColor.YELLOW; +import static org.bukkit.ChatColor.*; public class Test { diff --git a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java index 2907b453..00c0a722 100644 --- a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java +++ b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.nms; +import com.google.common.collect.ImmutableSet; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; -import com.massivecraft.massivecore.xlib.guava.collect.ImmutableSet; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; diff --git a/src/com/massivecraft/massivecore/nms/NmsChat112R1P.java b/src/com/massivecraft/massivecore/nms/NmsChat112R1P.java index 3aa3c5f2..42edfd7a 100644 --- a/src/com/massivecraft/massivecore/nms/NmsChat112R1P.java +++ b/src/com/massivecraft/massivecore/nms/NmsChat112R1P.java @@ -1,9 +1,7 @@ package com.massivecraft.massivecore.nms; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; -import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.ReflectionUtil; -import org.bukkit.entity.Player; public class NmsChat112R1P extends NmsChatAbstract { diff --git a/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java b/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java index 6d49b0e8..ec698aa3 100644 --- a/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java +++ b/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java @@ -1,9 +1,7 @@ package com.massivecraft.massivecore.nms; -import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; -import com.massivecraft.massivecore.util.Txt; import org.bukkit.inventory.meta.SkullMeta; import java.lang.reflect.Constructor; diff --git a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java index 9c12ef69..4f71d7fc 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.predicate; -import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; diff --git a/src/com/massivecraft/massivecore/ps/PS.java b/src/com/massivecraft/massivecore/ps/PS.java index a5d78300..429984a0 100644 --- a/src/com/massivecraft/massivecore/ps/PS.java +++ b/src/com/massivecraft/massivecore/ps/PS.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.ps; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.annotations.SerializedName; import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; @@ -19,7 +19,6 @@ import org.bukkit.util.Vector; import java.io.Serializable; import java.util.Collection; -import java.util.LinkedHashSet; import java.util.Map.Entry; import java.util.Objects; import java.util.Set; diff --git a/src/com/massivecraft/massivecore/ps/PSAdapter.java b/src/com/massivecraft/massivecore/ps/PSAdapter.java index a4bf85f4..66e9ba1d 100644 --- a/src/com/massivecraft/massivecore/ps/PSAdapter.java +++ b/src/com/massivecraft/massivecore/ps/PSAdapter.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.ps; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; -import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; import java.lang.reflect.Type; diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index f8760f63..1b9c9a9c 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.store; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; import com.massivecraft.massivecore.ConfServer; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveCoreMConf; @@ -10,10 +14,6 @@ import com.massivecraft.massivecore.mixin.MixinModification; import com.massivecraft.massivecore.store.migrator.MigratorUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/com/massivecraft/massivecore/store/CollAbstract.java b/src/com/massivecraft/massivecore/store/CollAbstract.java index 2b08660f..391d02c5 100644 --- a/src/com/massivecraft/massivecore/store/CollAbstract.java +++ b/src/com/massivecraft/massivecore/store/CollAbstract.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.google.gson.JsonObject; import java.util.Map; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java index 6e2d6915..5ac5cf47 100644 --- a/src/com/massivecraft/massivecore/store/CollInterface.java +++ b/src/com/massivecraft/massivecore/store/CollInterface.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.store; +import com.google.gson.JsonObject; import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.Named; -import com.massivecraft.massivecore.xlib.gson.JsonObject; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/store/Db.java b/src/com/massivecraft/massivecore/store/Db.java index 1c87f089..267fd8cc 100644 --- a/src/com/massivecraft/massivecore/store/Db.java +++ b/src/com/massivecraft/massivecore/store/Db.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.google.gson.JsonObject; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/store/DbAbstract.java b/src/com/massivecraft/massivecore/store/DbAbstract.java index 43e05644..dc20f065 100644 --- a/src/com/massivecraft/massivecore/store/DbAbstract.java +++ b/src/com/massivecraft/massivecore/store/DbAbstract.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.google.gson.JsonObject; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/store/DbMongo.java b/src/com/massivecraft/massivecore/store/DbMongo.java index 03f774af..43ec2c0a 100644 --- a/src/com/massivecraft/massivecore/store/DbMongo.java +++ b/src/com/massivecraft/massivecore/store/DbMongo.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.mongodb.DB; +import com.mongodb.DB; public class DbMongo extends DbAbstract { diff --git a/src/com/massivecraft/massivecore/store/Driver.java b/src/com/massivecraft/massivecore/store/Driver.java index 6a61ffd4..c6e6e994 100644 --- a/src/com/massivecraft/massivecore/store/Driver.java +++ b/src/com/massivecraft/massivecore/store/Driver.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.google.gson.JsonObject; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/massivecore/store/DriverFlatfile.java b/src/com/massivecraft/massivecore/store/DriverFlatfile.java index 12499212..959da459 100644 --- a/src/com/massivecraft/massivecore/store/DriverFlatfile.java +++ b/src/com/massivecraft/massivecore/store/DriverFlatfile.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.store; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.util.DiscUtil; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParser; import java.io.File; import java.io.IOException; @@ -14,8 +14,6 @@ import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/DriverMongo.java b/src/com/massivecraft/massivecore/store/DriverMongo.java index abccb0b0..fdbdab70 100644 --- a/src/com/massivecraft/massivecore/store/DriverMongo.java +++ b/src/com/massivecraft/massivecore/store/DriverMongo.java @@ -1,23 +1,22 @@ package com.massivecraft.massivecore.store; + +import com.google.gson.JsonObject; import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; -import com.massivecraft.massivecore.xlib.mongodb.DB; -import com.massivecraft.massivecore.xlib.mongodb.DBCollection; -import com.massivecraft.massivecore.xlib.mongodb.DBCursor; -import com.massivecraft.massivecore.xlib.mongodb.MongoClient; -import com.massivecraft.massivecore.xlib.mongodb.MongoClientURI; +import com.mongodb.BasicDBObject; +import com.mongodb.DB; +import com.mongodb.DBCollection; +import com.mongodb.DBCursor; +import com.mongodb.MongoClient; +import com.mongodb.MongoClientURI; -import java.util.AbstractMap.SimpleEntry; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; public class DriverMongo extends DriverAbstract @@ -173,16 +172,16 @@ public class DriverMongo extends DriverAbstract } @Override - public Entry load(Coll coll, String id) + public Map.Entry load(Coll coll, String id) { DBCollection dbcoll = fixColl(coll); BasicDBObject raw = (BasicDBObject)dbcoll.findOne(new BasicDBObject(ID_FIELD, id)); return loadRaw(raw); } - public Entry loadRaw(BasicDBObject raw) + public Map.Entry loadRaw(BasicDBObject raw) { - if (raw == null) return new SimpleEntry<>(null, 0L); + if (raw == null) return new AbstractMap.SimpleEntry<>(null, 0L); // Throw away the id field raw.removeField(ID_FIELD); @@ -200,14 +199,14 @@ public class DriverMongo extends DriverAbstract // Convert MongoDB --> GSON JsonObject element = GsonMongoConverter.mongo2GsonObject(raw); - return new SimpleEntry<>(element, mtime); + return new AbstractMap.SimpleEntry<>(element, mtime); } @Override - public Map> loadAll(Coll coll) + public Map> loadAll(Coll coll) { // Declare Ret - Map> ret = null; + Map> ret = null; // Fix Coll DBCollection dbcoll = fixColl(coll); @@ -231,7 +230,7 @@ public class DriverMongo extends DriverAbstract String id = rawId.toString(); // Get Entry - Entry entry = loadRaw(raw); + Map.Entry entry = loadRaw(raw); // NOTE: The entry can be a failed one with null and 0. // NOTE: We add it anyways since it's an informative failure. // NOTE: This is supported by our defined specification. diff --git a/src/com/massivecraft/massivecore/store/Entity.java b/src/com/massivecraft/massivecore/store/Entity.java index f42c05f3..f990e5b3 100644 --- a/src/com/massivecraft/massivecore/store/Entity.java +++ b/src/com/massivecraft/massivecore/store/Entity.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.ConfServer; +import com.google.gson.JsonObject; import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonObject; import java.util.List; diff --git a/src/com/massivecraft/massivecore/store/EntityInternal.java b/src/com/massivecraft/massivecore/store/EntityInternal.java index f173f820..fba0a7d9 100644 --- a/src/com/massivecraft/massivecore/store/EntityInternal.java +++ b/src/com/massivecraft/massivecore/store/EntityInternal.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.store; +import com.google.gson.Gson; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.store.accessor.Accessor; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.Gson; import java.lang.ref.WeakReference; import java.util.Objects; diff --git a/src/com/massivecraft/massivecore/store/GsonCloner.java b/src/com/massivecraft/massivecore/store/GsonCloner.java index ca642ae3..a3457af4 100644 --- a/src/com/massivecraft/massivecore/store/GsonCloner.java +++ b/src/com/massivecraft/massivecore/store/GsonCloner.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import java.util.Iterator; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java index 14d4d474..a7363441 100644 --- a/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java +++ b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.store; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import com.google.gson.internal.LazilyParsedNumber; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; import org.apache.commons.lang.StringUtils; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/GsonMongoConverter.java b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java index 1b127934..79d796b3 100644 --- a/src/com/massivecraft/massivecore/store/GsonMongoConverter.java +++ b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java @@ -1,16 +1,16 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.xlib.bson.types.ObjectId; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; -import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; -import com.massivecraft.massivecore.xlib.mongodb.BasicDBList; -import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; -import com.massivecraft.massivecore.xlib.mongodb.DBObject; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import com.google.gson.internal.LazilyParsedNumber; +import com.mongodb.BasicDBList; +import com.mongodb.BasicDBObject; +import com.mongodb.DBObject; import org.apache.commons.lang.StringUtils; +import org.bson.types.ObjectId; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/MStore.java b/src/com/massivecraft/massivecore/store/MStore.java index 41c6af7e..ac2a0395 100644 --- a/src/com/massivecraft/massivecore/store/MStore.java +++ b/src/com/massivecraft/massivecore/store/MStore.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.store; +import com.google.gson.JsonElement; import com.massivecraft.massivecore.ConfServer; import com.massivecraft.massivecore.MassiveCoreMConf; -import com.massivecraft.massivecore.xlib.gson.JsonElement; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/com/massivecraft/massivecore/store/ModificationPollerAbstract.java b/src/com/massivecraft/massivecore/store/ModificationPollerAbstract.java index dd037fbf..116d5efd 100644 --- a/src/com/massivecraft/massivecore/store/ModificationPollerAbstract.java +++ b/src/com/massivecraft/massivecore/store/ModificationPollerAbstract.java @@ -1,7 +1,5 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.ConfServer; - public abstract class ModificationPollerAbstract extends Thread { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java b/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java index 152e0313..35a58a61 100644 --- a/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java +++ b/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java @@ -1,6 +1,5 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.ConfServer; import com.massivecraft.massivecore.MassiveCoreMConf; /* diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index e6eb19b4..43249a5e 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.store; +import com.google.common.base.Objects; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.PlayerState; import com.massivecraft.massivecore.event.EventMassiveCoreAknowledge; @@ -12,7 +13,6 @@ import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.store.cleanable.Cleanable; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.PermissionUtil; -import com.massivecraft.massivecore.xlib.guava.base.Objects; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/com/massivecraft/massivecore/store/accessor/Accessor.java b/src/com/massivecraft/massivecore/store/accessor/Accessor.java index 530dab22..f979ce31 100644 --- a/src/com/massivecraft/massivecore/store/accessor/Accessor.java +++ b/src/com/massivecraft/massivecore/store/accessor/Accessor.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/store/migrator/Migrator.java b/src/com/massivecraft/massivecore/store/migrator/Migrator.java index 1b087696..110167a0 100644 --- a/src/com/massivecraft/massivecore/store/migrator/Migrator.java +++ b/src/com/massivecraft/massivecore/store/migrator/Migrator.java @@ -1,6 +1,7 @@ package com.massivecraft.massivecore.store.migrator; -import com.massivecraft.massivecore.xlib.gson.JsonObject; + +import com.google.gson.JsonObject; public interface Migrator { diff --git a/src/com/massivecraft/massivecore/store/migrator/MigratorFieldConvert.java b/src/com/massivecraft/massivecore/store/migrator/MigratorFieldConvert.java index a33ff61c..e5ef42ba 100644 --- a/src/com/massivecraft/massivecore/store/migrator/MigratorFieldConvert.java +++ b/src/com/massivecraft/massivecore/store/migrator/MigratorFieldConvert.java @@ -1,9 +1,10 @@ package com.massivecraft.massivecore.store.migrator; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonNull; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; + +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; public abstract class MigratorFieldConvert implements Migrator { diff --git a/src/com/massivecraft/massivecore/store/migrator/MigratorFieldRename.java b/src/com/massivecraft/massivecore/store/migrator/MigratorFieldRename.java index e377ee73..7afaa484 100644 --- a/src/com/massivecraft/massivecore/store/migrator/MigratorFieldRename.java +++ b/src/com/massivecraft/massivecore/store/migrator/MigratorFieldRename.java @@ -1,7 +1,7 @@ package com.massivecraft.massivecore.store.migrator; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; public class MigratorFieldRename implements Migrator { diff --git a/src/com/massivecraft/massivecore/store/migrator/MigratorRoot.java b/src/com/massivecraft/massivecore/store/migrator/MigratorRoot.java index 61b46fbc..95cfea68 100644 --- a/src/com/massivecraft/massivecore/store/migrator/MigratorRoot.java +++ b/src/com/massivecraft/massivecore/store/migrator/MigratorRoot.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.store.migrator; + +import com.google.gson.JsonObject; import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.JsonObject; import java.util.List; import java.util.regex.Matcher; diff --git a/src/com/massivecraft/massivecore/store/migrator/MigratorUtil.java b/src/com/massivecraft/massivecore/store/migrator/MigratorUtil.java index da71d4cc..47fde583 100644 --- a/src/com/massivecraft/massivecore/store/migrator/MigratorUtil.java +++ b/src/com/massivecraft/massivecore/store/migrator/MigratorUtil.java @@ -1,17 +1,15 @@ package com.massivecraft.massivecore.store.migrator; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.annotations.SerializedName; +import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.store.EntityInternalMap; import com.massivecraft.massivecore.util.ReflectionUtil; import com.massivecraft.massivecore.util.Txt; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; -import org.bukkit.inventory.Inventory; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -21,7 +19,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; public class MigratorUtil { @@ -211,7 +208,7 @@ public class MigratorUtil } // Entries are also serialised as list - if (Entry.class.isAssignableFrom(clazz)) + if (Map.Entry.class.isAssignableFrom(clazz)) { return migrateEntry(getParameterizedType(jsonType), array); } @@ -227,7 +224,7 @@ public class MigratorUtil Type valueType = parameterizedType.getActualTypeArguments()[1]; boolean migrated = false; - for (Entry entry : map.entrySet()) + for (Map.Entry entry : map.entrySet()) { migrated = migrate(valueType, entry.getValue()) | migrated; } @@ -341,7 +338,7 @@ public class MigratorUtil if (Map.class.isAssignableFrom(entityClass)) return false; boolean migrated = false; - for (Entry entry : object.entrySet()) + for (Map.Entry entry : object.entrySet()) { String name = entry.getKey(); JsonElement element = entry.getValue(); diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java index d7b461e4..0d886bed 100644 --- a/src/com/massivecraft/massivecore/util/IdUtil.java +++ b/src/com/massivecraft/massivecore/util/IdUtil.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.util; +import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; @@ -10,7 +11,6 @@ import com.massivecraft.massivecore.event.EventMassiveCoreSenderUnregister; import com.massivecraft.massivecore.mixin.MixinActual; import com.massivecraft.massivecore.mixin.MixinPlayed; import com.massivecraft.massivecore.store.SenderEntity; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; @@ -27,7 +27,6 @@ import java.io.File; import java.lang.reflect.Type; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java index d6a471e4..349651f8 100644 --- a/src/com/massivecraft/massivecore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -71,7 +71,6 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/src/com/massivecraft/massivecore/util/ReflectionUtil.java b/src/com/massivecraft/massivecore/util/ReflectionUtil.java index 89c1eb9d..25b9f804 100644 --- a/src/com/massivecraft/massivecore/util/ReflectionUtil.java +++ b/src/com/massivecraft/massivecore/util/ReflectionUtil.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.util; +import com.google.common.reflect.ClassPath; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.comparator.ComparatorNaturalOrder; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.PredicateAnd; -import com.massivecraft.massivecore.xlib.guava.reflect.ClassPath; -import com.massivecraft.massivecore.xlib.guava.reflect.ClassPath.ClassInfo; import org.bukkit.Bukkit; import java.io.IOException; @@ -463,9 +462,9 @@ public class ReflectionUtil ClassPath classPath = ClassPath.from(classLoader); Predicate> predicateCombined = PredicateAnd.get(predicates); - Collection classInfos = recursive ? classPath.getTopLevelClassesRecursive(packageName) : classPath.getTopLevelClasses(packageName); + Collection classInfos = recursive ? classPath.getTopLevelClassesRecursive(packageName) : classPath.getTopLevelClasses(packageName); - for (ClassInfo classInfo : classInfos) + for (ClassPath.ClassInfo classInfo : classInfos) { // Get name of class String className = classInfo.getName(); diff --git a/src/com/massivecraft/massivecore/util/SenderMap.java b/src/com/massivecraft/massivecore/util/SenderMap.java index 1912d663..9fe3a208 100644 --- a/src/com/massivecraft/massivecore/util/SenderMap.java +++ b/src/com/massivecraft/massivecore/util/SenderMap.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.util; +import com.google.common.collect.ImmutableList; import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; -import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; import java.util.Collections; import java.util.EnumMap; diff --git a/src/com/massivecraft/massivecore/util/Txt.java b/src/com/massivecraft/massivecore/util/Txt.java index 7ef5fd9e..aa26a51d 100644 --- a/src/com/massivecraft/massivecore/util/Txt.java +++ b/src/com/massivecraft/massivecore/util/Txt.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.util; +import com.massivecraft.massivecore.cmd.CmdMassiveCore; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.cmd.CmdMassiveCore; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.mson.MsonEvent; import com.massivecraft.massivecore.predicate.Predicate;