refactor: replace ItemArmorBaseComponent with ItemWearableComponent across API and server code

Author: smartcmd

CHANGELOG.md

@@ -17,6 +17,7 @@ Unless otherwise specified, any version comparison below is the comparison of th
 - (API) Added camera shake API (`Player.shakeCamera()`, `Player.stopCameraShake()`) and implemented `/camerashake` command.
 - (API) Added fog API (`Player.pushFog()`, `Player.popFog()`, `Player.removeFog()`, `Player.removeAllFogs()`, `Player.getFogs()`) with `FogIds` constants, and implemented `/fog` command.
 - (API) Added `BiomeTags` constants interface with code-generated biome tag definitions.
+- (API) Added `ItemWearableComponent` as the shared wearable contract for armor, elytra, carved pumpkins, and heads.
 - Added custom biome support. Plugins can register custom biomes via `new AllayBiomeType(Identifier, BiomeData)` with auto-allocated persistent IDs (starting from 30000, saved to `biome_ids.yml`).
 - Added `AllayBlockType.Builder.customizeItemType(Consumer<AllayItemType.Builder>)` to customize automatically generated block item types for custom blocks.
 - Added `BlockStateDefinition.MaterialInstance.alphaTestToOpaque(String)`, `alphaTestSingleSidedToOpaque(String)`, and `blendToOpaque(String)` convenience factories for custom block material instances.

…em/component/ItemArmorBaseComponent.java …tem/component/ItemWearableComponent.javaapi/src/main/java/org/allaymc/api/item/component/ItemArmorBaseComponent.java renamed to api/src/main/java/org/allaymc/api/item/component/ItemWearableComponent.java api/src/main/java/org/allaymc/api/item/component/ItemArmorBaseComponent.java renamed to api/src/main/java/org/allaymc/api/item/component/ItemWearableComponent.java

@@ -3,12 +3,13 @@
 import org.allaymc.api.item.data.ArmorType;
 
 /**
+ * Component for wearable items.
+ *
  * @author daoge_cmd
  */
