From c6f037a24dc3f148ff00836b379f87eed45839bc Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Sat, 1 Jul 2023 17:35:46 +0200
Subject: [PATCH] style: gui adjustements

---
 src/main/java/xyz/atnrch/nicko/NickoBukkit.java    |  8 +-------
 .../atnrch/nicko/gui/admin/CacheManagementGUI.java |  6 +++++-
 .../nicko/gui/admin/cache/CacheDetailedGUI.java    | 14 +++++++-------
 .../gui/items/admin/cache/EntryPlaceholder.java    | 11 +++++++++++
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java
index c3f67cc..61c9618 100644
--- a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java
+++ b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java
@@ -1,7 +1,5 @@
 package xyz.atnrch.nicko;
 
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.PluginCommand;
@@ -39,7 +37,6 @@ public class NickoBukkit extends JavaPlugin {
     private Configuration configuration;
     private LocaleFileManager localeFileManager;
     private PlayerNameStore nameStore;
-    private ProtocolManager protocolManager;
 
     public NickoBukkit() { this.unitTesting = false; }
 
@@ -83,7 +80,6 @@ public class NickoBukkit extends JavaPlugin {
         }
 
         if (!unitTesting) {
-            protocolManager = ProtocolLibrary.getProtocolManager();
             localeFileManager = new LocaleFileManager();
             if (configuration.isCustomLocale()) {
                 if (localeFileManager.dumpFromLocale(Locale.ENGLISH)) {
@@ -98,10 +94,8 @@ public class NickoBukkit extends JavaPlugin {
                 command.setExecutor(new NickoCommand());
             }
 
-            //new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName(" "))
-            //new SimpleItem(new ItemBuilder(Material.ORANGE_STAINED_GLASS_PANE).setDisplayName(" "))
             Structure.addGlobalIngredient('#', new SimpleItem(new ItemBuilder(Material.AIR)));
-            Structure.addGlobalIngredient('%', new SimpleItem(new ItemBuilder(Material.AIR)));
+            Structure.addGlobalIngredient('%', new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName(" ")));
             Structure.addGlobalIngredient('U', new OptionUnavailable());
             Structure.addGlobalIngredient('E', new ExitGUI());
 
diff --git a/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java b/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
index 1a3bd13..298e622 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/admin/CacheManagementGUI.java
@@ -17,7 +17,11 @@ public class CacheManagementGUI {
     public CacheManagementGUI(Player player) {
         final AdminGUI parent = new AdminGUI(player);
         this.gui = Gui.normal()
-                .setStructure("B # S A D")
+                .setStructure(
+                        "# # # # # # # # #",
+                        "# # # S A D # # #",
+                        "B # # # # # # # #"
+                )
                 .addIngredient('B', new GoBack(parent.getGUI(), parent.getTitle()))
                 .addIngredient('S', new CacheOverview())
                 .addIngredient('A', new InvalidateCompleteCache())
diff --git a/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java b/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
index 003e18b..901d479 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/admin/cache/CacheDetailedGUI.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 
 public class CacheDetailedGUI {
     public static final String TITLE = "... > Cache > Invalidate";
-    
+
     private final Player player;
     private final Gui gui;
 
@@ -40,12 +40,12 @@ public class CacheDetailedGUI {
         final CacheManagementGUI parent = new CacheManagementGUI(player);
         gui = ScrollGui.items(guiItemBuilder -> {
             guiItemBuilder.setStructure(
-                    "# # # # # # # # #",
-                    "# x x x x x x U #",
-                    "# x x x x x x # #",
-                    "# x x x x x x # #",
-                    "# x x x x x x D #",
-                    "B # # # # # # # #");
+                    "x x x x x x x x U",
+                    "x x x x x x x x #",
+                    "x x x x x x x x #",
+                    "x x x x x x x x #",
+                    "x x x x x x x x D",
+                    "B % % % % % % % %");
             guiItemBuilder.addIngredient('x', Markers.CONTENT_LIST_SLOT_HORIZONTAL);
             guiItemBuilder.addIngredient('U', new ScrollUp());
             guiItemBuilder.addIngredient('D', new ScrollDown());
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/EntryPlaceholder.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/EntryPlaceholder.java
index 10b8c32..077321f 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/EntryPlaceholder.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/EntryPlaceholder.java
@@ -1,6 +1,10 @@
 package xyz.atnrch.nicko.gui.items.admin.cache;
 
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.jetbrains.annotations.NotNull;
 import xyz.xenondevs.invui.item.builder.ItemBuilder;
 import xyz.xenondevs.invui.item.builder.SkullBuilder;
 import xyz.xenondevs.invui.item.impl.AsyncItem;
@@ -18,4 +22,11 @@ public class EntryPlaceholder extends AsyncItem {
             return skull;
         });
     }
+
+    @Override
+    public void handleClick(@NotNull ClickType click, @NotNull Player player, @NotNull InventoryClickEvent event) {
+        if (click.isLeftClick() || click.isRightClick()) {
+            event.getView().close();
+        }
+    }
 }