From 7de09f55c6f45fb99e02ce249e25eede8d644525 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 23 Nov 2021 17:33:00 +0000 Subject: [PATCH] 1.18-pre7 --- .../fabric/mixin/tool/attribute/LivingEntityMixin.java | 8 ++++---- gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/LivingEntityMixin.java b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/LivingEntityMixin.java index 2b7eb954f..a3826239d 100644 --- a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/LivingEntityMixin.java +++ b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/LivingEntityMixin.java @@ -44,13 +44,13 @@ public class LivingEntityMixin { @Nullable @Unique private EquipmentSlot slotContext = null; - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment", locals = LocalCapture.CAPTURE_FAILHARD) + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipmentChanges", locals = LocalCapture.CAPTURE_FAILHARD) private void storeRemoveStackContext(CallbackInfoReturnable cir, Map map, EquipmentSlot[] var2, int var3, int var4, EquipmentSlot equipmentSlot, ItemStack oldStack, ItemStack newStack) { stackContext = oldStack; slotContext = equipmentSlot; } - @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment") + @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipmentChanges") private void setupRemoveModifierContext(AttributeContainer attributeContainer, Multimap oldModifiers) { ((ItemStackContext) (Object) stackContext).fabricToolAttributes_setContext((LivingEntity) (Object) this); Multimap attributeModifiers = stackContext.getAttributeModifiers(slotContext); @@ -58,13 +58,13 @@ public class LivingEntityMixin { attributeContainer.removeModifiers(attributeModifiers); } - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment", locals = LocalCapture.CAPTURE_FAILHARD) + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipmentChanges", locals = LocalCapture.CAPTURE_FAILHARD) private void storeAddStackContext(CallbackInfoReturnable cir, Map map, EquipmentSlot[] var2, int var3, int var4, EquipmentSlot equipmentSlot, ItemStack oldStack, ItemStack newStack) { stackContext = newStack; slotContext = equipmentSlot; } - @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment") + @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipmentChanges") private void setupAddModifierContext(AttributeContainer attributeContainer, Multimap oldModifiers) { ((ItemStackContext) (Object) stackContext).fabricToolAttributes_setContext((LivingEntity) (Object) this); Multimap attributeModifiers = stackContext.getAttributeModifiers(slotContext); diff --git a/gradle.properties b/gradle.properties index fa7b525c2..42f14d41b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx2560M version=0.42.9 -minecraft_version=1.18-pre6 -yarn_version=+build.1 +minecraft_version=1.18-pre7 +yarn_version=+build.2 loader_version=0.12.5 prerelease=true