Fix inventory item matching with components in fabric

PrimordialMoros · Oct 3, 2024 · 0b08794 · 0b08794
1 parent 027fbec
commit 0b08794
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/fabric/src/main/java/me/moros/bending/fabric/platform/item/FabricPlayerInventory.java b/fabric/src/main/java/me/moros/bending/fabric/platform/item/FabricPlayerInventory.java
@@ -45,7 +45,27 @@ public int selectedSlot() {
 
   @Override
   public boolean has(Item type, int amount) {
-    return handle.contains(new ItemStack(PlatformAdapter.toFabricItemType(type), amount));
+    if (amount <= 0) {
+      return false;
+    }
+    ItemStack toMatch = new ItemStack(PlatformAdapter.toFabricItemType(type), amount);
+    return hasItemInSubContainer(handle.items, toMatch)
+      || hasItemInSubContainer(handle.armor, toMatch)
+      || hasItemInSubContainer(handle.offhand, toMatch);
+  }
+
+  private boolean hasItemInSubContainer(Iterable<ItemStack> container, ItemStack neededItem) {
+    for (ItemStack item : container) {
+      if (!item.isEmpty() && ItemStack.isSameItem(item, neededItem)) {
+        int count = item.getCount();
+        if (count >= neededItem.getCount()) {
+          return true;
+        } else {
+          neededItem.shrink(count);
+        }
+      }
+    }
+    return false;
   }
 
   @Override