Update shop change item option to use the item in the players mainhand.

This commit is contained in:
Len 2026-08-10 03:43:44 -05:00
parent c209e0098a
commit af6c052404

View File

@ -85,9 +85,6 @@ public class ManageShopDialog extends AbstractDialog {
.initial(false)
.build()
);
inputs.add(
DialogInput.singleOption("item", MiniMessage.miniMessage().deserialize("<gold>Item</gold>"), 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<SingleOptionDialogInput.OptionEntry> itemEntries() {
List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
if (getPlayer() == null) {
return optionEntries;
}
optionEntries.add(
SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>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<SingleOptionDialogInput.OptionEntry> itemEntries() {
// List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
//
// if (getPlayer() == null) {
// return optionEntries;
// }
//
// optionEntries.add(
// SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>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;
// }
}