Fixed dupe bug in ItemMatcher and made hasRoom not modify the inventory contents.

src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java

@@ -4,29 +4,21 @@ import com.alttd.playershops.shop.PlayerShop;
 import com.alttd.playershops.shop.ShopType;
 import com.alttd.playershops.utils.EconomyUtils;
 import com.alttd.playershops.utils.ShopUtil;
-import com.alttd.playershops.utils.Util;
 import io.papermc.paper.dialog.Dialog;
 import io.papermc.paper.registry.data.dialog.ActionButton;
 import io.papermc.paper.registry.data.dialog.DialogBase;
 import io.papermc.paper.registry.data.dialog.action.DialogAction;
-import io.papermc.paper.registry.data.dialog.body.DialogBody;
 import io.papermc.paper.registry.data.dialog.input.DialogInput;
 import io.papermc.paper.registry.data.dialog.input.SingleOptionDialogInput;
 import io.papermc.paper.registry.data.dialog.type.DialogType;
-import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickCallback;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.UUID;
 
 public class ManageShopDialog extends AbstractDialog {
@@ -85,9 +77,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 +137,21 @@ public class ManageShopDialog extends AbstractDialog {
 
                     // Change Item
                     if (Boolean.TRUE.equals(view.getBoolean("changeitem"))) {
-                        String selection = view.getText("item");
+                        ItemStack itemStack = player.getInventory().getItemInMainHand().clone();
-                        if (selection != null) {
+                        shop.setItemStack(itemStack);
-                            if (selection.equalsIgnoreCase("reset")) {
+//                        String selection = view.getText("item");
-                                shop.setItemStack(null);
+//                        if (selection != null) {
-                            } else {
+//                            if (selection.equalsIgnoreCase("reset")) {
-                                int slot;
+//                                shop.setItemStack(null);
-                                try {
+//                            } else {
-                                    slot = Integer.parseInt(selection);
+//                                int slot;
-                                    shop.setItemStack(player.getInventory().getItem(slot));
+//                                try {
-                                } catch (NumberFormatException ignored) {
+//                                    slot = Integer.parseInt(selection);
-                                }
+//                                    shop.setItemStack(player.getInventory().getItem(slot));
-                            }
+//                                } catch (NumberFormatException ignored) {
-                        }
+//                                }
+//                            }
+//                        }
                     }
 
                     // Change Amount
@@ -188,27 +179,27 @@ public class ManageShopDialog extends AbstractDialog {
         actions.add(saveButton);
     }
 
-    List<SingleOptionDialogInput.OptionEntry> itemEntries() {
+//    List<SingleOptionDialogInput.OptionEntry> itemEntries() {
-        List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
+//        List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
-
+//
-        if (getPlayer() == null) {
+//        if (getPlayer() == null) {
-            return optionEntries;
+//            return optionEntries;
-        }
+//        }
-
+//
-        optionEntries.add(
+//        optionEntries.add(
-                SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>Reset"), false)
+//                SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>Reset"), false)
-        );
+//        );
-
+//
-        for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) {
+//        for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) {
-            ItemStack item = getPlayer().getInventory().getItem(i);
+//            ItemStack item = getPlayer().getInventory().getItem(i);
-            if (item == null || item.getType() == Material.AIR) continue;
+//            if (item == null || item.getType() == Material.AIR) continue;
-            ItemStack itemStack = item.clone();
+//            ItemStack itemStack = item.clone();
-            optionEntries.add(
+//            optionEntries.add(
-                    SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack)
+//                    SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack)
-            );
+//            );
-        }
+//        }
-
+//
-        return optionEntries;
+//        return optionEntries;
-    }
+//    }
 
 }

src/main/java/com/alttd/playershops/utils/InventoryUtils.java

@@ -109,17 +109,20 @@ public class InventoryUtils {
         if (itemStack.getAmount() <= 0)
             return true;
 
-        int overflow = addItem(inventory, itemStack);
+        int remaining = itemStack.getAmount();
 
-        //revert back if inventory cannot hold all of the items
+        for (ItemStack stack : inventory.getStorageContents()) {
-        if (overflow > 0) {
+            if (stack == null || stack.getType().isAir()) {
-            ItemStack revert = itemStack.clone();
+                remaining -= itemStack.getMaxStackSize();
-            revert.setAmount(revert.getAmount() - overflow);
+            } else if (stack.isSimilar(itemStack)) {
-            InventoryUtils.removeItem(inventory, revert);
+                remaining -= stack.getMaxStackSize() - stack.getAmount();
-            return false;
+            }
+
+            if (remaining <= 0)
+                return true;
         }
-        removeItem(inventory, itemStack);
+
-        return true;
+        return false;
     }
 
 }

src/main/java/com/alttd/playershops/utils/ItemMatcher.java

@@ -266,8 +266,8 @@ public class ItemMatcher {
                                 return false; // not the same color
 
                             // Do we need all of the above checks inside the shulker?
-                            if (Arrays.equals(shulkerBox1.getInventory().getContents(), shulkerBox2.getInventory().getContents()))
+                            // same content if true
-                                return true; // same content
+                            return Arrays.equals(shulkerBox1.getInventory().getContents(), shulkerBox2.getInventory().getContents());
                         }
                     }
                     return true;
@@ -295,7 +295,7 @@ public class ItemMatcher {
         }
 
         if (item1 == null || item2 == null) {
-            return true;
+            return false;
         }
 
         if (!item1.getType().equals(item2.getType())) {
@@ -310,7 +310,7 @@ public class ItemMatcher {
             return metaMatches(item1, item2);
         }
 
-        return !item1.hasItemMeta() && !item1.hasItemMeta();
+        return !item1.hasItemMeta() && !item2.hasItemMeta();
     }
 
     protected static boolean metaMatches(ItemStack item1, ItemStack item2) {