From 754c2bee29f412c44a733de0b08d3d1644874435 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Fri, 17 Jan 2020 17:33:36 +0000
Subject: [PATCH] Make AbstractAdapter work with other packages

---
 l10n.toml                                      | 10 ----------
 .../net/islandearth/rpgregions/RPGRegions.java |  2 +-
 .../rpgregions/gson/AbstractAdapter.java       | 18 +++++++++++++++---
 3 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 l10n.toml

diff --git a/l10n.toml b/l10n.toml
deleted file mode 100644
index 7c8a84f..0000000
--- a/l10n.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-basepath = "."
-
-locales = [
-    "nb",
-    "sv"
-]
-
-[[paths]]
-    reference = "src/main/resources/lang/en-GB/*.json"
-    l10n = "src/main/resources/lang/{locale}/*.json"
\ No newline at end of file
diff --git a/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/src/main/java/net/islandearth/rpgregions/RPGRegions.java
index e5af4e0..6053b42 100644
--- a/src/main/java/net/islandearth/rpgregions/RPGRegions.java
+++ b/src/main/java/net/islandearth/rpgregions/RPGRegions.java
@@ -130,7 +130,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu
 
 	public Gson getGson() {
 		return new GsonBuilder()
-				.registerTypeAdapter(DiscoveryReward.class, new AbstractAdapter<DiscoveryReward>("net.islandearth.rpgregions.rewards."))
+				.registerTypeAdapter(DiscoveryReward.class, new AbstractAdapter<DiscoveryReward>(null))
 				.setPrettyPrinting()
 				.serializeNulls().create();
 	}
diff --git a/src/main/java/net/islandearth/rpgregions/gson/AbstractAdapter.java b/src/main/java/net/islandearth/rpgregions/gson/AbstractAdapter.java
index f4fc493..cc7bfc6 100644
--- a/src/main/java/net/islandearth/rpgregions/gson/AbstractAdapter.java
+++ b/src/main/java/net/islandearth/rpgregions/gson/AbstractAdapter.java
@@ -1,6 +1,7 @@
 package net.islandearth.rpgregions.gson;
 
 import com.google.gson.*;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Type;
 
@@ -8,14 +9,22 @@ public class AbstractAdapter<T> implements JsonSerializer<T>, JsonDeserializer<T
 
     private final String thePackage;
 
-    public AbstractAdapter(String thePackage) {
+    /**
+     * Constructs a new adapter.
+     * If null is passed, the package will also be saved to the json file.
+     * @param thePackage package class is located in
+     */
+    public AbstractAdapter(@Nullable String thePackage) {
         this.thePackage = thePackage;
     }
 
     @Override
     public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) {
         JsonObject result = new JsonObject();
-        result.add("type", new JsonPrimitive(src.getClass().getSimpleName()));
+        if (thePackage != null)
+            result.add("type", new JsonPrimitive(src.getClass().getSimpleName()));
+        else
+            result.add("type", new JsonPrimitive(src.getClass().getPackage().getName() + "." + src.getClass().getSimpleName()));
         result.add("properties", context.serialize(src, src.getClass()));
         return result;
     }
@@ -27,7 +36,10 @@ public class AbstractAdapter<T> implements JsonSerializer<T>, JsonDeserializer<T
         JsonElement element = jsonObject.get("properties");
 
         try {
-            return context.deserialize(element, Class.forName(thePackage + type));
+            if (thePackage != null)
+                return context.deserialize(element, Class.forName(thePackage + type));
+            else
+                return context.deserialize(element, Class.forName(type));
         } catch (ClassNotFoundException cnfe) {
             throw new JsonParseException("Unknown element type: " + type, cnfe);
         }