From 9cf43d9f7e151980ae2ddf046009d85796875749 Mon Sep 17 00:00:00 2001
From: Vidal <imnotputtingmyemailhereami@gmail.com>
Date: Thu, 5 Mar 2026 02:35:53 -0300
Subject: [PATCH] Renamed AMMO to COUNT and cleaned up legacy code

---
 gradle-plugins                                |  2 +-
 .../ability/conditions/ConditionItem.java     | 26 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/gradle-plugins b/gradle-plugins
index dc0350128..19dc9a836 160000
--- a/gradle-plugins
+++ b/gradle-plugins
@@ -1 +1 @@
-Subproject commit dc0350128ae8bc81ddde6615816b29f35de2959c
+Subproject commit 19dc9a836148062fa744b9a9ca87391f84274b44
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java
index 221a68f63..21c8669ea 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java
@@ -15,7 +15,7 @@ import java.util.List;
 public class ConditionItem extends AbilityCondition {
 
     public enum UsageType {
-        ARMOR, HOLDING, AMMO, OFFHAND;
+        ARMOR, HOLDING, COUNT, OFFHAND;
 
         public static UsageType fromOrdinal(int ordinal) {
             UsageType[] values = values();
@@ -40,7 +40,7 @@ public class ConditionItem extends AbilityCondition {
     private ArmorSlot armorSlot = ArmorSlot.BOOTS;
     private boolean fullArmorSet = false;
 
-    // AMMO + PLAYER only
+    // COUNT + PLAYER only
     private int requiredCount = 1;
 
     public ConditionItem() {
@@ -55,8 +55,8 @@ public class ConditionItem extends AbilityCondition {
                 return checkHolding(entity);
             case ARMOR:
                 return checkArmor(entity);
-            case AMMO:
-                return checkAmmo(entity);
+            case COUNT:
+                return checkCount(entity);
             case OFFHAND:
                 return checkOffhand(entity);
             default:
@@ -75,17 +75,7 @@ public class ConditionItem extends AbilityCondition {
         return matchesItem(entity.getEquipmentInSlot(slot));
     }
 
-    private boolean checkFullArmor(EntityLivingBase entity) {
-        for (int i = 0; i < 4; i++) {
-            int slot = i + 1;
-            if (!matchesItem(i, entity.getEquipmentInSlot(slot)))
-                return false;
-        }
-
-        return true;
-    }
-
-    private boolean checkAmmo(EntityLivingBase entity) {
+    private boolean checkCount(EntityLivingBase entity) {
         if (entity instanceof EntityPlayer) {
             return checkPlayerInventoryCount((EntityPlayer) entity);
         }
@@ -121,10 +111,6 @@ public class ConditionItem extends AbilityCondition {
     }
 
     private boolean matchesItem(ItemStack stack) {
-        return matchesItem(0, stack);
-    }
-
-    private boolean matchesItem(int index, ItemStack stack) {
         if (stack == null || itemName == null || itemName.isEmpty()) return false;
         String registryName = net.minecraft.item.Item.itemRegistry.getNameForObject(stack.getItem());
         return itemName.equals(registryName);
@@ -148,7 +134,7 @@ public class ConditionItem extends AbilityCondition {
         defs.add(FieldDef.intField("condition.item_count",
                 this::getRequiredCount, this::setRequiredCount)
             .range(1, 64)
-            .visibleWhen(() -> usageType == UsageType.AMMO && userType.allowsPlayer())
+            .visibleWhen(() -> usageType == UsageType.COUNT && userType.allowsPlayer())
             .hover("condition.hover.required_count"));
     }