Patch in the LivingEntity.isEquippableInSlot ItemInstance` overload

Author: ApexModder

patches/net/minecraft/world/entity/LivingEntity.java.patch

@@ -694,7 +694,7 @@
      }
 
      private static byte entityEventForEquipmentBreak(EquipmentSlot equipmentSlot) {
-@@ -3781,15 +_,16 @@
+@@ -3781,15 +_,26 @@
      }
 
      public final EquipmentSlot getEquipmentSlotForItem(ItemStack itemStack) {
@@ -704,14 +704,23 @@
          return equippable != null && this.canUseSlot(equippable.slot()) ? equippable.slot() : EquipmentSlot.MAINHAND;
      }
 
-+    /// @deprecated Neo: Use [net.neoforged.neoforge.common.extensions.ILivingEntityExtension#isEquippableInSlot(ItemInstance, EquipmentSlot)] instead
++    /// @deprecated Neo: Use [#isEquippableInSlot(ItemInstance, EquipmentSlot)] instead
 +    @Deprecated
      public final boolean isEquippableInSlot(ItemStack itemStack, EquipmentSlot slot) {
 -        Equippable equippable = itemStack.get(DataComponents.EQUIPPABLE);
--        return equippable == null
++        return isEquippableInSlot((ItemInstance) itemStack, slot);
++    }
++
++    /// [ItemInstance] sensetive version of [#isEquippableInSlot(ItemStack, EquipmentSlot)]
++    ///
++    /// Prefer calling via [net.neoforged.neoforge.common.extensions.ItemInstanceExtension#canEquip(EquipmentSlot, LivingEntity)] where possible
++    public final boolean isEquippableInSlot(ItemInstance item, EquipmentSlot slot) {
++        var equippable = item.get(DataComponents.EQUIPPABLE);
+         return equippable == null
 -            ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND)
 -            : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.typeHolder());
-+        return isEquippableInSlot((ItemInstance) itemStack, slot);
++                ? slot == EquipmentSlot.MAINHAND && self().canUseSlot(EquipmentSlot.MAINHAND)
++                : slot == equippable.slot() && self().canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(self().typeHolder());
      }
 
      private static SlotAccess createEquipmentSlotAccess(LivingEntity entity, EquipmentSlot equipmentSlot) {

src/main/java/net/neoforged/neoforge/common/extensions/ILivingEntityExtension.java

@@ -5,18 +5,13 @@
 
 package net.neoforged.neoforge.common.extensions;
 
-import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemInstance;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.neoforge.common.NeoForgeMod;
 import net.neoforged.neoforge.common.damagesource.DamageContainer;
 import net.neoforged.neoforge.fluids.FluidType;
-import org.jetbrains.annotations.ApiStatus;
 
 public interface ILivingEntityExtension extends IEntityExtension {
     default LivingEntity self() {
@@ -86,15 +81,4 @@ default boolean moveInFluid(FluidState state, Vec3 movementVector, double gravit
      *                        includes changes made to the damage sequence by events.
      */
     default void onDamageTaken(DamageContainer damageContainer) {}
-
-    /// [ItemInstance] sensetive version of [LivingEntity#isEquippableInSlot(ItemStack, EquipmentSlot)]
-    ///
-    /// Prefer calling via [ItemInstanceExtension#canEquip(EquipmentSlot, LivingEntity)] where possible
-    @ApiStatus.NonExtendable
-    default boolean isEquippableInSlot(ItemInstance item, EquipmentSlot slot) {
-        var equippable = item.get(DataComponents.EQUIPPABLE);
-        return equippable == null
-                ? slot == EquipmentSlot.MAINHAND && self().canUseSlot(EquipmentSlot.MAINHAND)
-                : slot == equippable.slot() && self().canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(self().typeHolder());
-    }
 }