From 4e2291d16fa355174a5f0a15f1522049a658533c Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 13 Jun 2023 11:51:38 -0500 Subject: [PATCH] clean: menu class cleaning --- .../com/hibiscusmc/hmccosmetics/gui/Menu.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 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 8572b1b9..3e5daaec 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -77,26 +77,21 @@ public class Menu { gui.setDefaultClickAction(event -> event.setCancelled(true)); + // TODO: Redo this whole gui creation process to allow for all items, possibly implement caching gui = getItems(user, gui); + final Gui finalGui = gui; // Need to make it final for the runtask - Gui finalGui = gui; - + // API PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this); - Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> { Bukkit.getPluginManager().callEvent(event); }); - - if (event.isCancelled()) { - return; - } + if (event.isCancelled()) return; + // Internal Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> { finalGui.open(player); }); - - //gui.open(player); - } @Contract("_, _ -> param2")