From 51e19d3c366de3025eddb0c460d8552b9cc2c33c Mon Sep 17 00:00:00 2001
From: LoJoSho <LoJoShogaming@gmail.com>
Date: Sun, 6 Aug 2023 10:05:05 -0500
Subject: [PATCH] clean: menu slots are never null, check if empty instead

---
 .../com/hibiscusmc/hmccosmetics/gui/Menu.java | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java
index c9ee9427..2e9b528e 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java
@@ -16,6 +16,7 @@ import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
+import lombok.Getter;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -33,13 +34,20 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class Menu {
 
+    @Getter
     private final String id;
+    @Getter
     private final String title;
+    @Getter
     private final int rows;
+    @Getter
     private final ConfigurationNode config;
+    @Getter
     private final String permissionNode;
     private final HashMap<Integer, MenuItem> items;
+    @Getter
     private final int refreshRate;
+    @Getter
     private final boolean shading;
 
     public Menu(String id, @NotNull ConfigurationNode config) {
@@ -74,8 +82,8 @@ public class Menu {
 
             List<Integer> slots = getSlots(slotString);
 
-            if (slots == null) {
-                MessagesUtil.sendDebugMessages("Slot is null for " + config.key().toString());
+            if (slots.isEmpty()) {
+                MessagesUtil.sendDebugMessages("Slot is empty for " + config.key().toString());
                 continue;
             }
 
@@ -104,18 +112,6 @@ public class Menu {
         }
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public int getRows() {
-        return this.getRows();
-    }
-
     public void openMenu(CosmeticUser user) {
         openMenu(user, false);
     }
@@ -247,8 +243,8 @@ public class Menu {
         for (String a : slotString) {
             if (a.contains("-")) {
                 String[] split = a.split("-");
-                int min = Integer.valueOf(split[0]);
-                int max = Integer.valueOf(split[1]);
+                int min = Integer.parseInt(split[0]);
+                int max = Integer.parseInt(split[1]);
                 slots.addAll(getSlots(min, max));
             } else {
                 slots.add(Integer.valueOf(a));
@@ -273,10 +269,6 @@ public class Menu {
         return type.setItem(user, config, itemStack, slot);
     }
 
-    public String getPermissionNode() {
-        return permissionNode;
-    }
-
     public boolean canOpen(Player player) {
         if (permissionNode.isEmpty()) return true;
         return player.isOp() || player.hasPermission(permissionNode);