diff --git a/build.gradle.kts b/build.gradle.kts index 9f93d31..5a4bfe7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,7 +63,6 @@ tasks { relocate("org.json", "libs.org.json") exclude("org.slf4j") relocate("redis", "libs.redis") -// minimize() } sonar { properties { diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildDeserializer.java similarity index 95% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildDeserializer.java index a194ac9..4249c1b 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildDeserializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildManager.java index 3665493..3359eac 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildManager.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildSerializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildSerializer.java similarity index 94% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildSerializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildSerializer.java index d1f72d7..3c739dc 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildSerializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/entity/EntityManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/entity/EntityManager.java index 5d04bdd..ffd6a2f 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/entity/EntityManager.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java index 12dd25b..10b22b7 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemDeserializer.java similarity index 93% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/item/ItemDeserializer.java index 4c74c43..04f08b6 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemDeserializer.java +++ b/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 { diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java index 46c00c9..d62d7ed 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemSerializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemSerializer.java similarity index 92% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemSerializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/item/ItemSerializer.java index 51ea8f8..a7d17e6 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemSerializer.java +++ b/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 { diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackDeserializer.java similarity index 93% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackDeserializer.java index 5d6e2e6..c82357c 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackDeserializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackSerializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackSerializer.java similarity index 96% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackSerializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackSerializer.java index 53e8774..f6c7232 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackSerializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/AbilityDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/item/abilities/AbilityDeserializer.java similarity index 94% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/AbilityDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/item/abilities/AbilityDeserializer.java index 50f2f04..f2023e0 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/AbilityDeserializer.java +++ b/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 { diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/InventoryDeserializer.java similarity index 91% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/player/InventoryDeserializer.java index 0362d8e..abf0a59 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/InventorySerializer.java similarity index 93% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/player/InventorySerializer.java index 142892e..b9b6e75 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java index 357fb58..b280b09 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectDeserializer.java similarity index 96% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectDeserializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectDeserializer.java index 41e26a6..db6d1fd 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectDeserializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectSerializer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectSerializer.java similarity index 93% rename from src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectSerializer.java rename to src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectSerializer.java index 7b08aa6..35eb0f6 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectSerializer.java +++ b/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; diff --git a/src/main/java/me/unurled/sacredrealms/sr/managers/Managers.java b/src/main/java/me/unurled/sacredrealms/sr/managers/Managers.java index bc7b61d..b967b0f 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/managers/Managers.java +++ b/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> clazz) {