From 3e5960471b8b1aa2d7b636d0b77ec87ddb6fb30e Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 26 Feb 2021 11:29:31 +0200 Subject: [PATCH] Adjust head position and neck clipping on tall, lanky, and yearling models. Fixes #182 --- .../client/GuiPonySettings.java | 3 ++- .../client/transform/PonyTransformation.java | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/GuiPonySettings.java index 4a15fc12..79145c69 100644 --- a/src/main/java/com/minelittlepony/client/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/GuiPonySettings.java @@ -48,6 +48,7 @@ public class GuiPonySettings extends GameGui { content.padding.top = 10; content.padding.right = 10; content.padding.bottom = 20; + content.padding.left = 10; hiddenOptions = Screen.hasControlDown() && Screen.hasShiftDown(); } @@ -59,7 +60,7 @@ public class GuiPonySettings extends GameGui { @SuppressWarnings("unchecked") private void rebuildContent() { - content.padding.left = 10; + int LEFT = content.width / 2 - 210; int RIGHT = content.width / 2 + 10; diff --git a/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java b/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java index ab740cd8..15de9581 100644 --- a/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java +++ b/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -45,12 +45,13 @@ public enum PonyTransformation { switch (part) { case NECK: - stack.translate(0, -0.15F, -0.07F); + stack.translate(0, -0.2F, -0.05F); + stack.scale(1, 1.3F, 1); if (model.getAttributes().isCrouching) stack.translate(-0.03F, 0.16F, 0.07F); if (model.getAttributes().isSwimmingRotated) stack.translate(0, 0.5F, 0.25F); break; case HEAD: - stack.translate(0, -0.17F, -0.04F); + stack.translate(0, -0.14F, -0.04F); if (model.getAttributes().isSleeping) stack.translate(0, 0, -0.1F); if (model.getAttributes().isCrouching) stack.translate(0, 0.15F, 0); if (model.getAttributes().isSwimmingRotated) stack.translate(0, 0.45F, 0.45F); @@ -81,12 +82,13 @@ public enum PonyTransformation { switch (part) { case NECK: - stack.translate(0, -0.15F, -0.07F); + stack.translate(0, -0.2F, -0.07F); + stack.scale(1, 1.3F, 1); if (model.getAttributes().isCrouching) stack.translate(-0.03F, 0.16F, 0.07F); if (model.getAttributes().isSwimmingRotated) stack.translate(0, 0.5F, 0.25F); break; case HEAD: - stack.translate(0, -0.17F, -0.04F); + stack.translate(0, -0.14F, -0.04F); if (model.getAttributes().isSleeping) stack.translate(0, 0, -0.1F); if (model.getAttributes().isCrouching) stack.translate(0, 0.15F, 0); if (model.getAttributes().isSwimmingRotated) stack.translate(0, 0.15F, 0.25F); @@ -148,12 +150,12 @@ public enum PonyTransformation { switch (part) { case NECK: - stack.translate(0, -0.09F, 0); - stack.scale(1, 1.1F, 1); + stack.translate(0, -0.21F, -0.01F); + stack.scale(1, 1.3F, 1); if (model.getAttributes().isCrouching) stack.translate(-0.02F, -0.02F, 0.1F); break; case HEAD: - stack.translate(0.01F, -0.15F, 0); + stack.translate(0, -0.11F, 0.03F); if (model.getAttributes().isCrouching) stack.translate(0, 0.04F, 0); if (model.getAttributes().isSwimmingRotated) stack.translate(0, 0.17F, 0.25F); break; @@ -183,8 +185,8 @@ public enum PonyTransformation { switch (part) { case NECK: - stack.translate(0, -0.09F, -0.01F); - stack.scale(1, 1.1F, 1); + stack.translate(0, -0.2F, -0.01F); + stack.scale(1, 1.3F, 1); if (model.getAttributes().isCrouching) stack.translate(-0.02F, -0.02F, 0.1F); break; case HEAD: