Fixed issue where potions dont show in custom kit item editor

Devlrxxh · Devlrxxh · commit 39acbd73de68 · 2026-05-31T19:09:14.000+02:00
diff --git a/Plugin/src/main/java/com/jonahseguin/drink/parametric/CommandParameters.java b/Plugin/src/main/java/com/jonahseguin/drink/parametric/CommandParameters.java
@@ -6,12 +6,16 @@
 public record CommandParameters(int count, CommandParameter[] parameters) {
 
     public CommandParameters(Method method) {
+        this(method.getParameterCount(), buildParameters(method));
+    }
+
+    private static CommandParameter[] buildParameters(Method method) {
         CommandParameter[] parameters = new CommandParameter[method.getParameters().length];
         for (int i = 0; i < method.getParameters().length; i++) {
             Parameter param = method.getParameters()[i];
             parameters[i] = new CommandParameter(param.getType(), param, method.getParameterAnnotations()[i]);
         }
-        this(method.getParameterCount(), parameters);
+        return parameters;
     }
 
     public boolean isLastArgument(int index) {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/customkit/menu/CustomKitEditorMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/customkit/menu/CustomKitEditorMenu.java
@@ -99,8 +99,8 @@ public void onClick(ClickType type, Player p) {
                     }
                     return;
                 }
-                ItemBrowserService.get().openBrowser(p, section, material -> {
-                    kit.setItemAt(contentsIndex, new ItemStack(material));
+                ItemBrowserService.get().openItemBrowser(p, section, selected -> {
+                    kit.setItemAt(contentsIndex, selected);
                     save(p);
                     new CustomKitEditorMenu(kit).open(p);
                 }, () -> new CustomKitEditorMenu(kit).open(p));
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/customkit/menu/CustomKitManageMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/customkit/menu/CustomKitManageMenu.java
@@ -65,8 +65,8 @@ public List<Button> getButtons(Player player) {
         buttons.add(action(MenusLocale.CUSTOM_KIT_MANAGE_ICON_SLOT.getInt(),
                 new ItemBuilder(MenusLocale.CUSTOM_KIT_MANAGE_ICON_MATERIAL.getString())
                         .name(MenusLocale.CUSTOM_KIT_MANAGE_ICON_NAME.getString()).build(),
-                p -> ItemBrowserService.get().openBrowser(p, "items", material -> {
-                    kit.setIcon(new ItemStack(material));
+                p -> ItemBrowserService.get().openItemBrowser(p, "items", item -> {
+                    kit.setIcon(item);
                     save(p);
                     new CustomKitManageMenu(kit).open(p);
                 }, () -> new CustomKitManageMenu(kit).open(p))));
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/itembrowser/ItemBrowserMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/itembrowser/ItemBrowserMenu.java
@@ -9,6 +9,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,11 +19,11 @@ public class ItemBrowserMenu extends PaginatedMenu {
 
     private final ItemBrowserService service;
     private final String section;
-    private final Consumer<Material> itemConsumer;
+    private final Consumer<ItemStack> itemConsumer;
     private final Runnable returnConsumer;
     private final String search;
 
-    public ItemBrowserMenu(ItemBrowserService service, String section, Consumer<Material> itemConsumer, String search,
+    public ItemBrowserMenu(ItemBrowserService service, String section, Consumer<ItemStack> itemConsumer, String search,
                            Runnable returnConsumer) {
         super("&fItem Browser", 54, Filter.NONE);
         this.service = service;
@@ -32,8 +33,8 @@ public ItemBrowserMenu(ItemBrowserService service, String section, Consumer<Mate
         this.returnConsumer = returnConsumer;
     }
 
-    private static String formatName(Material material) {
-        String[] words = material.name().toLowerCase().split("_");
+    private static String formatName(String raw) {
+        String[] words = raw.toLowerCase().split("_");
         StringBuilder sb = new StringBuilder();
         for (String word : words) {
             if (word.isEmpty()) continue;
@@ -42,32 +43,42 @@ private static String formatName(Material material) {
         return sb.toString().trim();
     }
 
+    private static String displayName(ItemStack item) {
+        String base = formatName(item.getType().name());
+        if (item.getItemMeta() instanceof PotionMeta meta && meta.getBasePotionType() != null) {
+            return base + " - " + formatName(meta.getBasePotionType().name());
+        }
+        return base;
+    }
+
     @Override
     public List<Button> getAllPagesButtons(Player player) {
-        List<Material> items = service.getItems(section);
+        List<ItemStack> items = service.getItemStacks(section);
         if (!search.isEmpty()) {
             String q = search.toLowerCase();
             items = items.stream()
-                    .filter(mat -> mat.name().toLowerCase().contains(q) || formatName(mat).toLowerCase().contains(q))
+                    .filter(item -> displayName(item).toLowerCase().contains(q)
+                            || item.getType().name().toLowerCase().contains(q))
                     .toList();
         }
         List<Button> buttons = new ArrayList<>();
         int i = 0;
-        for (Material mat : items) {
-            if (!mat.isItem())
+        for (ItemStack item : items) {
+            if (!item.getType().isItem())
                 continue;
+            ItemStack stack = item;
             buttons.add(new Button(i++) {
                 @Override
                 public ItemStack getItemStack(Player p) {
-                    return new ItemBuilder(mat)
-                            .name("&f" + formatName(mat))
+                    return new ItemBuilder(stack.clone())
+                            .name("&f" + displayName(stack))
                             .lore(MenusLocale.ITEM_BROWSER_ITEM_LORE.getStringList())
                             .build();
                 }
 
                 @Override
                 public void onClick(ClickType type, Player p) {
-                    itemConsumer.accept(mat);
+                    itemConsumer.accept(stack.clone());
                 }
             });
         }
@@ -112,4 +123,4 @@ public void onClick(ClickType type, Player p) {
     public int getMaxItemsPerPage() {
         return 36;
     }
-}
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/itembrowser/ItemBrowserService.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/itembrowser/ItemBrowserService.java
@@ -7,16 +7,22 @@
 import org.bukkit.Registry;
 import org.bukkit.block.BlockType;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+import org.bukkit.potion.PotionType;
 
 import java.util.*;
 import java.util.function.Consumer;
 
 public class ItemBrowserService implements IItemBrowserService {
 
+    private static final Set<Material> POTION_MATERIALS = Set.of(
+            Material.POTION, Material.SPLASH_POTION, Material.LINGERING_POTION, Material.TIPPED_ARROW);
+
     private static ItemBrowserService instance;
 
     private final Map<String, List<Material>> sectionMaterials = new HashMap<>();
-    private final Map<String, List<Material>> computed = new HashMap<>();
+    private final Map<String, List<ItemStack>> computed = new HashMap<>();
 
     public static ItemBrowserService get() {
         if (instance == null) {
@@ -27,15 +33,25 @@ public static ItemBrowserService get() {
 
     @Override
     public List<Material> getItems(String section) {
+        return getItemStacks(section).stream().map(ItemStack::getType).distinct().toList();
+    }
+
+    public List<ItemStack> getItemStacks(String section) {
         return switch (section) {
             case "blocks", "items", "helmet", "chestplate", "leggings", "boots" ->
                     computed.computeIfAbsent(section, this::computeSection);
-            default -> sectionMaterials.getOrDefault(section, Collections.emptyList());
+            default -> {
+                List<ItemStack> list = new ArrayList<>();
+                for (Material m : sectionMaterials.getOrDefault(section, Collections.emptyList())) {
+                    list.add(new ItemStack(m));
+                }
+                yield list;
+            }
         };
     }
 
-    private List<Material> computeSection(String section) {
-        return switch (section) {
+    private List<ItemStack> computeSection(String section) {
+        List<Material> materials = switch (section) {
             case "blocks" -> getBlocks();
             case "items" -> getAllItems();
             case "helmet" -> bySuffix("_HELMET");
@@ -44,6 +60,23 @@ private List<Material> computeSection(String section) {
             case "boots" -> bySuffix("_BOOTS");
             default -> Collections.emptyList();
         };
+        List<ItemStack> list = new ArrayList<>();
+        for (Material m : materials) {
+            if (!m.isItem()) continue;
+            if (POTION_MATERIALS.contains(m)) {
+                for (PotionType type : PotionType.values()) {
+                    ItemStack stack = new ItemStack(m);
+                    if (stack.getItemMeta() instanceof PotionMeta meta) {
+                        meta.setBasePotionType(type);
+                        stack.setItemMeta(meta);
+                    }
+                    list.add(stack);
+                }
+            } else {
+                list.add(new ItemStack(m));
+            }
+        }
+        return list;
     }
 
     public void preloadSections() {
@@ -82,17 +115,21 @@ public List<Material> getBlocks() {
 
     @Override
     public void openBrowser(Player player, String section, Consumer<Material> itemConsumer, Runnable returnConsumer) {
-        openBrowser(player, section, itemConsumer, "", returnConsumer);
+        openItemBrowser(player, section, item -> itemConsumer.accept(item.getType()), "", returnConsumer);
+    }
+
+    public void openItemBrowser(Player player, String section, Consumer<ItemStack> itemConsumer, Runnable returnConsumer) {
+        openItemBrowser(player, section, itemConsumer, "", returnConsumer);
     }
 
-    public void openBrowser(Player player, String section, Consumer<Material> itemConsumer, String search, Runnable returnConsumer) {
+    public void openItemBrowser(Player player, String section, Consumer<ItemStack> itemConsumer, String search, Runnable returnConsumer) {
         new ItemBrowserMenu(get(), section, itemConsumer, search, returnConsumer).open(player);
     }
 
-    public void requestSearch(Player player, String section, Consumer<Material> itemConsumer, Runnable returnConsumer) {
+    public void requestSearch(Player player, String section, Consumer<ItemStack> itemConsumer, Runnable returnConsumer) {
         player.closeInventory();
         SignInputMenu.open(player, "", SignsLocale.ITEM_BROWSER_SEARCH.getStringList(), input ->
-                openBrowser(player, section, itemConsumer, input, returnConsumer));
+                openItemBrowser(player, section, itemConsumer, input, returnConsumer));
     }
 
     @Override
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/leaderboard/impl/LeaderboardPlayerEntry.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/leaderboard/impl/LeaderboardPlayerEntry.java
@@ -5,6 +5,5 @@
 
 import java.util.UUID;
 
-@AllArgsConstructor
 public record LeaderboardPlayerEntry(String username, UUID playerUUID, Kit kit) {
 }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/leaderboard/impl/PlayerEntry.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/leaderboard/impl/PlayerEntry.java
@@ -4,6 +4,5 @@
 
 import java.util.UUID;
 
-@AllArgsConstructor
 public record PlayerEntry(String username, UUID uuid, int value) {
 }

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ public void onClick(ClickType type, Player p) {`
`99`	`99`	`}`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`		`- ItemBrowserService.get().openBrowser(p, section, material -> {`
`103`		`- kit.setItemAt(contentsIndex, new ItemStack(material));`
	`102`	`+ ItemBrowserService.get().openItemBrowser(p, section, selected -> {`
	`103`	`+ kit.setItemAt(contentsIndex, selected);`
`104`	`104`	`save(p);`
`105`	`105`	`new CustomKitEditorMenu(kit).open(p);`
`106`	`106`	`}, () -> new CustomKitEditorMenu(kit).open(p));`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,5 @@`
`5`	`5`
`6`	`6`	`import java.util.UUID;`
`7`	`7`
`8`		`-@AllArgsConstructor`
`9`	`8`	`public record LeaderboardPlayerEntry(String username, UUID playerUUID, Kit kit) {`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@`
`4`	`4`
`5`	`5`	`import java.util.UUID;`
`6`	`6`
`7`		`-@AllArgsConstructor`
`8`	`7`	`public record PlayerEntry(String username, UUID uuid, int value) {`
`9`	`8`	`}`