Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change away from MassiveCoreXlib

Browse Source
This commit is contained in:
Magnus Ulf 2018-12-18 14:20:24 +01:00
parent d80749a043
commit 4ba21f9760
80 changed files with 261 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@ -21,11 +21,6 @@
<!-- Dependencies -->
<dependencies>
<!-- MassiveCoreXlib -->
<dependency>
<groupId>com.massivecraft.massivecore</groupId>
<artifactId>MassiveCoreXlib</artifactId>
</dependency>
<!-- Spigot -->
<dependency>
<groupId>org.spigotmc</groupId>
@ -36,6 +31,12 @@
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
</dependency>
<!-- MongoDB -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>2.14.0</version>
</dependency>
</dependencies>
<!-- Build -->

2
src/com/massivecraft/massivecore/Aspect.java
View File

@ -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;

2
src/com/massivecraft/massivecore/Button.java
View File

@ -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;

16
src/com/massivecraft/massivecore/MassiveCore.java
View File

@ -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;

2
src/com/massivecraft/massivecore/MassiveCoreMConf.java
View File

@ -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;

4
src/com/massivecraft/massivecore/MassivePlugin.java
View File

@ -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;

2
src/com/massivecraft/massivecore/PriorityLines.java
View File

@ -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;

2
src/com/massivecraft/massivecore/SimpleConfig.java
View File

@ -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;

14
src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java
View File

@ -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;

14
src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java
View File

@ -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;

9
src/com/massivecraft/massivecore/adapter/AdapterEntityInternalMap.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterEntry.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterInventory.java
View File

@ -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;

13
src/com/massivecraft/massivecore/adapter/AdapterItemStack.java
View File

@ -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;

12
src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java
View File

@ -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;

4
src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java
View File

@ -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;

4
src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java
View File

@ -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;

4
src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java
View File

@ -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;

4
src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java
View File

@ -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;

4
src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java
View File

@ -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;

12
src/com/massivecraft/massivecore/adapter/AdapterMson.java
View File

@ -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;

12
src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java
View File

@ -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;

12
src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java
View File

@ -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;

12
src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java
View File

@ -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;

18
src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java
View File

@ -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;

16
src/com/massivecraft/massivecore/adapter/AdapterSound.java
View File

@ -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;

14
src/com/massivecraft/massivecore/adapter/AdapterUUID.java
View File

@ -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;

2
src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStoreCopydb.java
View File

@ -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;

2
src/com/massivecraft/massivecore/command/type/RegistryType.java
View File

@ -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;

2
src/com/massivecraft/massivecore/command/type/TypeAbstract.java
View File

@ -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;

2
src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java
View File

@ -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;

6
src/com/massivecraft/massivecore/entity/migrator/MigratorDataItemStack001StringId.java
View File

@ -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;

5
src/com/massivecraft/massivecore/entity/migrator/MigratorInventory001StringId.java
View File

@ -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;

1
src/com/massivecraft/massivecore/event/EventMassiveCorePlayerCleanInactivityToleranceMillis.java
View File

@ -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

1
src/com/massivecraft/massivecore/fetcher/FetcherById.java
View File

@ -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;

1
src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java
View File

@ -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;

2
src/com/massivecraft/massivecore/item/DataFireworkEffect.java
View File

@ -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;

2
src/com/massivecraft/massivecore/item/DataItemStack.java
View File

@ -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;

4
src/com/massivecraft/massivecore/item/PotionUtil.java
View File

@ -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;

12
src/com/massivecraft/massivecore/mson/Mson.java
View File

@ -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;

2
src/com/massivecraft/massivecore/mson/MsonEvent.java
View File

@ -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;

5
src/com/massivecraft/massivecore/mson/Test.java
View File

