From b769de9db4e9217872926b6860703e89c7262ace Mon Sep 17 00:00:00 2001 From: unurled Date: Mon, 11 Mar 2024 16:26:30 +0100 Subject: [PATCH] refactor of Manager --- .../sr/commands/admin/AttributeCommand.java | 2 +- .../sr/commands/player/ResetAdventureCommand.java | 2 +- .../sr/components/combat/CombatManager.java | 2 +- .../sr/components/player/PlayerManager.java | 6 +++--- .../java/me/unurled/sacredrealms/sr/data/Redis.java | 2 +- .../me/unurled/sacredrealms/sr/managers/Manager.java | 2 +- .../java/me/unurled/sacredrealms/sr/utils/Items.java | 10 +++++----- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/me/unurled/sacredrealms/sr/commands/admin/AttributeCommand.java b/src/main/java/me/unurled/sacredrealms/sr/commands/admin/AttributeCommand.java index 2e36bed..630ed68 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/commands/admin/AttributeCommand.java +++ b/src/main/java/me/unurled/sacredrealms/sr/commands/admin/AttributeCommand.java @@ -21,7 +21,7 @@ public class AttributeCommand implements TabExecutor { @Nullable private static SRPlayer getSrPlayer(@NotNull CommandSender sender, Player target) { - PlayerManager pm = (PlayerManager) PlayerManager.getInstance(PlayerManager.class); + PlayerManager pm = PlayerManager.getInstance(PlayerManager.class); if (pm == null) { sender.sendMessage(comp("An error occurred.")); return null; diff --git a/src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java b/src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java index 216864b..9470cf7 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java +++ b/src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java @@ -96,7 +96,7 @@ public class ResetAdventureCommand implements TabExecutor { } private boolean resetAdventure(OfflinePlayer player) { - DataManager dataManager = (DataManager) DataManager.getInstance(DataManager.class); + DataManager dataManager = DataManager.getInstance(DataManager.class); if (dataManager != null) { if (dataManager.getDataHandler().exists(PlayerManager.PLAYER_KEY + player.getUniqueId())) { dataManager.getDataHandler().remove(PlayerManager.PLAYER_KEY + player.getUniqueId()); diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java index ca64642..e6fdf0a 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java +++ b/src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java @@ -40,7 +40,7 @@ public class CombatManager extends Manager { || !(e.getEntity() instanceof LivingEntity entity)) { return; } - PlayerManager pm = (PlayerManager) PlayerManager.getInstance(PlayerManager.class); + PlayerManager pm = PlayerManager.getInstance(PlayerManager.class); if (pm == null) { return; } 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 42e7ca4..fef2ded 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 @@ -38,7 +38,7 @@ public class PlayerManager extends Manager { /** Save the data */ @Override public void saveData() { - DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); + DataManager dm = DataManager.getInstance(DataManager.class); if (dm == null) { error("DataManager is null, Can't save player data."); return; @@ -77,7 +77,7 @@ public class PlayerManager extends Manager { @EventHandler public void onPlayerJoin(PlayerJoinEvent e) { - DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); + DataManager dm = DataManager.getInstance(DataManager.class); if (dm == null) { error("DataManager is null, Can't load player " + e.getPlayer().getName() + "'s data" + "."); return; @@ -110,7 +110,7 @@ public class PlayerManager extends Manager { return; } // save for player - DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); + DataManager dm = DataManager.getInstance(DataManager.class); if (dm == null) { error("DataManager is null, Can't save player " + e.getPlayer().getName() + "'s data" + "."); return; diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/Redis.java b/src/main/java/me/unurled/sacredrealms/sr/data/Redis.java index fbb6eb0..df832fb 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/data/Redis.java +++ b/src/main/java/me/unurled/sacredrealms/sr/data/Redis.java @@ -11,7 +11,7 @@ public class Redis implements DataHandler { JedisPooled client; public Redis() { - DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); + DataManager dm = DataManager.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); 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 3a607b1..8ca6733 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java +++ b/src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java @@ -25,7 +25,7 @@ public class Manager implements Listener { * @return The instance of the manager * @param The type of the manager */ - public static Manager getInstance(Class clazz) { + public static T getInstance(Class clazz) { return clazz.cast(SR.getInstance().getManagers().getManager(clazz)); } 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 4fe4693..d1f3fcf 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java +++ b/src/main/java/me/unurled/sacredrealms/sr/utils/Items.java @@ -27,7 +27,7 @@ public class Items { } public static @NotNull Double getTotalAttribute(EntityEquipment inv, Attribute attribute) { - ItemManager im = (ItemManager) ItemManager.getInstance(ItemManager.class); + ItemManager im = ItemManager.getInstance(ItemManager.class); if (im == null) return 0.0; AtomicReference total = new AtomicReference<>(0.0); @@ -43,7 +43,7 @@ public class Items { } public static Double getAttribute(ItemStack item, Attribute attribute) { - ItemManager im = (ItemManager) ItemManager.getInstance(ItemManager.class); + ItemManager im = ItemManager.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 +71,7 @@ public class Items { */ public static ItemStack lore(ItemStack stack) { - ItemManager im = (ItemManager) ItemManager.getInstance(ItemManager.class); + ItemManager im = ItemManager.getInstance(ItemManager.class); if (im == null) return stack; if (stack == null) return stack; if (stack.getType().equals(Material.AIR)) return stack; @@ -122,7 +122,7 @@ public class Items { } public static void updatePlayer(@NotNull Player player, ItemStack oldItem, ItemStack newItem) { - PlayerManager pm = (PlayerManager) PlayerManager.getInstance(PlayerManager.class); + PlayerManager pm = PlayerManager.getInstance(PlayerManager.class); if (pm == null) { return; } @@ -131,7 +131,7 @@ public class Items { return; } - ItemManager im = (ItemManager) ItemManager.getInstance(ItemManager.class); + ItemManager im = ItemManager.getInstance(ItemManager.class); if (im == null) { return; }