diff --git a/patches/minecraft/net/minecraft/world/item/Item.java.patch b/patches/minecraft/net/minecraft/world/item/Item.java.patch index ae659c31d6..ea24bb4b19 100644 --- a/patches/minecraft/net/minecraft/world/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/world/item/Item.java.patch @@ -68,10 +68,18 @@ return p_41436_.clip(new ClipContext(vec3, vec31, ClipContext.Block.OUTLINE, p_41438_, p_41437_)); } -+ @Deprecated // Use ItemStack sensitive version. ++ /** @deprecated in favor of {@link net.minecraftforge.common.extensions.IForgeItem#getEnchantmentValue(ItemStack)} */ public int getEnchantmentValue() { return 0; } +@@ -305,6 +_,7 @@ + return false; + } + ++ /** @deprecated in favor of {@link net.minecraftforge.common.extensions.IForgeItem#getDefaultAttributeModifiers(ItemStack)} */ + @Deprecated + public ItemAttributeModifiers getDefaultAttributeModifiers() { + return ItemAttributeModifiers.EMPTY; @@ -338,6 +_,30 @@ public FeatureFlagSet requiredFeatures() { return this.requiredFeatures; diff --git a/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch index c698d08e3e..13a838be0f 100644 --- a/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch @@ -57,6 +57,24 @@ return list; } } +@@ -923,7 +_,7 @@ + if (!itemattributemodifiers.modifiers().isEmpty()) { + itemattributemodifiers.forEach(p_344758_, p_342345_); + } else { +- this.getItem().getDefaultAttributeModifiers().forEach(p_344758_, p_342345_); ++ this.getDefaultAttributeModifiers().forEach(p_344758_, p_342345_); + } + + EnchantmentHelper.forEachModifier(this, p_344758_, p_342345_); +@@ -934,7 +_,7 @@ + if (!itemattributemodifiers.modifiers().isEmpty()) { + itemattributemodifiers.forEach(p_331036_, p_334430_); + } else { +- this.getItem().getDefaultAttributeModifiers().forEach(p_331036_, p_334430_); ++ this.getItem().getAttributeModifiers(p_331036_, this).forEach(p_331036_, p_334430_); + } + + EnchantmentHelper.forEachModifier(this, p_331036_, p_334430_); @@ -1011,6 +_,7 @@ this.getItem().onUseTick(p_41732_, p_41733_, this, p_41734_); } diff --git a/patches/minecraft/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java.patch b/patches/minecraft/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java.patch new file mode 100644 index 0000000000..acfafbc927 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java ++++ b/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java +@@ -66,7 +_,7 @@ + p_80840_.update( + DataComponents.ATTRIBUTE_MODIFIERS, + ItemAttributeModifiers.EMPTY, +- p_327582_ -> p_327582_.modifiers().isEmpty() ? this.updateModifiers(p_80841_, p_80840_.getItem().getDefaultAttributeModifiers()) : this.updateModifiers(p_80841_, p_327582_) ++ p_327582_ -> p_327582_.modifiers().isEmpty() ? this.updateModifiers(p_80841_, p_80840_.getDefaultAttributeModifiers()) : this.updateModifiers(p_80841_, p_327582_) + ); + } + diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java index c6dbcb8095..c8f186a8e3 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java @@ -12,7 +12,6 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.*; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.phys.AABB; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.entity.Entity; @@ -23,11 +22,11 @@ import net.minecraft.world.entity.monster.EnderMan; import net.minecraft.world.entity.monster.piglin.PiglinAi; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.InteractionResult; import net.minecraft.core.BlockPos; -import net.minecraft.core.Holder; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; @@ -45,10 +44,17 @@ public interface IForgeItem { } /** - * ItemStack sensitive version of getItemAttributeModifiers + * @deprecated In favor of {@link #getDefaultAttributeModifiers(ItemStack)} as it matches vanilla name, and not all cases that call this has the EquipmentSlot argument */ - @SuppressWarnings("deprecation") + @Deprecated(forRemoval = true, since = "1.21") default ItemAttributeModifiers getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { + return getDefaultAttributeModifiers(stack); + } + + /** + * ItemStack sensitive version of {@link Item#getDefaultAttributeModifiers} + */ + default ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { return self().getDefaultAttributeModifiers(); } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java index beb5cea397..d6e89cc4ad 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java @@ -18,8 +18,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionResult; @@ -403,4 +405,11 @@ public interface IForgeItemStack { default boolean canGrindstoneRepair() { return self().getItem().canGrindstoneRepair(self()); } + + /** + * ItemStack and Slot sensitive version of {@link Item#getItemAttributeModifiers} + */ + default ItemAttributeModifiers getDefaultAttributeModifiers() { + return self().getItem().getDefaultAttributeModifiers(self()); + } }