From 8c01afcf8fe97f3ad2ff49e62684006a295fe620 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 21 Dec 2024 15:28:38 +0100 Subject: [PATCH] Fix shadow offset issue pre 1.21.3 --- .../firstperson/mixins/RenderDispatcherMixin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/RenderDispatcherMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/RenderDispatcherMixin.java index 8c25c4f..7ce86fe 100644 --- a/src/main/java/dev/tr7zw/firstperson/mixins/RenderDispatcherMixin.java +++ b/src/main/java/dev/tr7zw/firstperson/mixins/RenderDispatcherMixin.java @@ -74,7 +74,7 @@ private static void renderShadowEnd(PoseStack poseStack, MultiBufferSource multi @Inject(method = "renderHitbox", at = @At(value = "HEAD"), cancellable = true) private static void renderHitbox(PoseStack poseStack, VertexConsumer buffer, Entity entity, float red, float green, float blue, float alpha, CallbackInfo ci) { - if (entity == fpmMcInstance.cameraEntity && fpmMcInstance.options.getCameraType() == CameraType.FIRST_PERSON) { + if (FirstPersonModelCore.instance.isRenderingPlayerPost()) { ci.cancel(); } } @@ -83,7 +83,7 @@ private static void renderHitbox(PoseStack poseStack, VertexConsumer buffer, Ent //$$ @Redirect(method = "renderShadow", at = @At(value = "invoke", target = "Lnet/minecraft/util/Mth;lerp(DDD)D", ordinal = 0)) //$$ private static double shadowOffsetX(double delta, double old, double cur, PoseStack poseStack, //$$ MultiBufferSource multiBufferSource, Entity entity, float f, float g, LevelReader levelReader, float h) { - //$$ if (FirstPersonModelCore.instance.isRenderingPlayer()) { + //$$ if (FirstPersonModelCore.instance.isRenderingPlayerPost()) { //$$ return Mth.lerp(delta, old, cur) + FirstPersonModelCore.instance.getLogicHandler().getOffset().x; //$$ } //$$ return Mth.lerp(delta, old, cur); @@ -92,7 +92,7 @@ private static void renderHitbox(PoseStack poseStack, VertexConsumer buffer, Ent //$$ @Redirect(method = "renderShadow", at = @At(value = "invoke", target = "Lnet/minecraft/util/Mth;lerp(DDD)D", ordinal = 2)) //$$ private static double shadowOffsetZ(double delta, double old, double cur, PoseStack poseStack, //$$ MultiBufferSource multiBufferSource, Entity entity, float f, float g, LevelReader levelReader, float h) { - //$$ if (FirstPersonModelCore.instance.isRenderingPlayer()) { + //$$ if (FirstPersonModelCore.instance.isRenderingPlayerPost()) { //$$ return Mth.lerp(delta, old, cur) + FirstPersonModelCore.instance.getLogicHandler().getOffset().z; //$$ } //$$ return Mth.lerp(delta, old, cur); @@ -101,7 +101,7 @@ private static void renderHitbox(PoseStack poseStack, VertexConsumer buffer, Ent //$$ @Inject(method = "renderShadow", at = @At(value = "invoke", target = "Lcom/mojang/blaze3d/vertex/PoseStack;last()Lcom/mojang/blaze3d/vertex/PoseStack$Pose;", shift = Shift.BEFORE)) //$$ private static void shadowMove(PoseStack matrices, MultiBufferSource vertexConsumers, Entity entity, float opacity, //$$ float tickDelta, LevelReader world, float radius, CallbackInfo ci) { - //$$ if (entity != fpmMcInstance.cameraEntity || fpmMcInstance.options.getCameraType() != CameraType.FIRST_PERSON) { + //$$ if (!FirstPersonModelCore.instance.isRenderingPlayerPost()) { //$$ return; //$$ } //$$ Vec3 offset = FirstPersonModelCore.instance.getLogicHandler().getOffset(); @@ -119,7 +119,7 @@ private static void renderHitbox(PoseStack poseStack, VertexConsumer buffer, Ent //$$ float g, float h, float i, //$$ CallbackInfo ci) { //#endif - //$$ if (entity == fpmMcInstance.cameraEntity && fpmMcInstance.options.getCameraType() == CameraType.FIRST_PERSON) { + //$$ if (FirstPersonModelCore.instance.isRenderingPlayerPost()) { //$$ ci.cancel(); //$$ } //$$}