From c6ba1703a26879f90ae8f7f764db9079e9cb4b02 Mon Sep 17 00:00:00 2001 From: Sen Date: Fri, 5 Sep 2025 16:22:22 +0200 Subject: [PATCH] fix first person render rotations --- .../main/java/client/renderer/entity/RenderHumanoid.java | 6 +++--- .../main/java/client/renderer/entity/RenderSpaceMarine.java | 2 +- .../src/main/java/client/renderer/model/ModelRenderer.java | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/src/main/java/client/renderer/entity/RenderHumanoid.java b/client/src/main/java/client/renderer/entity/RenderHumanoid.java index b406cec7..f09fcdf4 100755 --- a/client/src/main/java/client/renderer/entity/RenderHumanoid.java +++ b/client/src/main/java/client/renderer/entity/RenderHumanoid.java @@ -109,9 +109,9 @@ public class RenderHumanoid extends RenderNpc ItemStack itemstack = npc.getHeldItem(); modelplayer.setSlim(npc.hasSlimArms()); // .hasSlimSkin()); modelplayer.setVisible(true); - boolean third = this.manager.gm == null || npc != this.manager.gm.getRenderViewEntity() || this.manager.gm.thirdPersonView != 0 || !this.manager.gm.showPlayerFirstPerson || this.manager.gm.charEditor; - modelplayer.bipedHead.showModel &= third; - modelplayer.bipedHeadwear.showModel &= third; + boolean third = this.manager.gm != null && npc == this.manager.gm.getRenderViewEntity() && this.manager.gm.thirdPersonView == 0 && this.manager.gm.showPlayerFirstPerson && !this.manager.gm.charEditor; + modelplayer.bipedHead.skipRender = third; + modelplayer.bipedHeadwear.skipRender = third; // if(npc.isPlayer()) { // modelplayer.bipedHeadwear.showModel &= npc.isWearing(ModelPart.HEAD); // modelplayer.bipedBodyWear.showModel &= npc.isWearing(ModelPart.JACKET); diff --git a/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java b/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java index 55a63c2f..33da76ae 100755 --- a/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java +++ b/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java @@ -43,7 +43,7 @@ public class RenderSpaceMarine extends RenderNpc ModelSpaceMarine modelplayer = this.getMainModel(); ItemStack itemstack = npc.getHeldItem(); modelplayer.setVisible(true); - modelplayer.bipedHead.showModel &= this.manager.gm == null || npc != this.manager.gm.getRenderViewEntity() || this.manager.gm.thirdPersonView != 0 || !this.manager.gm.showPlayerFirstPerson || this.manager.gm.charEditor; + modelplayer.bipedHead.skipRender = this.manager.gm != null && npc == this.manager.gm.getRenderViewEntity() && this.manager.gm.thirdPersonView == 0 && this.manager.gm.showPlayerFirstPerson && !this.manager.gm.charEditor; modelplayer.heldItemLeft = 0; modelplayer.aimedBow = false; modelplayer.isSneak = false; diff --git a/client/src/main/java/client/renderer/model/ModelRenderer.java b/client/src/main/java/client/renderer/model/ModelRenderer.java index 40707ea1..f7755aa7 100755 --- a/client/src/main/java/client/renderer/model/ModelRenderer.java +++ b/client/src/main/java/client/renderer/model/ModelRenderer.java @@ -33,6 +33,7 @@ public class ModelRenderer private int displayList; public boolean mirror; public boolean showModel; + public boolean skipRender; /** Hides the model. */ public boolean isHidden; @@ -172,6 +173,9 @@ public class ModelRenderer { this.compileDisplayList(p_78785_1_); } + + if(this.skipRender) + return; GL15.glTranslatef(this.offsetX, this.offsetY, this.offsetZ);