@ -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
{

2
src/com/massivecraft/massivecore/nms/NmsBoard17R4.java
View File

@ -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;

2
src/com/massivecraft/massivecore/nms/NmsChat112R1P.java
View File

@ -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
{

2
src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java
View File

@ -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;

2
src/com/massivecraft/massivecore/predicate/PredicateAnd.java
View File

@ -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;

7
src/com/massivecraft/massivecore/ps/PS.java
View File

@ -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;

8
src/com/massivecraft/massivecore/ps/PSAdapter.java
View File

@ -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;

8
src/com/massivecraft/massivecore/store/Coll.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/CollAbstract.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/CollInterface.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/Db.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/DbAbstract.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/DbMongo.java
View File

@ -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
{

2
src/com/massivecraft/massivecore/store/Driver.java
View File

@ -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;

6
src/com/massivecraft/massivecore/store/DriverFlatfile.java
View File

@ -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;

33
src/com/massivecraft/massivecore/store/DriverMongo.java
View File

@ -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<JsonObject, Long> load(Coll<?> coll, String id)
public Map.Entry<JsonObject, Long> load(Coll<?> coll, String id)
{
DBCollection dbcoll = fixColl(coll);
BasicDBObject raw = (BasicDBObject)dbcoll.findOne(new BasicDBObject(ID_FIELD, id));
return loadRaw(raw);
}
public Entry<JsonObject, Long> loadRaw(BasicDBObject raw)
public Map.Entry<JsonObject, Long> 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<String, Entry<JsonObject, Long>> loadAll(Coll<?> coll)
public Map<String, Map.Entry<JsonObject, Long>> loadAll(Coll<?> coll)
{
// Declare Ret
Map<String, Entry<JsonObject, Long>> ret = null;
Map<String, Map.Entry<JsonObject, Long>> ret = null;
// Fix Coll
DBCollection dbcoll = fixColl(coll);
@ -231,7 +230,7 @@ public class DriverMongo extends DriverAbstract
String id = rawId.toString();
// Get Entry
Entry<JsonObject, Long> entry = loadRaw(raw);
Map.Entry<JsonObject, Long> 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.

3
src/com/massivecraft/massivecore/store/Entity.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/EntityInternal.java
View File

@ -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;

10
src/com/massivecraft/massivecore/store/GsonCloner.java
View File

@ -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;

12
src/com/massivecraft/massivecore/store/GsonEqualsChecker.java
View File

@ -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;

20
src/com/massivecraft/massivecore/store/GsonMongoConverter.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/MStore.java
View File

@ -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;

2
src/com/massivecraft/massivecore/store/ModificationPollerAbstract.java
View File

@ -1,7 +1,5 @@
package com.massivecraft.massivecore.store;
import com.massivecraft.massivecore.ConfServer;
public abstract class ModificationPollerAbstract extends Thread
{
// -------------------------------------------- //

1
src/com/massivecraft/massivecore/store/ModificationPollerLocal.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.massivecore.store;
import com.massivecraft.massivecore.ConfServer;
import com.massivecraft.massivecore.MassiveCoreMConf;
/*

2
src/com/massivecraft/massivecore/store/SenderEntity.java
View File

@ -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;

1
src/com/massivecraft/massivecore/store/accessor/Accessor.java
View File

@ -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;

3
src/com/massivecraft/massivecore/store/migrator/Migrator.java
View File

@ -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
{

9
src/com/massivecraft/massivecore/store/migrator/MigratorFieldConvert.java
View File

@ -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
{

4
src/com/massivecraft/massivecore/store/migrator/MigratorFieldRename.java
View File

@ -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
{

4
src/com/massivecraft/massivecore/store/migrator/MigratorRoot.java
View File

@ -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;

19
src/com/massivecraft/massivecore/store/migrator/MigratorUtil.java
View File

@ -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<String, JsonElement> entry : map.entrySet())
for (Map.Entry<String, JsonElement> 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<String, JsonElement> entry : object.entrySet())
for (Map.Entry<String, JsonElement> entry : object.entrySet())
{
String name = entry.getKey();
JsonElement element = entry.getValue();

3
src/com/massivecraft/massivecore/util/IdUtil.java
View File

@ -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;

1
src/com/massivecraft/massivecore/util/MUtil.java
View File

@ -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;

7
src/com/massivecraft/massivecore/util/ReflectionUtil.java
View File

@ -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<Class<?>> predicateCombined = PredicateAnd.get(predicates);
Collection<ClassInfo> classInfos = recursive ? classPath.getTopLevelClassesRecursive(packageName) : classPath.getTopLevelClasses(packageName);
Collection<ClassPath.ClassInfo> 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();

2
src/com/massivecraft/massivecore/util/SenderMap.java
View File

@ -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;

2
src/com/massivecraft/massivecore/util/Txt.java
View File

@ -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;