From fef5769e31ef5ab0bf2b31464484fe55e19e23f3 Mon Sep 17 00:00:00 2001 From: Boy Date: Mon, 6 Feb 2023 14:17:18 +0100 Subject: [PATCH 1/3] getDefaultMenu method --- common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java index 5ffb6dee..5a1fe50c 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java @@ -39,6 +39,8 @@ public class Menus { return MENUS.containsValue(menu); } + public static Menu getDefaultMenu() { return MENUS.get(Settings.getDefaultMenu()); } + public static List getMenuNames() { List names = new ArrayList<>(); From 498370cc8ee88c297b1c2bf11e83e66801cdd032 Mon Sep 17 00:00:00 2001 From: Boy Date: Mon, 6 Feb 2023 17:23:21 +0100 Subject: [PATCH 2/3] replace old methods --- .../com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java | 2 +- .../hibiscusmc/hmccosmetics/listener/PlayerGameListener.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java index 335b62a7..8ca8aac5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java @@ -46,7 +46,7 @@ public class CosmeticCommand implements CommandExecutor { } CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId()); - Menu menu = Menus.getMenu(Settings.getDefaultMenu()); + Menu menu = Menus.getDefaultMenu(); if (user == null) { MessagesUtil.sendMessage(sender, "invalid-player"); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java index b0cfd68b..348f4f42 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -13,7 +13,6 @@ import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.gui.Menus; @@ -356,7 +355,7 @@ public class PlayerGameListener implements Listener { CosmeticUser user = CosmeticUsers.getUser(player); if (user == null) return; if (!user.isInWardrobe()) return; - Menu menu = Menus.getMenu(Settings.getDefaultMenu()); + Menu menu = Menus.getDefaultMenu(); if (menu == null) return; menu.openMenu(user); event.setCancelled(true); From 382eed99825d9c587aa1df068dad01d09ae385e0 Mon Sep 17 00:00:00 2001 From: Boy Date: Mon, 6 Feb 2023 17:42:15 +0100 Subject: [PATCH 3/3] requested changes --- common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java index 5a1fe50c..63dc13b2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java @@ -39,7 +39,7 @@ public class Menus { return MENUS.containsValue(menu); } - public static Menu getDefaultMenu() { return MENUS.get(Settings.getDefaultMenu()); } + public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); } public static List getMenuNames() { List names = new ArrayList<>();