code refactoring

src/main/java/me/unurled/sacredrealms/sr/commands/admin/ClientBuildCommand.java

@@ -70,7 +70,8 @@ public class ClientBuildCommand implements TabExecutor, Listener {
       sender.sendMessage("You do not have any temporary blocks to save.");
       return;
     }
-    HashMap<Location, BlockData> blocks = clientBuildManager.getTemporaryBlocks(p);
+    HashMap<Location, BlockData> blocks =
+        (HashMap<Location, BlockData>) clientBuildManager.getTemporaryBlocks(p);
     log("blocks: " + blocks.size());
     for (Entry<Location, BlockData> block : blocks.entrySet()) {
       build.addBlock(block.getKey(), block.getValue());

src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java

@@ -109,7 +109,7 @@ public class CombatManager extends Manager {
         || !(e.getEntity() instanceof LivingEntity entity)) {
       return;
     }
-    PlayerManager pm = PlayerManager.getInstance(PlayerManager.class);
+    PlayerManager pm = Manager.getInstance(PlayerManager.class);
     if (pm == null) {
       return;
     }
@@ -189,7 +189,7 @@ public class CombatManager extends Manager {
     historyHandler(entity, d, damage);
     entity.damage(damage);
 
-    EntityManager em = EntityManager.getInstance(EntityManager.class);
+    EntityManager em = Manager.getInstance(EntityManager.class);
     SREntity ent = em.getEntity(entity.getUniqueId());
 
     if (entity.getHealth() <= 0) {

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

@@ -40,7 +40,7 @@ public class EntityManager extends Manager {
   @Override
   public void loadData() {
     // loads all types
-    DataManager dm = DataManager.getInstance(DataManager.class);
+    DataManager dm = Manager.getInstance(DataManager.class);
     if (dm == null) {
       error("DataManager is null, Can't load entity data.");
       return;
@@ -70,7 +70,7 @@ public class EntityManager extends Manager {
 
   public void saveType(@NotNull SREntityType type) {
     // save type
-    DataManager dm = DataManager.getInstance(DataManager.class);
+    DataManager dm = Manager.getInstance(DataManager.class);
     if (dm == null) {
       error("DataManager is null, Can't save entity data.");
       return;

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

@@ -32,7 +32,7 @@ public class ItemManager extends Manager {
   /** Save the data */
   @Override
   public void saveData() {
-    DataManager dm = DataManager.getInstance(DataManager.class);
+    DataManager dm = Manager.getInstance(DataManager.class);
     DataHandler dh = dm.getDataHandler();
 
     Gson gson =
@@ -47,7 +47,7 @@ public class ItemManager extends Manager {
   /** Load the data */
   @Override
   public void loadData() {
-    DataManager dm = DataManager.getInstance(DataManager.class);
+    DataManager dm = Manager.getInstance(DataManager.class);
     DataHandler dh = dm.getDataHandler();
 
     Gson gson = new GsonBuilder().registerTypeAdapter(Item.class, new ItemDeserializer()).create();

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

@@ -35,6 +35,7 @@ import org.jetbrains.annotations.Nullable;
 public class PlayerManager extends Manager {
 
   public static final String PLAYER_KEY = "sr.players.";
+  public static final String DATA_MANAGER_NULL = "DataManager is null, Can't save player data.";
   private final HashMap<UUID, SRPlayer> players;
   private DataHandler dh;
 
@@ -50,9 +51,9 @@ public class PlayerManager extends Manager {
   @Override
   public void saveData() {
     if (dh == null) {
-      DataManager dm = DataManager.getInstance(DataManager.class);
+      DataManager dm = Manager.getInstance(DataManager.class);
       if (dm == null) {
-        error("DataManager is null, Can't save player data.");
+        error(DATA_MANAGER_NULL);
         return;
       }
       dh = dm.getDataHandler();
@@ -71,7 +72,6 @@ public class PlayerManager extends Manager {
     if (players.containsKey(uuid)) {
       return players.get(uuid);
     }
-    // load player data and returns it;
 
     return loadPlayer(uuid);
   }
@@ -84,15 +84,16 @@ public class PlayerManager extends Manager {
     players.remove(uuid);
   }
 
+  @SuppressWarnings("unused")
   public boolean isSRPlayer(UUID uuid) {
     return players.containsKey(uuid);
   }
 
   public void savePlayer(SRPlayer player) {
     if (dh == null) {
-      DataManager dm = DataManager.getInstance(DataManager.class);
+      DataManager dm = Manager.getInstance(DataManager.class);
       if (dm == null) {
-        error("DataManager is null, Can't save player data.");
+        error(DATA_MANAGER_NULL);
         return;
       }
       dh = dm.getDataHandler();
@@ -130,9 +131,9 @@ public class PlayerManager extends Manager {
   @Nullable
   private SRPlayer loadPlayer(UUID p) {
     if (dh == null) {
-      DataManager dm = DataManager.getInstance(DataManager.class);
+      DataManager dm = Manager.getInstance(DataManager.class);
       if (dm == null) {
-        error("DataManager is null, Can't save player data.");
+        error(DATA_MANAGER_NULL);
         return null;
       }
       dh = dm.getDataHandler();

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

@@ -12,6 +12,7 @@ import java.util.UUID;
 import me.unurled.sacredrealms.sr.components.attributes.Attribute;
 import me.unurled.sacredrealms.sr.components.item.Item;
 import me.unurled.sacredrealms.sr.events.player.PlayerKillEvent;
+import me.unurled.sacredrealms.sr.managers.Manager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@@ -251,7 +252,7 @@ public class SRPlayer {
   public void setExperience(Long experience) {
     // checks if experience is above next level requirements
     if (experience >= levelRequirements.get(level - 1)) {
-      PlayerManager pm = PlayerManager.getInstance(PlayerManager.class);
+      PlayerManager pm = Manager.getInstance(PlayerManager.class);
       setLevel(level + 1);
       pm.levelUp(this, level - 1);
     }

src/main/java/me/unurled/sacredrealms/sr/data/Redis.java

@@ -4,6 +4,7 @@ import static me.unurled.sacredrealms.sr.utils.Logger.error;
 
 import java.util.List;
 import me.unurled.sacredrealms.sr.SR;
+import me.unurled.sacredrealms.sr.managers.Manager;
 import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.JedisPooled;
 
@@ -12,7 +13,7 @@ public class Redis implements DataHandler {
   JedisPooled client;
 
   public Redis() {
-    DataManager dm = DataManager.getInstance(DataManager.class);
+    DataManager dm = Manager.getInstance(DataManager.class);
     if (dm != null) {
       String host = dm.getConfig().getString("redis.host", "127.0.0.1");
       int port = dm.getConfig().getInt("redis.port", 6379);

src/main/java/me/unurled/sacredrealms/sr/gui/attributes/AttributeItem.java

@@ -6,6 +6,7 @@ import static me.unurled.sacredrealms.sr.utils.SRPlayerUtils.syncSRToPlayer;
 import me.unurled.sacredrealms.sr.components.attributes.Attribute;
 import me.unurled.sacredrealms.sr.components.player.PlayerManager;
 import me.unurled.sacredrealms.sr.components.player.SRPlayer;
+import me.unurled.sacredrealms.sr.managers.Manager;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -42,7 +43,7 @@ public class AttributeItem extends AbstractItem {
     double value = 0;
 
     if (targetPlayer != null) {
-      PlayerManager playerManager = PlayerManager.getInstance(PlayerManager.class);
+      PlayerManager playerManager = Manager.getInstance(PlayerManager.class);
       SRPlayer sp = playerManager.getPlayer(targetPlayer.getUniqueId());
       if (sp != null) value = sp.getAttribute(attribute);
     }
@@ -83,7 +84,7 @@ public class AttributeItem extends AbstractItem {
       @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
 
     if (targetPlayer != null) {
-      PlayerManager playerManager = PlayerManager.getInstance(PlayerManager.class);
+      PlayerManager playerManager = Manager.getInstance(PlayerManager.class);
       SRPlayer sp = playerManager.getPlayer(targetPlayer.getUniqueId());
       if (sp != null) {
         if (clickType == ClickType.LEFT) {

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityArmorItem.java

@@ -47,5 +47,7 @@ public class EntityArmorItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityBehaviorItem.java

@@ -42,5 +42,7 @@ public class EntityBehaviorItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityExpItem.java

@@ -42,5 +42,7 @@ public class EntityExpItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityItemDisplay.java

@@ -42,5 +42,7 @@ public class EntityItemDisplay extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityLevelItem.java

@@ -42,5 +42,7 @@ public class EntityLevelItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityLootItem.java

@@ -35,5 +35,7 @@ public class EntityLootItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityNameItem.java

@@ -42,5 +42,7 @@ public class EntityNameItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityStatsItem.java

@@ -48,5 +48,7 @@ public class EntityStatsItem extends AbstractItem {
    */
   @Override
   public void handleClick(
-      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {}
+      @NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) {
+    /* TODO need to implements this */
+  }
 }

src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java

@@ -16,6 +16,8 @@ import xyz.xenondevs.invui.item.builder.ItemBuilder;
 import xyz.xenondevs.invui.item.impl.SimpleItem;
 
 public class EntityTypeGUI {
+  private EntityTypeGUI() {}
+
   public static @NotNull Gui listGui() {
     EntityManager em = EntityManager.getInstance(EntityManager.class);
     List<Item> items =
@@ -23,20 +25,18 @@ public class EntityTypeGUI {
             .map(type -> new SimpleItem(new ItemBuilder(type.getItem())))
             .collect(Collectors.toList());
 
-    Gui gui =
+    return PagedGui.items()
-        PagedGui.items()
+        .setStructure(
-            .setStructure(
+            "# # # # # # # # #",
-                "# # # # # # # # #",
+            "# X X X X X X X #",
-                "# X X X X X X X #",
+            "# X X X X X X X #",
-                "# X X X X X X X #",
+            "# X X X X X X X #",
-                "# X X X X X X X #",
+            "# # # < # > # # #")
-                "# # # < # > # # #")
+        .addIngredient('X', Markers.CONTENT_LIST_SLOT_HORIZONTAL)
-            .addIngredient('X', Markers.CONTENT_LIST_SLOT_HORIZONTAL)
+        .addIngredient('<', new BackItem())
-            .addIngredient('<', new BackItem())
+        .addIngredient('>', new ForwardItem())
-            .addIngredient('>', new ForwardItem())
+        .setContent(items)
-            .setContent(items)
+        .build();
-            .build();
-    return gui;
   }
 
   public static @NotNull Gui createGui(SREntityType type) {
@@ -44,30 +44,28 @@ public class EntityTypeGUI {
     Item border =
         new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName("§r"));
 
-    Gui gui =
+    return Gui.normal()
-        Gui.normal()
+        .setStructure(
-            .setStructure(
+            "# # # # # # # # #",
-                "# # # # # # # # #",
+            "# T B O I S N L #", // Type, Behavior, lOot, Item display, Stats, Name, Level
-                "# T B O I S N L #", // Type, Behavior, lOot, Item display, Stats, Name, Level
+            "# X X X P X X X #", // exPerience
-                "# X X X P X X X #", // exPerience
+            "# H C E B X M A #", // Helmet, Chestplate, lEgging, Boots, Main hand, second hAnd
-                "# H C E B X M A #", // Helmet, Chestplate, lEgging, Boots, Main hand, second hAnd
+            "# # # # # # # # #")
-                "# # # # # # # # #")
+        .addIngredient('#', border)
-            .addIngredient('#', border)
+        .addIngredient('T', new EntityTypeItem(type))
-            .addIngredient('T', new EntityTypeItem(type))
+        .addIngredient('B', new EntityBehaviorItem(type))
-            .addIngredient('B', new EntityBehaviorItem(type))
+        .addIngredient('O', new EntityLootItem())
-            .addIngredient('O', new EntityLootItem())
+        .addIngredient('I', new EntityItemDisplay(type))
-            .addIngredient('I', new EntityItemDisplay(type))
+        .addIngredient('S', new EntityStatsItem(type))
-            .addIngredient('S', new EntityStatsItem(type))
+        .addIngredient('N', new EntityNameItem(type))
-            .addIngredient('N', new EntityNameItem(type))
+        .addIngredient('L', new EntityLevelItem(type))
-            .addIngredient('L', new EntityLevelItem(type))
+        .addIngredient('P', new EntityExpItem(type))
-            .addIngredient('P', new EntityExpItem(type))
+        .addIngredient('H', new EntityArmorItem(type, 0))
-            .addIngredient('H', new EntityArmorItem(type, 0))
+        .addIngredient('C', new EntityArmorItem(type, 1))
-            .addIngredient('C', new EntityArmorItem(type, 1))
+        .addIngredient('E', new EntityArmorItem(type, 2))
-            .addIngredient('E', new EntityArmorItem(type, 2))
+        .addIngredient('B', new EntityArmorItem(type, 3))
-            .addIngredient('B', new EntityArmorItem(type, 3))
+        .addIngredient('M', new EntityArmorItem(type, 4))
-            .addIngredient('M', new EntityArmorItem(type, 4))
+        .addIngredient('A', new EntityArmorItem(type, 5))
-            .addIngredient('A', new EntityArmorItem(type, 5))
+        .build();
-            .build();
-    return gui;
   }
 }