-public interface ItemArmorBaseComponent extends ItemBaseComponent {
-
+public interface ItemWearableComponent extends ItemComponent {
     /**
-     * Returns the armor type of the item.
+     * Returns the armor type of this item.
      *
      * @return The armor type
      */

api/src/main/java/org/allaymc/api/item/enchantment/ApplicableType.java

@@ -1,7 +1,7 @@
 package org.allaymc.api.item.enchantment;
 
 import org.allaymc.api.item.ItemHelper;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 import org.allaymc.api.item.data.ArmorType;
 import org.allaymc.api.item.type.ItemType;
 import org.allaymc.api.item.type.ItemTypes;
@@ -45,7 +45,7 @@ public boolean canBeAppliedTo(ItemType<?> itemType) {
     HELMET {
         @Override
         public boolean canBeAppliedTo(ItemType<?> itemType) {
-            if (itemType.createItemStack() instanceof ItemArmorBaseComponent armor) {
+            if (ItemHelper.isArmor(itemType) && itemType.createItemStack() instanceof ItemWearableComponent armor) {
                 return armor.getArmorType() == ArmorType.HELMET;
             }
 
@@ -58,7 +58,7 @@ public boolean canBeAppliedTo(ItemType<?> itemType) {
     CHESTPLATE {
         @Override
         public boolean canBeAppliedTo(ItemType<?> itemType) {
-            if (itemType.createItemStack() instanceof ItemArmorBaseComponent armor) {
+            if (ItemHelper.isArmor(itemType) && itemType.createItemStack() instanceof ItemWearableComponent armor) {
                 return armor.getArmorType() == ArmorType.CHESTPLATE;
             }
 
@@ -71,7 +71,7 @@ public boolean canBeAppliedTo(ItemType<?> itemType) {
     LEGGINGS {
         @Override
         public boolean canBeAppliedTo(ItemType<?> itemType) {
-            if (itemType.createItemStack() instanceof ItemArmorBaseComponent armor) {
+            if (ItemHelper.isArmor(itemType) && itemType.createItemStack() instanceof ItemWearableComponent armor) {
                 return armor.getArmorType() == ArmorType.LEGGINGS;
             }
 
@@ -84,7 +84,7 @@ public boolean canBeAppliedTo(ItemType<?> itemType) {
     BOOTS {
         @Override
         public boolean canBeAppliedTo(ItemType<?> itemType) {
-            if (itemType.createItemStack() instanceof ItemArmorBaseComponent armor) {
+            if (ItemHelper.isArmor(itemType) && itemType.createItemStack() instanceof ItemWearableComponent armor) {
                 return armor.getArmorType() == ArmorType.BOOTS;
             }
 
@@ -160,7 +160,7 @@ public boolean canBeAppliedTo(ItemType<?> itemType) {
     WEARABLE {
         @Override
         public boolean canBeAppliedTo(ItemType<?> itemType) {
-            return ItemHelper.isArmor(itemType) || itemType == ItemTypes.CARVED_PUMPKIN || ItemHelper.isHead(itemType);
+            return itemType.createItemStack() instanceof ItemWearableComponent;
         }
     },
     /**

api/src/main/java/org/allaymc/api/item/interfaces/ItemBootsStack.java

@@ -1,8 +1,8 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
 import org.allaymc.api.item.component.ItemTrimmableComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemBootsStack extends ItemStack, ItemArmorBaseComponent, ItemTrimmableComponent {
+public interface ItemBootsStack extends ItemStack, ItemWearableComponent, ItemTrimmableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemCarvedPumpkinStack.java

@@ -1,6 +1,7 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemCarvedPumpkinStack extends ItemStack {
+public interface ItemCarvedPumpkinStack extends ItemStack, ItemWearableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemChestplateStack.java

@@ -1,9 +1,9 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
 import org.allaymc.api.item.component.ItemRepairableComponent;
 import org.allaymc.api.item.component.ItemTrimmableComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemChestplateStack extends ItemStack, ItemArmorBaseComponent, ItemTrimmableComponent, ItemRepairableComponent {
+public interface ItemChestplateStack extends ItemStack, ItemWearableComponent, ItemTrimmableComponent, ItemRepairableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemElytraStack.java

@@ -1,8 +1,8 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
 import org.allaymc.api.item.component.ItemRepairableComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemElytraStack extends ItemStack, ItemArmorBaseComponent, ItemRepairableComponent {
+public interface ItemElytraStack extends ItemStack, ItemWearableComponent, ItemRepairableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemHeadStack.java

@@ -1,6 +1,7 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemHeadStack extends ItemStack {
+public interface ItemHeadStack extends ItemStack, ItemWearableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemHelmetStack.java

@@ -1,9 +1,9 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
 import org.allaymc.api.item.component.ItemRepairableComponent;
 import org.allaymc.api.item.component.ItemTrimmableComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemHelmetStack extends ItemStack, ItemArmorBaseComponent, ItemTrimmableComponent, ItemRepairableComponent {
+public interface ItemHelmetStack extends ItemStack, ItemWearableComponent, ItemTrimmableComponent, ItemRepairableComponent {
 }

api/src/main/java/org/allaymc/api/item/interfaces/ItemLeggingsStack.java

@@ -1,8 +1,8 @@
 package org.allaymc.api.item.interfaces;
 
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.item.component.ItemArmorBaseComponent;
 import org.allaymc.api.item.component.ItemTrimmableComponent;
+import org.allaymc.api.item.component.ItemWearableComponent;
 
-public interface ItemLeggingsStack extends ItemStack, ItemArmorBaseComponent, ItemTrimmableComponent {
+public interface ItemLeggingsStack extends ItemStack, ItemWearableComponent, ItemTrimmableComponent {
 }