From f9dba78570647baf4bf297c6522dff7fb44d42a8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 22 Jun 2018 17:58:18 +0200 Subject: [PATCH] Remove unused constants --- .../com/minelittlepony/model/AbstractPonyModel.java | 2 +- .../com/minelittlepony/model/PonyModelConstants.java | 12 ++++-------- .../minelittlepony/model/player/ModelUnicorn.java | 7 ++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index 28486682..7c7b270c 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -583,7 +583,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { float rarmY = getArmRotationY(); float armX = THIRDP_ARM_CENTRE_X; - float armY = THIRDP_ARM_CENTRE_Y - 6; + float armY = THIRDP_ARM_CENTRE_Y; float armZ = BODY_CENTRE_Z / 2 - 1 - armDepth; bipedLeftArm .addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch); diff --git a/src/main/java/com/minelittlepony/model/PonyModelConstants.java b/src/main/java/com/minelittlepony/model/PonyModelConstants.java index f99bfdc3..676c220a 100644 --- a/src/main/java/com/minelittlepony/model/PonyModelConstants.java +++ b/src/main/java/com/minelittlepony/model/PonyModelConstants.java @@ -25,12 +25,6 @@ public final class PonyModelConstants { BODY_RP_Z_SNEAK = -4, BODY_RP_Z_RIDING = 4, - EXT_WING_ROTATE_ANGLE_X = 2.5F, - - FIRSTP_ARM_CENTRE_X = -1, - FIRSTP_ARM_CENTRE_Y = 4, - FIRSTP_ARM_CENTRE_Z = 0, - FRONT_LEG_RP_Y_NOTSNEAK = 8, FRONT_LEG_RP_Y_SNEAK = 8, @@ -64,9 +58,11 @@ public final class PonyModelConstants { TAIL_RP_Z_NOTSNEAK = 14, TAIL_RP_Z_SNEAK = 15, + FIRSTP_ARM_CENTRE_X = -3, + THIRDP_ARM_CENTRE_X = 0, - THIRDP_ARM_CENTRE_Y = 10, - THIRDP_ARM_CENTRE_Z = 0, + THIRDP_ARM_CENTRE_Y = 4, + THIRDP_ARM_CENTRE_Z = -1, WING_FOLDED_RP_Y = 13, WING_FOLDED_RP_Z = -3, diff --git a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java b/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java index fda5f7f8..48731dff 100644 --- a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java +++ b/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java @@ -152,10 +152,7 @@ public class ModelUnicorn extends ModelEarthPony implements IModelUnicorn { unicornArmLeft = new PonyRenderer(this, 40, 32).size(64, 64); unicornArmRight = new PonyRenderer(this, 40, 32).size(64, 64); - float armY = THIRDP_ARM_CENTRE_Y - 6; - float armZ = THIRDP_ARM_CENTRE_Z - 2; - - unicornArmLeft .box(FIRSTP_ARM_CENTRE_X - 2, armY, armZ, 4, 12, 4, stretch + .25F).around(5, yOffset + 2, 0); - unicornArmRight.box(FIRSTP_ARM_CENTRE_X - 2, armY, armZ, 4, 12, 4, stretch + .25F).around(-5, yOffset + 2, 0); + unicornArmLeft .box(FIRSTP_ARM_CENTRE_X, THIRDP_ARM_CENTRE_Y, THIRDP_ARM_CENTRE_Z, 4, 12, 4, stretch + .25F).around(5, yOffset + 2, 0); + unicornArmRight.box(FIRSTP_ARM_CENTRE_X, THIRDP_ARM_CENTRE_Y, THIRDP_ARM_CENTRE_Z, 4, 12, 4, stretch + .25F).around(-5, yOffset + 2, 0); } }