SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

refactor of Manager

Browse source
This commit is contained in:
unurled 2024-03-11 16:26:30 +01:00
parent 5ffb921150
commit b769de9db4
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/me/unurled/sacredrealms/sr/commands/admin/AttributeCommand.java
View file

@ -21,7 +21,7 @@ public class AttributeCommand implements TabExecutor {
@Nullable @Nullable
private static SRPlayer getSrPlayer(@NotNull CommandSender sender, Player target) { 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) { if (pm == null) {
sender.sendMessage(comp("<red>An error occurred.")); sender.sendMessage(comp("<red>An error occurred."));
return null; return null;

2
src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java
View file

@ -96,7 +96,7 @@ public class ResetAdventureCommand implements TabExecutor {
} }
private boolean resetAdventure(OfflinePlayer player) { private boolean resetAdventure(OfflinePlayer player) {
DataManager dataManager = (DataManager) DataManager.getInstance(DataManager.class); DataManager dataManager = DataManager.getInstance(DataManager.class);
if (dataManager != null) { if (dataManager != null) {
if (dataManager.getDataHandler().exists(PlayerManager.PLAYER_KEY + player.getUniqueId())) { if (dataManager.getDataHandler().exists(PlayerManager.PLAYER_KEY + player.getUniqueId())) {
dataManager.getDataHandler().remove(PlayerManager.PLAYER_KEY + player.getUniqueId()); dataManager.getDataHandler().remove(PlayerManager.PLAYER_KEY + player.getUniqueId());

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

@ -40,7 +40,7 @@ public class CombatManager extends Manager {
|| !(e.getEntity() instanceof LivingEntity entity)) { || !(e.getEntity() instanceof LivingEntity entity)) {
return; return;
} }
PlayerManager pm = (PlayerManager) PlayerManager.getInstance(PlayerManager.class); PlayerManager pm = PlayerManager.getInstance(PlayerManager.class);
if (pm == null) { if (pm == null) {
return; return;
} }

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

@ -38,7 +38,7 @@ public class PlayerManager extends Manager {
/** Save the data */ /** Save the data */
@Override @Override
public void saveData() { public void saveData() {
DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); DataManager dm = DataManager.getInstance(DataManager.class);
if (dm == null) { if (dm == null) {
error("DataManager is null, Can't save player data."); error("DataManager is null, Can't save player data.");
return; return;
@ -77,7 +77,7 @@ public class PlayerManager extends Manager {
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent e) { public void onPlayerJoin(PlayerJoinEvent e) {
DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); DataManager dm = DataManager.getInstance(DataManager.class);
if (dm == null) { if (dm == null) {
error("DataManager is null, Can't load player " + e.getPlayer().getName() + "'s data" + "."); error("DataManager is null, Can't load player " + e.getPlayer().getName() + "'s data" + ".");
return; return;
@ -110,7 +110,7 @@ public class PlayerManager extends Manager {
return; return;
} }
// save for player // save for player
DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); DataManager dm = DataManager.getInstance(DataManager.class);
if (dm == null) { if (dm == null) {
error("DataManager is null, Can't save player " + e.getPlayer().getName() + "'s data" + "."); error("DataManager is null, Can't save player " + e.getPlayer().getName() + "'s data" + ".");
return; return;

2
src/main/java/me/unurled/sacredrealms/sr/data/Redis.java
View file

@ -11,7 +11,7 @@ public class Redis implements DataHandler {
JedisPooled client; JedisPooled client;
public Redis() { public Redis() {
DataManager dm = (DataManager) DataManager.getInstance(DataManager.class); DataManager dm = DataManager.getInstance(DataManager.class);
if (dm != null) { if (dm != null) {
String host = dm.getConfig().getString("redis.host", "127.0.0.1"); String host = dm.getConfig().getString("redis.host", "127.0.0.1");
int port = dm.getConfig().getInt("redis.port", 6379); int port = dm.getConfig().getInt("redis.port", 6379);

2
src/main/java/me/unurled/sacredrealms/sr/managers/Manager.java
View file

@ -25,7 +25,7 @@ public class Manager implements Listener {
* @return The instance of the manager * @return The instance of the manager
* @param <T> The type of the manager * @param <T> The type of the manager
*/ */
public static <T extends Manager> Manager getInstance(Class<? extends Manager> clazz) { public static <T extends Manager> T getInstance(Class<T> clazz) {
return clazz.cast(SR.getInstance().getManagers().getManager(clazz)); return clazz.cast(SR.getInstance().getManagers().getManager(clazz));
} }

10
src/main/java/me/unurled/sacredrealms/sr/utils/Items.java
View file

@ -27,7 +27,7 @@ public class Items {
} }
public static @NotNull Double getTotalAttribute(EntityEquipment inv, Attribute attribute) { 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; if (im == null) return 0.0;
AtomicReference<Double> total = new AtomicReference<>(0.0); AtomicReference<Double> total = new AtomicReference<>(0.0);
@ -43,7 +43,7 @@ public class Items {
} }
public static Double getAttribute(ItemStack item, Attribute attribute) { 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 (im == null) return 0.0;
if (item == null) return 0.0; if (item == null) return 0.0;
if (item.getType().equals(Material.AIR)) 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) { 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 (im == null) return stack;
if (stack == null) return stack; if (stack == null) return stack;
if (stack.getType().equals(Material.AIR)) 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) { 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) { if (pm == null) {
return; return;
} }
@ -131,7 +131,7 @@ public class Items {
return; return;
} }
ItemManager im = (ItemManager) ItemManager.getInstance(ItemManager.class); ItemManager im = ItemManager.getInstance(ItemManager.class);
if (im == null) { if (im == null) {
return; return;
} }