From 6a0af3b0a0ddb9a8ce406a687730095fbe2fefed Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Tue, 5 Apr 2022 16:10:58 -0500 Subject: [PATCH 1/2] Fixed solid legwear right & left sides being flipped --- .../npcs/client/model/part/ModelLimbWear.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java b/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java index f7eb570c1..c6346d09f 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java @@ -260,17 +260,17 @@ public class ModelLimbWear extends ModelScaleRenderer { this.addChild(back); Model2DRenderer right = new Model2DRenderer(base, 8, 36, 4, 12, 64, 64); - right.setRotationPoint(0.15f+x, 12.55f+y, 2.55f); + right.setRotationPoint(0.62f+x, 12.55f+y, -2.55f); right.setScale(0.96f,0.82f); right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); + setRotation(right, 0, (float)(Math.PI/-2f), 0); this.addChild(right); Model2DRenderer left = new Model2DRenderer(base, 0, 36, 4, 12, 64, 64); - left.setRotationPoint(-4.03f+x, 12.55f+y, -2.55f); + left.setRotationPoint(-4.53f+x, 12.55f+y, 2.55f); left.setScale(0.96f,0.82f); left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); + setRotation(left, 0, (float)(Math.PI/2f), 0); this.addChild(left); @@ -308,17 +308,17 @@ public class ModelLimbWear extends ModelScaleRenderer { this.addChild(back); Model2DRenderer right = new Model2DRenderer(base, 8, 52, 4, 12, 64, 64); - right.setRotationPoint(0.15f+x, 12.55f+y, 2.55f); + right.setRotationPoint(0.62f+x, 12.55f+y, -2.55f); right.setScale(0.96f,0.82f); right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); + setRotation(right, 0, (float)(Math.PI/-2f), 0); this.addChild(right); Model2DRenderer left = new Model2DRenderer(base, 0, 52, 4, 12, 64, 64); - left.setRotationPoint(-4.03f+x, 12.55f+y, -2.55f); + left.setRotationPoint(-4.53f+x, 12.55f+y, 2.55f); left.setScale(0.96f,0.82f); left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); + setRotation(left, 0, (float)(Math.PI/2f), 0); this.addChild(left); From 8749ba02807ce584b4ab39e8cf0086b36042fe2e Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Tue, 5 Apr 2022 16:48:27 -0500 Subject: [PATCH 2/2] Fixed bow rendering for mods with custom bow renderers --- .../java/noppes/npcs/client/renderer/RenderNPCHumanMale.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index 37c1817d3..b8fca8b91 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -270,7 +270,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface GL11.glScalef(-var6, -var6, var6); } // CHANGE HERE - else if (itemstack2.getItem() instanceof ItemBow) + else if (itemstack2.getItem() instanceof ItemBow && customRenderer == null) { var6 = 0.625F; GL11.glTranslatef(0.0F, 0.125F, 0.3125F);