From 5524b1ef1ea6973b09d129fafb25f3b10bde8503 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Thu, 8 Dec 2022 21:24:10 +0800 Subject: [PATCH] Fix mixin conflict with Apotheosis (#811) They use overwrite --- .../mixin/core/world/entity/LivingEntityMixin.java | 11 ++++++++--- .../src/main/resources/mixins.arclight.core.json | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java index 0ad3ebdb..1bfa5965 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java @@ -975,9 +975,14 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt } } - @Redirect(method = "getDamageAfterMagicAbsorb", require = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/world/effect/MobEffect;)Z")) - public boolean arclight$mutePotion(LivingEntity livingEntity, MobEffect potionIn) { - return false; + // https://github.com/IzzelAliz/Arclight/issues/811 + @Mixin(value = LivingEntity.class, priority = 1500) + public static class ApotheosisCompatMixin { + + @Redirect(method = "getDamageAfterMagicAbsorb", require = 0, at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/world/effect/MobEffect;)Z")) + public boolean arclight$mutePotion(LivingEntity livingEntity, MobEffect potionIn) { + return false; + } } @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;setSharedFlag(IZ)V")) diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json index 549c156b..b9ff759b 100644 --- a/arclight-common/src/main/resources/mixins.arclight.core.json +++ b/arclight-common/src/main/resources/mixins.arclight.core.json @@ -96,6 +96,7 @@ "world.entity.ItemBaseSteeringMixin", "world.entity.LightningBoltMixin", "world.entity.LivingEntityMixin", + "world.entity.LivingEntityMixin$ApotheosisCompatMixin", "world.entity.LivingEntityMixin$ObscureApiCompat", "world.entity.MobMixin", "world.entity.PathfinderMobMixin",