From af6c05240444656e23cbfa6d57cf1d26d8491878 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Mon, 10 Aug 2026 03:43:44 -0500 Subject: [PATCH] Update shop change item option to use the item in the players mainhand. --- .../playershops/dialog/ManageShopDialog.java | 75 +++++++++---------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java b/src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java index a96ae84..69cdbc7 100644 --- a/src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java +++ b/src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java @@ -85,9 +85,6 @@ public class ManageShopDialog extends AbstractDialog { .initial(false) .build() ); - inputs.add( - DialogInput.singleOption("item", MiniMessage.miniMessage().deserialize("Item"), itemEntries()).build() - ); int maxQty = (shop.isInitialized() && shop.getItemStack() != null ? shop.getItemStack().getMaxStackSize() : 64); int initialQty = (shop.isInitialized() ? Math.min(shop.getAmount(), maxQty) : 1); inputs.add( @@ -148,19 +145,21 @@ public class ManageShopDialog extends AbstractDialog { // Change Item if (Boolean.TRUE.equals(view.getBoolean("changeitem"))) { - String selection = view.getText("item"); - if (selection != null) { - if (selection.equalsIgnoreCase("reset")) { - shop.setItemStack(null); - } else { - int slot; - try { - slot = Integer.parseInt(selection); - shop.setItemStack(player.getInventory().getItem(slot)); - } catch (NumberFormatException ignored) { - } - } - } + ItemStack itemStack = player.getInventory().getItemInMainHand().clone(); + shop.setItemStack(itemStack); +// String selection = view.getText("item"); +// if (selection != null) { +// if (selection.equalsIgnoreCase("reset")) { +// shop.setItemStack(null); +// } else { +// int slot; +// try { +// slot = Integer.parseInt(selection); +// shop.setItemStack(player.getInventory().getItem(slot)); +// } catch (NumberFormatException ignored) { +// } +// } +// } } // Change Amount @@ -188,27 +187,27 @@ public class ManageShopDialog extends AbstractDialog { actions.add(saveButton); } - List itemEntries() { - List optionEntries = new ArrayList<>(); - - if (getPlayer() == null) { - return optionEntries; - } - - optionEntries.add( - SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("Reset"), false) - ); - - for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) { - ItemStack item = getPlayer().getInventory().getItem(i); - if (item == null || item.getType() == Material.AIR) continue; - ItemStack itemStack = item.clone(); - optionEntries.add( - SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack) - ); - } - - return optionEntries; - } +// List itemEntries() { +// List optionEntries = new ArrayList<>(); +// +// if (getPlayer() == null) { +// return optionEntries; +// } +// +// optionEntries.add( +// SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("Reset"), false) +// ); +// +// for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) { +// ItemStack item = getPlayer().getInventory().getItem(i); +// if (item == null || item.getType() == Material.AIR) continue; +// ItemStack itemStack = item.clone(); +// optionEntries.add( +// SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack) +// ); +// } +// +// return optionEntries; +// } }