address comments

Author: rossnoah

src/main/java/dev/noah/perplayerkit/ConfigMigrator.java

@@ -126,7 +126,7 @@ private Map<String, Object> extractCustomizedStrings(FileConfiguration userConfi
 
         if (userConfig.contains("disabled-command-message")) {
             String current = userConfig.getString("disabled-command-message");
-            String defaultValue = "<red>Kits are disabled here!</red>";
+            String defaultValue = defaults.getString("error.disabled-in-world");
             if (current != null && !current.equals(defaultValue)) {
                 diffs.put("error.disabled-in-world", current);
             }
@@ -151,7 +151,7 @@ private Map<String, Object> extractCustomizedStrings(FileConfiguration userConfi
                 continue;
             }
             String current = userConfig.getString(oldPath);
-            String defaultValue = defaults.getString(oldPath);
+            String defaultValue = defaults.getString(newKey);
             if (current != null && !current.equals(defaultValue)) {
                 diffs.put(newKey, current);
             }

src/main/java/dev/noah/perplayerkit/KitManager.java

@@ -370,6 +370,9 @@ private boolean loadKitInternal(Player player, String kitId, Runnable notFoundMe
     }
 
     public boolean loadKit(Player player, int slot) {
+        if (player == null) {
+            return false;
+        }
         return loadKitInternal(player, IDUtil.getPlayerKitId(player.getUniqueId(), slot),
                 () -> Lang.get().send(player, "error.kit-slot-not-found", "slot", String.valueOf(slot)),
                 false, () -> {
@@ -380,6 +383,9 @@ public boolean loadKit(Player player, int slot) {
     }
 
     public boolean loadKitSilent(Player player, int slot) {
+        if (player == null) {
+            return false;
+        }
         return loadKitInternal(player, IDUtil.getPlayerKitId(player.getUniqueId(), slot), null, false, null);
     }
 
@@ -403,6 +409,9 @@ public boolean loadPublicKitSilent(Player player, String id) {
     }
 
     public boolean loadEnderchest(Player player, int slot) {
+        if (player == null) {
+            return false;
+        }
         return loadKitInternal(player, IDUtil.getECId(player.getUniqueId(), slot),
                 () -> Lang.get().send(player, "error.kit-slot-not-found", "slot", String.valueOf(slot)),
                 true, () -> {
@@ -412,10 +421,16 @@ public boolean loadEnderchest(Player player, int slot) {
     }
 
     public boolean loadEnderchestSilent(Player player, int slot) {
+        if (player == null) {
+            return false;
+        }
         return loadKitInternal(player, IDUtil.getECId(player.getUniqueId(), slot), null, true, null);
     }
 
     public boolean loadLastKit(Player player) {
+        if (player == null) {
+            return false;
+        }
         if (lastKitUsedByPlayer.containsKey(player.getUniqueId())) {
             return loadKit(player, lastKitUsedByPlayer.get(player.getUniqueId()));
         }

src/main/java/dev/noah/perplayerkit/commands/features/RegearCommand.java

@@ -248,19 +248,30 @@ private Inventory createRegearInventory(RegearInventoryHolder holder) {
         Inventory inventory = Bukkit.createInventory(holder, 27,
                 StyleManager.get().getPrimaryColor() + Lang.get().legacy("gui.regear-shulker-title"));
         inventory.setItem(13, regearShellItem);
+        holder.setInventory(inventory);
         return inventory;
     }
 
 
-    public record RegearInventoryHolder(
-            Player player) implements InventoryHolder {
+    public static class RegearInventoryHolder implements InventoryHolder {
+        private final Player player;
+        private Inventory inventory;
+
+        public RegearInventoryHolder(Player player) {
+            this.player = player;
+        }
+
+        public Player player() {
+            return player;
+        }
+
+        private void setInventory(Inventory inventory) {
+            this.inventory = inventory;
+        }
 
         @Override
         public @NotNull Inventory getInventory() {
-            // Inventory is created externally via RegearCommand#createRegearInventory.
-            // This method is required by InventoryHolder but not used at runtime — the
-            // inventory is opened through createRegearInventory which assigns the holder.
-            throw new UnsupportedOperationException("Use RegearCommand#createRegearInventory");
+            return inventory;
         }
     }
 }

src/main/java/dev/noah/perplayerkit/gui/GUI.java

@@ -49,14 +49,25 @@ public class GUI {
     private final Plugin plugin;
     private final boolean filterItemsOnImport;
     private static final Set<UUID> kitDeletionFlag = new HashSet<>();
-    private static final Map<UUID, UUID> inspectTargets = new HashMap<>();
+    private static final Map<UUID, EditorContext> editorContexts = new HashMap<>();
 
-    public static void setInspectTarget(UUID inspector, UUID target) {
-        inspectTargets.put(inspector, target);
+    public enum EditorType {
+        KIT,
+        PUBLIC_KIT,
+        ENDERCHEST,
+        INSPECT_KIT,
+        INSPECT_ENDERCHEST
     }
 
-    public static UUID getAndRemoveInspectTarget(UUID inspector) {
-        return inspectTargets.remove(inspector);
+    public record EditorContext(EditorType type, int slot, String id, UUID target, String playerName) {
+    }
+
+    public static EditorContext getAndRemoveEditorContext(UUID viewer) {
+        return editorContexts.remove(viewer);
+    }
+
+    private static void setEditorContext(Player viewer, EditorContext context) {
+        editorContexts.put(viewer.getUniqueId(), context);
     }
 
     public GUI(Plugin plugin) {
@@ -106,6 +117,7 @@ public void OpenKitMenu(Player p, int slot) {
         menu.setCursorDropHandler(Menu.ALLOW_CURSOR_DROPPING);
 
         menu.open(p);
+        setEditorContext(p, new EditorContext(EditorType.KIT, slot, null, null, null));
     }
 
     public void OpenPublicKitEditor(Player p, String kitId) {
@@ -130,6 +142,7 @@ public void OpenPublicKitEditor(Player p, String kitId) {
         menu.setCursorDropHandler(Menu.ALLOW_CURSOR_DROPPING);
 
         menu.open(p);
+        setEditorContext(p, new EditorContext(EditorType.PUBLIC_KIT, 0, kitId, null, null));
     }
 
     public void OpenECKitKenu(Player p, int slot) {
@@ -153,11 +166,14 @@ public void OpenECKitKenu(Player p, int slot) {
         addImportEC(menu.getSlot(IMPORT_SLOT));
         menu.setCursorDropHandler(Menu.ALLOW_CURSOR_DROPPING);
         menu.open(p);
+        setEditorContext(p, new EditorContext(EditorType.ENDERCHEST, slot, null, null, null));
     }
 
     public void InspectKit(Player p, UUID target, int slot) {
-        setInspectTarget(p.getUniqueId(), target);
         String playerName = getPlayerName(target);
+        if (playerName == null) {
+            playerName = target.toString();
+        }
         Menu menu = GuiMenuFactory.createInspectMenu(slot, playerName);
 
         if (KitManager.get().hasKit(target, slot)) {
@@ -184,11 +200,11 @@ public void InspectKit(Player p, UUID target, int slot) {
 
         menu.setCursorDropHandler(Menu.ALLOW_CURSOR_DROPPING);
         menu.open(p);
+        setEditorContext(p, new EditorContext(EditorType.INSPECT_KIT, slot, null, target, playerName));
         SoundManager.playOpenGui(p);
     }
 
     public void InspectEc(Player p, UUID target, int slot) {
-        setInspectTarget(p.getUniqueId(), target);
         String playerName = getPlayerName(target);
         if (playerName == null) {
             playerName = target.toString();
@@ -220,6 +236,7 @@ public void InspectEc(Player p, UUID target, int slot) {
 
         menu.setCursorDropHandler(Menu.ALLOW_CURSOR_DROPPING);
         menu.open(p);
+        setEditorContext(p, new EditorContext(EditorType.INSPECT_ENDERCHEST, slot, null, target, playerName));
         SoundManager.playOpenGui(p);
     }