Fix shadow offset issue pre 1.21.3

tr7zw · Dec 21, 2024 · 8c01afc · 8c01afc
1 parent af21933
commit 8c01afc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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();
     //$$    }
     //$$}