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

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

@@ -4,21 +4,29 @@ 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 {

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

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

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?
-                            // same content if true
+                            if (Arrays.equals(shulkerBox1.getInventory().getContents(), shulkerBox2.getInventory().getContents()))
-                            return Arrays.equals(shulkerBox1.getInventory().getContents(), shulkerBox2.getInventory().getContents());
+                                return true; // same content
                         }
                     }
                     return true;
@@ -295,7 +295,7 @@ public class ItemMatcher {
         }
 
         if (item1 == null || item2 == null) {
-            return false;
+            return true;
         }
 
         if (!item1.getType().equals(item2.getType())) {
@@ -310,7 +310,7 @@ public class ItemMatcher {
             return metaMatches(item1, item2);
         }
 
-        return !item1.hasItemMeta() && !item2.hasItemMeta();
+        return !item1.hasItemMeta() && !item1.hasItemMeta();
     }
 
     protected static boolean metaMatches(ItemStack item1, ItemStack item2) {