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

code refactoring

Browse source
This commit is contained in:
unurled 2024-03-18 22:20:12 +01:00
parent 1829e2a80b
commit ad919e76d5
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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.components.entity.SREntityType;
import me.unurled.sacredrealms.sr.gui.BackItem; import me.unurled.sacredrealms.sr.gui.BackItem;
import me.unurled.sacredrealms.sr.gui.ForwardItem; import me.unurled.sacredrealms.sr.gui.ForwardItem;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.Material; import org.bukkit.Material;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
@ -19,7 +20,7 @@ public class EntityTypeGUI {
private EntityTypeGUI() {} private EntityTypeGUI() {}
public static @NotNull Gui listGui() { public static @NotNull Gui listGui() {
EntityManager em = EntityManager.getInstance(EntityManager.class); EntityManager em = Manager.getInstance(EntityManager.class);
List<Item> items = List<Item> items =
em.getTypes().stream() em.getTypes().stream()
.map(type -> new SimpleItem(new ItemBuilder(type.getItem()))) .map(type -> new SimpleItem(new ItemBuilder(type.getItem())))

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

@ -40,8 +40,12 @@ public class Manager implements Listener {
} }
/** Save the data */ /** 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 */ /** Load the data */
public void loadData() {} public void loadData() {
/* method empty, so it isn't required by the extended child to implement it */
}
} }

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

@ -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.item.ItemManager;
import me.unurled.sacredrealms.sr.components.player.PlayerManager; import me.unurled.sacredrealms.sr.components.player.PlayerManager;
import me.unurled.sacredrealms.sr.components.player.SRPlayer; import me.unurled.sacredrealms.sr.components.player.SRPlayer;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
@ -22,12 +23,15 @@ import org.jetbrains.annotations.NotNull;
@SuppressWarnings("UnusedReturnValue") @SuppressWarnings("UnusedReturnValue")
public class Items { public class Items {
private Items() {}
public static @NotNull Double getTotalAttribute(@NotNull Player player, Attribute attribute) { public static @NotNull Double getTotalAttribute(@NotNull Player player, Attribute attribute) {
return getTotalAttribute(player.getEquipment(), attribute); return getTotalAttribute(player.getEquipment(), attribute);
} }
public static @NotNull Double getTotalAttribute(EntityEquipment inv, Attribute 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; if (im == null) return 0.0;
AtomicReference<Double> total = new AtomicReference<>(0.0); AtomicReference<Double> total = new AtomicReference<>(0.0);
@ -43,7 +47,7 @@ public class Items {
} }
public static Double getAttribute(ItemStack item, Attribute attribute) { 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 (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 +75,7 @@ public class Items {
*/ */
public static ItemStack lore(ItemStack stack) { public static ItemStack lore(ItemStack stack) {
ItemManager im = ItemManager.getInstance(ItemManager.class); ItemManager im = Manager.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;
@ -121,7 +125,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.getInstance(PlayerManager.class); PlayerManager pm = Manager.getInstance(PlayerManager.class);
if (pm == null) { if (pm == null) {
return; return;
} }
@ -130,7 +134,7 @@ public class Items {
return; return;
} }
ItemManager im = ItemManager.getInstance(ItemManager.class); ItemManager im = Manager.getInstance(ItemManager.class);
if (im == null) { if (im == null) {
return; return;
} }