From 7c7b070cef8b9b82248bcaf87351a2252354e13a Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 7 May 2024 16:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BB=E9=80=80mixin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/mixins/LivingEntityMixin.java | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/src/main/java/net/mcreator/target/mixins/LivingEntityMixin.java b/src/main/java/net/mcreator/target/mixins/LivingEntityMixin.java index 0b4a2618d..5b266fa6b 100644 --- a/src/main/java/net/mcreator/target/mixins/LivingEntityMixin.java +++ b/src/main/java/net/mcreator/target/mixins/LivingEntityMixin.java @@ -1,43 +1,29 @@ package net.mcreator.target.mixins; -import net.mcreator.target.entity.ProjectileEntity; +import net.mcreator.target.init.TargetModDamageTypes; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -/** - * Author: MrCrayfish - */ @Mixin(LivingEntity.class) -public class LivingEntityMixin -{ - private DamageSource source; +public class LivingEntityMixin { + @Unique + private DamageSource target$source; @Inject(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;knockback(DDD)V")) - private void capture(DamageSource source, float amount, CallbackInfoReturnable cir) - { - this.source = source; + private void capture(DamageSource source, float amount, CallbackInfoReturnable cir) { + this.target$source = source; } @ModifyArg(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;knockback(DDD)V"), index = 0) - private double modifyApplyKnockbackArgs(double original) - { - if(this.source.getEntity() instanceof ProjectileEntity) - { - if(true) - { - return 0; - } - - double strength = 0; - if(strength > 0) - { - return strength; - } + private double modifyApplyKnockbackArgs(double original) { + if (this.target$source.is(TargetModDamageTypes.GUNFIRE)) { + return 0; } return original; }