From 2dfe6471652c82bb16374722725af8e738a4e2b5 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 27 Apr 2018 23:23:47 +0200 Subject: [PATCH] All four legs are now thin, update the ALEX skin to have thin legs --- .../model/ponies/ModelPlayerPony.java | 51 ++++++++++-------- .../textures/entity/alex_pony.png | Bin 823 -> 1286 bytes 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java index 435a5cc8..2f8a398f 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java @@ -242,7 +242,7 @@ public class ModelPlayerPony extends AbstractPonyModel { private float getLegOutset() { if (isSleeping) return 2.6f; - if (isSneak && !isFlying) return smallArms ? 1 : 0; + if (isCrouching()) return smallArms ? 1 : 0; return 4; } @@ -267,8 +267,8 @@ public class ModelPlayerPony extends AbstractPonyModel { // Push the front legs back apart if we're a thin pony if (smallArms) { - bipedLeftArm.rotationPointX--; - bipedLeftArm.rotationPointX += 2; + bipedLeftArm.rotationPointX++; + bipedLeftLeg.rotationPointX++; } bipedRightArm.rotateAngleY += bipedBody.rotateAngleY; @@ -538,20 +538,20 @@ public class ModelPlayerPony extends AbstractPonyModel { } protected void initLegTextures() { - bipedRightArm = new ModelRenderer(this, 40, 16); - bipedRightLeg = new ModelRenderer(this, 0, 16); - bipedLeftArm = new ModelRenderer(this, 32, 48); - bipedLeftLeg = new ModelRenderer(this, 16, 48); - - bipedRightArmwear = new ModelRenderer(this, 40, 32); - bipedRightLegwear = new ModelRenderer(this, 0, 32); + bipedRightArm = new ModelRenderer(this, 40, 16); bipedLeftArmwear = new ModelRenderer(this, 48, 48); - bipedLeftLegwear = new ModelRenderer(this, 0, 48); + bipedRightArmwear = new ModelRenderer(this, 40, 32); + + bipedLeftLeg = new ModelRenderer(this, 16, 48); + bipedRightLeg = new ModelRenderer(this, 0, 16); + + bipedLeftLegwear = new ModelRenderer(this, 0, 48); + bipedRightLegwear = new ModelRenderer(this, 0, 32); - unicornArmRight = new PonyRenderer(this, 40, 32).size(64, 64); unicornArmLeft = new PonyRenderer(this, 40, 32).size(64, 64); + unicornArmRight = new PonyRenderer(this, 40, 32).size(64, 64); boxList.remove(unicornArmRight); } @@ -623,8 +623,17 @@ public class ModelPlayerPony extends AbstractPonyModel { .rotateAngleX = NECK_ROT_X; } + protected int getArmWidth() { + return smallArms ? 3 : 4; + } + + protected int getArmDepth() { + return 4; + } + protected void initLegPositions(float yOffset, float stretch) { - int armWidth = smallArms ? 3 : 4; + int armWidth = getArmWidth(); + int armDepth = getArmDepth(); float rarmY = smallArms ? 8.5f : 8; float rarmX = smallArms ? 2 : 3; @@ -632,11 +641,11 @@ public class ModelPlayerPony extends AbstractPonyModel { float armY = THIRDP_ARM_CENTRE_Y - 6; float armZ = THIRDP_ARM_CENTRE_Z - 2; - bipedLeftArm .addBox(armX, armY, armZ, armWidth, 12, 4, stretch); - bipedRightArm.addBox(armX, armY, armZ, armWidth, 12, 4, stretch); + bipedLeftArm .addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch); + bipedRightArm.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch); - bipedLeftLeg .addBox(armX, armY, armZ, 4, 12, 4, stretch); - bipedRightLeg.addBox(armX, armY, armZ, 4, 12, 4, stretch); + bipedLeftLeg .addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch); + bipedRightLeg.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch); bipedLeftArm .setRotationPoint( rarmX, yOffset + rarmY, 0); bipedRightArm.setRotationPoint(-rarmX, yOffset + rarmY, 0); @@ -645,22 +654,22 @@ public class ModelPlayerPony extends AbstractPonyModel { bipedRightLeg.setRotationPoint(-rarmX, yOffset, 0); if (bipedLeftArmwear != null) { - bipedLeftArmwear.addBox(armX, armY, armZ, 3, 12, 4, stretch + 0.25f); + bipedLeftArmwear.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch + 0.25f); bipedLeftArmwear.setRotationPoint(3, yOffset + rarmY, 0); } if (bipedRightArmwear != null) { - bipedRightArmwear.addBox(armX, armY, armZ, armWidth, 12, 4, stretch + 0.25f); + bipedRightArmwear.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch + 0.25f); bipedRightArmwear.setRotationPoint(-3, yOffset + rarmY, 0); } if (bipedLeftLegwear != null) { - bipedLeftLegwear.addBox(armX, armY, armZ, 4, 12, 4, stretch + 0.25f); + bipedLeftLegwear.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch + 0.25f); bipedRightLegwear.setRotationPoint(3, yOffset, 0); } if (bipedRightLegwear != null) { - bipedRightLegwear.addBox(armX, armY, armZ, 4, 12, 4, stretch + 0.25f); + bipedRightLegwear.addBox(armX, armY, armZ, armWidth, 12, armDepth, stretch + 0.25f); bipedRightLegwear.setRotationPoint(-3, yOffset, 0); } diff --git a/src/main/resources/assets/minelittlepony/textures/entity/alex_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/alex_pony.png index 9dece2ec9a42f20f69170fc04ae553b5812e9d90..ec8c870bfca26cd18f01fc1f35bd269a9f646292 100644 GIT binary patch delta 1267 zcmV%-7I&&_2Wk}}qZm0>f?6^Kl2V1z z!GyGF1*RBkL^`AdO48zVl0C@Il6Y{M+K|ObJ(yP1ByBJqJXEF`GIU6VEn6ZOR9YG8 zV0CG;<#n*{>E7w|{@puSh5Lb!-rc*q@85m*-F+wRw|jpWxqt7!!t%;Z4FJx3n>VHg zl1Pta&=*PI-P907@czXMn0QtM09*^-ZK^-gJ%{c33jjbY+|^Wn<@1~7@A1jc001+& zJ7!tw@q%VI{?+U)!>&H`{EY>Z`F5cD$lK=c+4^NyZ3g2}S7m;nzjJC*I`c&Hewe4h zvk)gdc=U_C0DovRxjlVdld1K+-8J9L%YshNk*nET#;+0vA&i^CsJD;74=%jrYymW; z29kjjFcEze{uH-9Kss;+iJ8V|hJnnv1YSLRNtjvs8vu_v)VH5#eUXG=R}a8o`)c(} z%5*0JhA4fu7C>)Sit8H&s?Y6AS?iOPrtadYz8+o&#&xnLwn~<=9|v|UL2|g20jJGM$;{q zF}DXG|4RXon4VZbHW$Ts?>xqP=aJ1t(SH|7Sl%I^4@_Cu)pg7iV2{%1xcrk(|2gmr z4gavXwA^F~d%J6voI$&oZ)pK`J2W@uPd;O#X>OU5ww;*wOP{R(X!A^^hRrxT$iaA^ zlO%h)YZm6|I$89EXzj5<%4%U#y5pJ}NTR1_uBp7IXU>wNkVT))N-&igHe>FcT7L

2!6?qbHwAu^{;-26S&j$Fd<)!r|p=LSVjkz|}gwN(I}4(S3A&ELzu zpCIf5*c&5mZjc?kL&o;ip3wgD!)*I%3Mc_60Vn||0Vn}mNV<4sYCz(002ovPDHLkV1hP`a;E?Q delta 801 zcmV++1K#|G3bzK3BYy(^Nklr9Zgy|~T)JOJ zzx$Va@A~eqZGHLLUwpsrZ{K^|KiJ;y-@N}+Bsv$JlXU!T_kV^iude&Uv!8?LvlRIN z;di{OGtBa@JOA-ZvI@~e?kOiv*U^W5G;TC-WvOoqudmkVR5O_@hq>asogYX@Y7ncEm z0F?rO(B@=$&VOT2D{BH^mEys)mO74D3IL=u#Iq31G4;4SSF{NkgM^W+@>&2WAeqWM zNb7ht0Hjwt_lF?KH~=y_R+<6wPHMrytah)Riwgio*RmWuc)JzM06JE?3B&+chAgO> z0bEa?zaCVx4~X5doWQ55%L!il+^Q2y%?7Q5)Xqg^Tz`|E0xdFtJ9+Ew&OhY>kabhl zSpkRAGBm9OZFwBjQ-Fl-psXMBugX9O7tm6&6#%Qvrux?mK_RO8rB}9n$Oo_*#J!9jgH#_O}>7Xi{=|wmVX25)%p@T0DTzf(ixw zkhKE<2ogZ316>;c2vBPV@-fO`@a1wTI`&^>fE<@=ixn~x|g4i3Bb+G&CSit&CSit z&CSit&8^g|ouk(E7YQKem6y``4#1nhifzi?Vd>r@|E&XX01m(bH~