From c0b7b783b2418c71230f9e971483d71804e80540 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sat, 13 Sep 2014 10:24:49 +0200 Subject: [PATCH] Use xlib custom shaded. --- .../com/massivecraft/factions/Factions.java | 4 ++-- .../factions/adapter/BoardAdapter.java | 12 ++++++------ .../factions/adapter/BoardMapAdapter.java | 14 +++++++------- .../factions/adapter/FFlagAdapter.java | 8 ++++---- .../factions/adapter/FPermAdapter.java | 8 ++++---- .../adapter/FactionPreprocessAdapter.java | 10 +++++----- .../factions/adapter/RelAdapter.java | 9 +++++---- .../adapter/TerritoryAccessAdapter.java | 18 +++++++++--------- .../massivecraft/factions/entity/Board.java | 2 +- .../factions/entity/BoardColls.java | 2 +- .../factions/entity/FactionColls.java | 2 +- .../factions/entity/UPlayerColls.java | 2 +- 12 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java index 848c27bc..1220235c 100644 --- a/src/main/java/com/massivecraft/factions/Factions.java +++ b/src/main/java/com/massivecraft/factions/Factions.java @@ -47,8 +47,8 @@ import com.massivecraft.massivecore.AspectColl; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.util.MUtil; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.GsonBuilder; public class Factions extends MassivePlugin diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java index ebbdd114..b2b060a3 100644 --- a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java @@ -4,12 +4,12 @@ import java.lang.reflect.Type; import java.util.Map; import com.massivecraft.massivecore.ps.PS; -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.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.factions.TerritoryAccess; import com.massivecraft.factions.entity.Board; diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java index 8bc76952..e724cc7b 100644 --- a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java @@ -6,13 +6,13 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; import com.massivecraft.massivecore.ps.PS; -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.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 com.massivecraft.factions.TerritoryAccess; public class BoardMapAdapter implements JsonDeserializer>, JsonSerializer> diff --git a/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java index 44319b43..55c7f9dc 100644 --- a/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java @@ -3,10 +3,10 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import com.massivecraft.factions.FFlag; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; +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; public class FFlagAdapter implements JsonDeserializer { diff --git a/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java index 2bae7099..d578710c 100644 --- a/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java @@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; import com.massivecraft.factions.FPerm; +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; public class FPermAdapter implements JsonDeserializer { diff --git a/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java b/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java index a47bccef..2028df59 100644 --- a/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java @@ -2,13 +2,13 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -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.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; +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; public class FactionPreprocessAdapter implements JsonDeserializer { diff --git a/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java b/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java index e4297707..bc56b4db 100644 --- a/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/RelAdapter.java @@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; -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.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; public class RelAdapter implements JsonDeserializer { @@ -26,4 +26,5 @@ public class RelAdapter implements JsonDeserializer { return Rel.parse(json.getAsString()); } + } diff --git a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java index c8c6d9b8..590dac1e 100644 --- a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java @@ -3,16 +3,16 @@ package com.massivecraft.factions.adapter; import java.lang.reflect.Type; import java.util.Set; -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; public class TerritoryAccessAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/main/java/com/massivecraft/factions/entity/Board.java b/src/main/java/com/massivecraft/factions/entity/Board.java index 4ef51b63..2cb85214 100644 --- a/src/main/java/com/massivecraft/factions/entity/Board.java +++ b/src/main/java/com/massivecraft/factions/entity/Board.java @@ -20,7 +20,7 @@ import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; -import com.google.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class Board extends Entity implements BoardInterface { diff --git a/src/main/java/com/massivecraft/factions/entity/BoardColls.java b/src/main/java/com/massivecraft/factions/entity/BoardColls.java index 38df05c7..8bdaed73 100644 --- a/src/main/java/com/massivecraft/factions/entity/BoardColls.java +++ b/src/main/java/com/massivecraft/factions/entity/BoardColls.java @@ -16,7 +16,7 @@ import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSBuilder; import com.massivecraft.massivecore.util.DiscUtil; -import com.google.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class BoardColls extends XColls implements BoardInterface { diff --git a/src/main/java/com/massivecraft/factions/entity/FactionColls.java b/src/main/java/com/massivecraft/factions/entity/FactionColls.java index dbe794f4..a9fcc152 100644 --- a/src/main/java/com/massivecraft/factions/entity/FactionColls.java +++ b/src/main/java/com/massivecraft/factions/entity/FactionColls.java @@ -12,7 +12,7 @@ import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.util.DiscUtil; import com.massivecraft.massivecore.util.MUtil; -import com.google.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class FactionColls extends XColls { diff --git a/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java b/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java index 36ef93bd..1726dfd2 100644 --- a/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java +++ b/src/main/java/com/massivecraft/factions/entity/UPlayerColls.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions; import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.util.DiscUtil; -import com.google.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; public class UPlayerColls extends XColls {