diff --git a/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java b/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java index b16111c..b3d5260 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java +++ b/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java @@ -6,6 +6,7 @@ import me.unurled.sacredrealms.sr.components.entity.EntityManager; import me.unurled.sacredrealms.sr.components.entity.SREntityType; import me.unurled.sacredrealms.sr.gui.BackItem; import me.unurled.sacredrealms.sr.gui.ForwardItem; +import me.unurled.sacredrealms.sr.managers.Manager; import org.bukkit.Material; import org.jetbrains.annotations.NotNull; import xyz.xenondevs.invui.gui.Gui; @@ -19,7 +20,7 @@ public class EntityTypeGUI { private EntityTypeGUI() {} public static @NotNull Gui listGui() { - EntityManager em = EntityManager.getInstance(EntityManager.class); + EntityManager em = Manager.getInstance(EntityManager.class); List items = em.getTypes().stream() .map(type -> new SimpleItem(new ItemBuilder(type.getItem()))) diff --git a/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java b/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java index 8ca6733..976c2ac 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java +++ b/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java @@ -40,8 +40,12 @@ public class Manager implements Listener { } /** Save the data */ - public void saveData() {} + public void saveData() { + /* method empty, so it isn't required by the extended child to implement it */ + } /** Load the data */ - public void loadData() {} + public void loadData() { + /* method empty, so it isn't required by the extended child to implement it */ + } } diff --git a/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java b/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java index bbe857b..3bc1e63 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java +++ b/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java @@ -12,6 +12,7 @@ import me.unurled.sacredrealms.sr.components.item.Item; import me.unurled.sacredrealms.sr.components.item.ItemManager; 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.inventory.EntityEquipment; @@ -22,12 +23,15 @@ import org.jetbrains.annotations.NotNull; @SuppressWarnings("UnusedReturnValue") public class Items { + + private Items() {} + public static @NotNull Double getTotalAttribute(@NotNull Player player, Attribute attribute) { return getTotalAttribute(player.getEquipment(), attribute); } public static @NotNull Double getTotalAttribute(EntityEquipment inv, Attribute attribute) { - ItemManager im = ItemManager.getInstance(ItemManager.class); + ItemManager im = Manager.getInstance(ItemManager.class); if (im == null) return 0.0; AtomicReference total = new AtomicReference<>(0.0); @@ -43,7 +47,7 @@ public class Items { } public static Double getAttribute(ItemStack item, Attribute attribute) { - ItemManager im = ItemManager.getInstance(ItemManager.class); + ItemManager im = Manager.getInstance(ItemManager.class); if (im == null) return 0.0; if (item == null) return 0.0; if (item.getType().equals(Material.AIR)) return 0.0; @@ -71,7 +75,7 @@ public class Items { */ public static ItemStack lore(ItemStack stack) { - ItemManager im = ItemManager.getInstance(ItemManager.class); + ItemManager im = Manager.getInstance(ItemManager.class); if (im == null) return stack; if (stack == null) return stack; if (stack.getType().equals(Material.AIR)) return stack; @@ -121,7 +125,7 @@ public class Items { } public static void updatePlayer(@NotNull Player player, ItemStack oldItem, ItemStack newItem) { - PlayerManager pm = PlayerManager.getInstance(PlayerManager.class); + PlayerManager pm = Manager.getInstance(PlayerManager.class); if (pm == null) { return; } @@ -130,7 +134,7 @@ public class Items { return; } - ItemManager im = ItemManager.getInstance(ItemManager.class); + ItemManager im = Manager.getInstance(ItemManager.class); if (im == null) { return; }