From 7578b02867aede8fbe4bf7baa6c7b75cea515612 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 6 Jan 2022 15:31:10 +0200 Subject: [PATCH] Fix bangle being in the wrong place for steve --- .../unicopia/client/minelittlepony/BangleGear.java | 4 ++-- .../client/render/BraceletFeatureRenderer.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java index 6d4b16b9..2eb1d810 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java +++ b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java @@ -28,8 +28,8 @@ class BangleGear implements IGear { private int color; private boolean alex; - private BraceletModel steveModel; - private BraceletModel alexModel; + private final BraceletModel steveModel; + private final BraceletModel alexModel; private IModel model; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java index cd426713..71ae1f84 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java @@ -49,7 +49,6 @@ public class BraceletFeatureRenderer implements Accessor @Override public void render(MatrixStack stack, VertexConsumerProvider renderContext, int lightUv, E entity, float limbDistance, float limbAngle, float tickDelta, float age, float headYaw, float headPitch) { - ItemStack item = entity.getEquippedStack(EquipmentSlot.CHEST); if (item.getItem() instanceof FriendshipBraceletItem) { @@ -128,8 +127,14 @@ public class BraceletFeatureRenderer implements Accessor ModelData data = new ModelData(); ModelPartData root = data.getRoot(); - root.addChild(EntityModelPartNames.RIGHT_ARM, ModelPartBuilder.create().uv(0, alex ? 6 : 0).cuboid(-2 + x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); - root.addChild(EntityModelPartNames.LEFT_ARM, ModelPartBuilder.create().mirrored().uv(0, alex ? 6 : 0).cuboid(-1 - x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); + root.addChild(EntityModelPartNames.RIGHT_ARM, + ModelPartBuilder.create() + .uv(0, alex ? 6 : 0) + .cuboid((alex ? -2 : -3) + x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); + root.addChild(EntityModelPartNames.LEFT_ARM, + ModelPartBuilder.create().mirrored() + .uv(0, alex ? 6 : 0) + .cuboid(-1 - x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); return TexturedModelData.of(data, 64, 32); }