|
34 | 34 | import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; |
35 | 35 | import com.llamalad7.mixinextras.sugar.Local; |
36 | 36 | import com.mojang.blaze3d.vertex.PoseStack; |
37 | | -import net.minecraft.client.Minecraft; |
38 | 37 | import net.minecraft.client.renderer.MultiBufferSource; |
39 | 38 | import net.minecraft.client.renderer.entity.EntityRenderer; |
40 | 39 | import net.minecraft.client.renderer.entity.EntityRendererProvider; |
|
55 | 54 | import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; |
56 | 55 | import org.spongepowered.asm.mixin.injection.invoke.arg.Args; |
57 | 56 |
|
58 | | -import java.util.Objects; |
59 | | - |
60 | 57 | @Mixin(FishingHookRenderer.class) |
61 | 58 | public abstract class MixinFishingHookRenderer extends EntityRenderer<FishingHook, FishingHookRenderState> { |
62 | 59 | protected MixinFishingHookRenderer(EntityRendererProvider.Context context) { |
@@ -140,9 +137,10 @@ protected MixinFishingHookRenderer(EntityRendererProvider.Context context) { |
140 | 137 | } |
141 | 138 |
|
142 | 139 | @ModifyArg(method = "extractRenderState(Lnet/minecraft/world/entity/projectile/FishingHook;Lnet/minecraft/client/renderer/entity/state/FishingHookRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/FishingHookRenderer;getPlayerHandPos(Lnet/minecraft/world/entity/player/Player;FF)Lnet/minecraft/world/phys/Vec3;"), index = 1) |
143 | | - private float animatium$fixCastLineSwing(float original) { |
144 | | - if (AnimatiumConfig.instance().fixCastLineSwing) { |
145 | | - return original * PlayerUtils.getHandMultiplier(Objects.requireNonNull(Minecraft.getInstance().player)); |
| 140 | + private float animatium$fixCastLineSwing(float original, @Local(argsOnly = true) FishingHook fishingHook) { |
| 141 | + final Player player = fishingHook.getPlayerOwner(); |
| 142 | + if (AnimatiumConfig.instance().fixCastLineSwing && player != null) { |
| 143 | + return original * PlayerUtils.getHandMultiplier(player); |
146 | 144 | } else { |
147 | 145 | return original; |
148 | 146 | } |
|
0 commit comments