Untangle from MassiveCoreXlib

pom.xml

@@ -19,6 +19,13 @@
     <description>${massiveColorInfo}${project.name} allows the players to team up and claim land as their own and start wars with other factions. This way we hope to inspire politics, intrigue, and team spirit. ${massiveDescriptionSuffix}</description>
     <url>${massiveBaseUrl}/factions</url>
 
+    <repositories>
+      <repository>
+        <id>sk89q-repo</id>
+        <url>http://maven.sk89q.com/repo/</url>
+      </repository>
+    </repositories>
+
     <!-- Dependencies -->
     <dependencies>
         <!-- Spigot -->

src/com/massivecraft/factions/Factions.java

@@ -1,5 +1,6 @@
 package com.massivecraft.factions;
 
+import com.google.gson.GsonBuilder;
 import com.massivecraft.factions.adapter.BoardAdapter;
 import com.massivecraft.factions.adapter.BoardMapAdapter;
 import com.massivecraft.factions.adapter.RelAdapter;
@@ -22,7 +23,6 @@ import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.type.RegistryType;
 import com.massivecraft.massivecore.store.migrator.MigratorUtil;
 import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
 import org.bukkit.ChatColor;
 
 import java.util.List;

src/com/massivecraft/factions/adapter/BoardAdapter.java

@@ -1,14 +1,14 @@
 package com.massivecraft.factions.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.factions.TerritoryAccess;
 import com.massivecraft.factions.entity.Board;
 import com.massivecraft.massivecore.ps.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.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Map;

src/com/massivecraft/factions/adapter/BoardMapAdapter.java

@@ -1,14 +1,14 @@
 package com.massivecraft.factions.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.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.massivecore.ps.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.JsonObject;
-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;
 import java.util.Map;

src/com/massivecraft/factions/adapter/RelAdapter.java

@@ -1,12 +1,13 @@
 package com.massivecraft.factions.adapter;
 
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.cmd.type.TypeRel;
 import com.massivecraft.massivecore.MassiveException;
-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 java.lang.reflect.Type;
 

src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java

@@ -1,15 +1,16 @@
 package com.massivecraft.factions.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.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.TerritoryAccess;
-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 com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.Set;

src/com/massivecraft/factions/entity/Board.java

@@ -1,12 +1,12 @@
 package com.massivecraft.factions.entity;
 
+import com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.massivecraft.massivecore.collections.MassiveSet;
 import com.massivecraft.massivecore.ps.PS;
 import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.Collections;

src/com/massivecraft/factions/entity/Faction.java

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.entity;
 
+
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FactionsIndex;
 import com.massivecraft.factions.FactionsParticipator;
@@ -36,7 +37,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 public class Faction extends Entity<Faction> implements FactionsParticipator
@@ -577,11 +577,11 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 		}
 		
 		// ... and if anything is explicitly set we use that info ...
-		Iterator<Entry<String, Boolean>> iter = this.flags.entrySet().iterator();
+		Iterator<Map.Entry<String, Boolean>> iter = this.flags.entrySet().iterator();
 		while (iter.hasNext())
 		{
 			// ... for each entry ...
-			Entry<String, Boolean> entry = iter.next();
+			Map.Entry<String, Boolean> entry = iter.next();
 			
 			// ... extract id and remove null values ...
 			String id = entry.getKey();					
@@ -605,7 +605,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 	public void setFlags(Map<MFlag, Boolean> flags)
 	{
 		Map<String, Boolean> flagIds = new MassiveMap<>();
-		for (Entry<MFlag, Boolean> entry : flags.entrySet())
+		for (Map.Entry<MFlag, Boolean> entry : flags.entrySet())
 		{
 			flagIds.put(entry.getKey().getId(), entry.getValue());
 		}
@@ -616,7 +616,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 	{
 		// Clean input
 		MassiveMapDef<String, Boolean> target = new MassiveMapDef<>();
-		for (Entry<String, Boolean> entry : flagIds.entrySet())
+		for (Map.Entry<String, Boolean> entry : flagIds.entrySet())
 		{
 			String key = entry.getKey();
 			if (key == null) continue;
@@ -703,11 +703,11 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 		}
 		
 		// ... and if anything is explicitly set we use that info ...
-		Iterator<Entry<String, Set<Rel>>> iter = this.perms.entrySet().iterator();
+		Iterator<Map.Entry<String, Set<Rel>>> iter = this.perms.entrySet().iterator();
 		while (iter.hasNext())
 		{
 			// ... for each entry ...
-			Entry<String, Set<Rel>> entry = iter.next();
+			Map.Entry<String, Set<Rel>> entry = iter.next();
 			
 			// ... extract id and remove null values ...
 			String id = entry.getKey();					
@@ -730,7 +730,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 	public void setPerms(Map<MPerm, Set<Rel>> perms)
 	{
 		Map<String, Set<Rel>> permIds = new MassiveMap<>();
-		for (Entry<MPerm, Set<Rel>> entry : perms.entrySet())
+		for (Map.Entry<MPerm, Set<Rel>> entry : perms.entrySet())
 		{
 			permIds.put(entry.getKey().getId(), entry.getValue());
 		}
@@ -741,7 +741,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
 	{
 		// Clean input
 		MassiveMapDef<String, Set<Rel>> target = new MassiveMapDef<>();
-		for (Entry<String, Set<Rel>> entry : perms.entrySet())
+		for (Map.Entry<String, Set<Rel>> entry : perms.entrySet())
 		{
 			String key = entry.getKey();
 			if (key == null) continue;

src/com/massivecraft/factions/entity/MPlayer.java

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.entity;
 
+import com.google.gson.annotations.SerializedName;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FactionsIndex;
 import com.massivecraft.factions.FactionsParticipator;
@@ -17,13 +18,10 @@ import com.massivecraft.massivecore.mixin.MixinSenderPs;
 import com.massivecraft.massivecore.mixin.MixinTitle;
 import com.massivecraft.massivecore.ps.PS;
 import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
-import com.massivecraft.massivecore.store.Coll;
-import com.massivecraft.massivecore.store.Modification;
 import com.massivecraft.massivecore.store.SenderEntity;
 import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
-import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -32,7 +30,6 @@ import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 

src/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java

@@ -1,11 +1,11 @@
 package com.massivecraft.factions.entity.migrator;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.massivecore.store.migrator.MigratorFieldConvert;
 import com.massivecraft.massivecore.store.migrator.MigratorFieldRename;
 import com.massivecraft.massivecore.store.migrator.MigratorRoot;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonObject;
 
 public class MigratorFaction001Invitations extends MigratorRoot
 {

src/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java

@@ -1,12 +1,12 @@
 package com.massivecraft.factions.entity.migrator;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.util.EnumerationUtil;
 import com.massivecraft.massivecore.store.migrator.MigratorRoot;
-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.JsonPrimitive;
 
 import java.util.Collection;
 import java.util.Iterator;