add of treasure and code moving around

build.gradle.kts

@@ -63,7 +63,6 @@ tasks {
         relocate("org.json", "libs.org.json")
         exclude("org.slf4j")
         relocate("redis", "libs.redis")
-//        minimize()
     }
     sonar {
         properties {

src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildDeserializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.clientbuild;
 
 import static me.unurled.sacredrealms.sr.utils.Logger.error;
 
@@ -7,7 +7,6 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
-import me.unurled.sacredrealms.sr.components.clientbuild.ClientBuild;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;

src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildManager.java

@@ -15,8 +15,6 @@ import me.unurled.sacredrealms.sr.SR;
 import me.unurled.sacredrealms.sr.commands.admin.ClientBuildCommand;
 import me.unurled.sacredrealms.sr.data.DataHandler;
 import me.unurled.sacredrealms.sr.data.DataManager;
-import me.unurled.sacredrealms.sr.data.gson.ClientBuildDeserializer;
-import me.unurled.sacredrealms.sr.data.gson.ClientBuildSerializer;
 import me.unurled.sacredrealms.sr.managers.Manager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildSerializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.clientbuild;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
@@ -6,7 +6,6 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.Map.Entry;
-import me.unurled.sacredrealms.sr.components.clientbuild.ClientBuild;
 import org.bukkit.Location;
 import org.bukkit.block.data.BlockData;
 

src/main/java/me/unurled/sacredrealms/sr/components/entity/EntityManager.java

@@ -8,11 +8,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import me.unurled.sacredrealms.sr.components.item.ItemStackDeserializer;
+import me.unurled.sacredrealms.sr.components.item.ItemStackSerializer;
+import me.unurled.sacredrealms.sr.components.player.PotionEffectDeserializer;
 import me.unurled.sacredrealms.sr.data.DataHandler;
 import me.unurled.sacredrealms.sr.data.DataManager;
-import me.unurled.sacredrealms.sr.data.gson.ItemStackDeserializer;
-import me.unurled.sacredrealms.sr.data.gson.ItemStackSerializer;
-import me.unurled.sacredrealms.sr.data.gson.PotionEffectDeserializer;
 import me.unurled.sacredrealms.sr.managers.Manager;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Mob;

src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java

@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Map;
 import me.unurled.sacredrealms.sr.components.attributes.Attribute;
 import me.unurled.sacredrealms.sr.components.item.abilities.Ability;
+import me.unurled.sacredrealms.sr.components.item.abilities.AbilityDeserializer;
 import me.unurled.sacredrealms.sr.components.item.enchantments.Enchantment;
-import me.unurled.sacredrealms.sr.data.gson.AbilityDeserializer;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;

src/main/java/me/unurled/sacredrealms/sr/components/item/ItemDeserializer.java

@@ -1,11 +1,10 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.item;
 
 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;
-import me.unurled.sacredrealms.sr.components.item.Item;
 
 public class ItemDeserializer implements JsonDeserializer<Item> {
 

src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java

@@ -6,8 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import me.unurled.sacredrealms.sr.data.DataHandler;
 import me.unurled.sacredrealms.sr.data.DataManager;
-import me.unurled.sacredrealms.sr.data.gson.ItemDeserializer;
-import me.unurled.sacredrealms.sr.data.gson.ItemStackSerializer;
 import me.unurled.sacredrealms.sr.managers.Manager;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;

src/main/java/me/unurled/sacredrealms/sr/components/item/ItemSerializer.java

@@ -1,11 +1,10 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.item;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import me.unurled.sacredrealms.sr.components.item.Item;
 
 public class ItemSerializer implements JsonSerializer<Item> {
 

src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackDeserializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.item;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;

src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackSerializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.item;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;

src/main/java/me/unurled/sacredrealms/sr/components/item/abilities/AbilityDeserializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.item.abilities;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
-import me.unurled.sacredrealms.sr.components.item.abilities.Ability;
 
 public class AbilityDeserializer implements JsonDeserializer<Ability> {
 

src/main/java/me/unurled/sacredrealms/sr/components/player/InventoryDeserializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.player;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -7,6 +7,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
+import me.unurled.sacredrealms.sr.components.item.ItemStackDeserializer;
 import org.bukkit.Bukkit;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;

src/main/java/me/unurled/sacredrealms/sr/components/player/InventorySerializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.player;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;

src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java

@@ -11,10 +11,6 @@ import java.util.UUID;
 import me.unurled.sacredrealms.sr.SR;
 import me.unurled.sacredrealms.sr.data.DataHandler;
 import me.unurled.sacredrealms.sr.data.DataManager;
-import me.unurled.sacredrealms.sr.data.gson.InventoryDeserializer;
-import me.unurled.sacredrealms.sr.data.gson.InventorySerializer;
-import me.unurled.sacredrealms.sr.data.gson.PotionEffectDeserializer;
-import me.unurled.sacredrealms.sr.data.gson.PotionEffectSerializer;
 import me.unurled.sacredrealms.sr.events.player.PlayerLevelUpEvent;
 import me.unurled.sacredrealms.sr.managers.Manager;
 import me.unurled.sacredrealms.sr.utils.Items;

src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectDeserializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.player;
 
 import static me.unurled.sacredrealms.sr.utils.Logger.error;
 

src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectSerializer.java

@@ -1,4 +1,4 @@
-package me.unurled.sacredrealms.sr.data.gson;
+package me.unurled.sacredrealms.sr.components.player;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;

src/main/java/me/unurled/sacredrealms/sr/managers/Managers.java

@@ -12,6 +12,7 @@ import me.unurled.sacredrealms.sr.components.combat.CombatManager;
 import me.unurled.sacredrealms.sr.components.entity.EntityManager;
 import me.unurled.sacredrealms.sr.components.item.ItemManager;
 import me.unurled.sacredrealms.sr.components.player.PlayerManager;
+import me.unurled.sacredrealms.sr.components.treasure.TreasureManager;
 import me.unurled.sacredrealms.sr.data.DataManager;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;
@@ -32,7 +33,8 @@ public class Managers {
             CombatManager.class,
             CommandManager.class,
             EntityManager.class,
-            ClientBuildManager.class));
+            ClientBuildManager.class,
+            TreasureManager.class));
   }
 
   private void register(List<Class<? extends Manager>> clazz) {