Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-20 07:29:15 +00:00
Code Issues Releases Activity

clean: menu slots are never null, check if empty instead

Browse Source
This commit is contained in:
LoJoSho
2023-08-06 10:05:05 -05:00
parent 8e8d86b94c
commit 51e19d3c36
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java
View File

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