PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-12-01 16:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Manually fix the problem childs

Browse source
This commit is contained in:
Sollace 2018-08-01 12:56:06 +02:00
parent bee8d0556d
commit ea2c78d14a
17 changed files with 114 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
View file

@ -88,9 +88,8 @@ public class GuiSkinsMineLP extends GuiSkins {
} else { } else {
text = "minelp.mode.wet"; text = "minelp.mode.wet";
} }
this.drawHoveringText(I18n.format(text), mouseX, y); drawHoveringText(I18n.format(text), mouseX, y);
} }
;
} }
@Override @Override

60
src/main/java/com/minelittlepony/model/AbstractPonyModel.java
View file

@ -111,8 +111,8 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
float headRotateAngleY = isSleeping ? 1.4f : headYaw / 57.29578F; float headRotateAngleY = isSleeping ? 1.4f : headYaw / 57.29578F;
float headRotateAngleX = isSleeping ? 0.1f : headPitch / 57.29578F; float headRotateAngleX = isSleeping ? 0.1f : headPitch / 57.29578F;
headRotateAngleX = Math.min(headRotateAngleX, (float)(0.5f - Math.toRadians(motionPitch))); headRotateAngleX = Math.min(headRotateAngleX, (float)( 0.5F - Math.toRadians(motionPitch)));
headRotateAngleX = Math.max(headRotateAngleX, (float)(-1.25f - Math.toRadians(motionPitch))); headRotateAngleX = Math.max(headRotateAngleX, (float)(-1.25F - Math.toRadians(motionPitch)));
updateHeadRotation(headRotateAngleX, headRotateAngleY); updateHeadRotation(headRotateAngleX, headRotateAngleY);
@ -138,7 +138,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
bipedRightLeg.rotationPointZ = 15; bipedRightLeg.rotationPointZ = 15;
bipedRightLeg.rotationPointY = 10; bipedRightLeg.rotationPointY = 10;
bipedRightLeg.rotateAngleX = -PI / 4; bipedRightLeg.rotateAngleX = -PI / 4;
bipedRightLeg.rotateAngleY = PI / 5; bipedRightLeg.rotateAngleY = PI / 5;
bipedLeftArm.rotateAngleZ = -PI * 0.06f; bipedLeftArm.rotateAngleZ = -PI * 0.06f;
bipedRightArm.rotateAngleZ = PI * 0.06f; bipedRightArm.rotateAngleZ = PI * 0.06f;
@ -285,7 +285,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
float forward = ROTATE_270 - ROTATE_90 / 3; float forward = ROTATE_270 - ROTATE_90 / 3;
float down = ROTATE_90; float down = ROTATE_90;
float leftX = down + MathHelper.sin(move / 3 + 2 * PI / 3) / 2; float leftX = down + MathHelper.sin(move / 3 + 2 * PI / 3) / 2;
float leftY = -forward - MathHelper.sin(move / 3 + 2 * PI / 3); float leftY = -forward - MathHelper.sin(move / 3 + 2 * PI / 3);
float rightX = down + MathHelper.sin(move / 3) / 2; float rightX = down + MathHelper.sin(move / 3) / 2;
@ -295,9 +295,9 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
bipedLeftArm.rotateAngleY = leftY; bipedLeftArm.rotateAngleY = leftY;
bipedRightArm.rotateAngleY = -leftY; bipedRightArm.rotateAngleY = -leftY;
bipedRightArm.rotateAngleX = leftX; bipedRightArm.rotateAngleX = leftX;
bipedLeftLeg.rotateAngleX = leftX; bipedLeftLeg.rotateAngleX = leftX;
bipedRightLeg.rotateAngleX = rightX; bipedRightLeg.rotateAngleX = rightX;
bipedLeftLeg.rotateAngleY = 0; bipedLeftLeg.rotateAngleY = 0;
@ -319,16 +319,16 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
float armX = rainboom ? ROTATE_270 : MathHelper.sin(-swing / 2); float armX = rainboom ? ROTATE_270 : MathHelper.sin(-swing / 2);
float legX = rainboom ? ROTATE_90 : MathHelper.sin(swing / 2); float legX = rainboom ? ROTATE_90 : MathHelper.sin(swing / 2);
bipedLeftArm.rotateAngleX = armX; bipedLeftArm.rotateAngleX = armX;
bipedRightArm.rotateAngleX = armX; bipedRightArm.rotateAngleX = armX;
bipedLeftLeg.rotateAngleX = legX; bipedLeftLeg.rotateAngleX = legX;
bipedRightLeg.rotateAngleX = legX; bipedRightLeg.rotateAngleX = legX;
bipedLeftArm.rotateAngleY = -0.2F; bipedLeftArm.rotateAngleY = -0.2F;
bipedLeftLeg.rotateAngleY = 0.2F; bipedLeftLeg.rotateAngleY = 0.2F;
bipedRightArm.rotateAngleY = 0.2F; bipedRightArm.rotateAngleY = 0.2F;
bipedRightLeg.rotateAngleY = -0.2F; bipedRightLeg.rotateAngleY = -0.2F;
} }
@ -553,9 +553,9 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
bipedHead = new PonyRenderer(this, 0, 0) bipedHead = new PonyRenderer(this, 0, 0)
.offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z) .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2)
.box(-4, -4, -4, 8, 8, 8, stretch) .box(-4, -4, -4, 8, 8, 8, stretch)
.tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch) .tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch)
.flip().box(2, -6, 1, 2, 2, 2, stretch); .flip().box( 2, -6, 1, 2, 2, 2, stretch);
bipedHeadwear = new PonyRenderer(this, 32, 0) bipedHeadwear = new PonyRenderer(this, 32, 0)
.offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z) .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
@ -590,31 +590,31 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
upperTorso = new PlaneRenderer(this, 24, 0); upperTorso = new PlaneRenderer(this, 24, 0);
upperTorso.offset(BODY_CENTRE_X, BODY_CENTRE_Y, BODY_CENTRE_Z) upperTorso.offset(BODY_CENTRE_X, BODY_CENTRE_Y, BODY_CENTRE_Z)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.tex(24, 0).addEastPlane(4, -4, -4, 8, 8, stretch) .tex(24, 0) .addEastPlane( 4, -4, -4, 8, 8, stretch)
.tex(4, 0).addEastPlane(4, -4, 4, 8, 4, stretch) .tex(4, 0) .addEastPlane( 4, -4, 4, 8, 4, stretch)
.tex(56, 0).addBottomPlane(-4, 4, -4, 8, 8, stretch) .tex(56, 0) .addBottomPlane(-4, 4, -4, 8, 8, stretch)
.tex(36, 16).addBackPlane(-4, -4, 8, 8, 4, stretch) .tex(36, 16).addBackPlane( -4, -4, 8, 8, 4, stretch)
.addBackPlane(-4, 0, 8, 8, 4, stretch) .addBackPlane( -4, 0, 8, 8, 4, stretch)
.addBottomPlane(-4, 4, 4, 8, 4, stretch) .addBottomPlane(-4, 4, 4, 8, 4, stretch)
.flipZ().tex(32, 20).addTopPlane(-4, -4, -4, 8, 12, stretch) .flipZ().tex(32, 20).addTopPlane(-4, -4, -4, 8, 12, stretch)
.tex(24, 0).addWestPlane(-4, -4, -4, 8, 8, stretch) .tex(24, 0).addWestPlane( -4, -4, -4, 8, 8, stretch)
.tex(4, 0).addWestPlane(-4, -4, 4, 8, 4, stretch) .tex(4, 0) .addWestPlane( -4, -4, 4, 8, 4, stretch)
// Tail stub // Tail stub
.child(0) .child(0)
.tex(32, 0).addTopPlane(-1, 2, 2, 2, 6, stretch) .tex(32, 0).addTopPlane(-1, 2, 2, 2, 6, stretch)
.addBottomPlane(-1, 4, 2, 2, 6, stretch) .addBottomPlane(-1, 4, 2, 2, 6, stretch)
.addEastPlane(1, 2, 2, 2, 6, stretch) .addEastPlane( 1, 2, 2, 2, 6, stretch)
.addBackPlane(-1, 2, 8, 2, 2, stretch) .addBackPlane(-1, 2, 8, 2, 2, stretch)
.flipZ().addWestPlane(-1, 2, 2, 2, 6, stretch) .flipZ().addWestPlane(-1, 2, 2, 2, 6, stretch)
.rotate(0.5F, 0, 0); .rotate(0.5F, 0, 0);
neck = new PlaneRenderer(this, 0, 16) neck = new PlaneRenderer(this, 0, 16)
.at(NECK_CENTRE_X, NECK_CENTRE_Y, NECK_CENTRE_Z) .at(NECK_CENTRE_X, NECK_CENTRE_Y, NECK_CENTRE_Z)
.rotate(NECK_ROT_X, 0, 0).around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .rotate(NECK_ROT_X, 0, 0).around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.addFrontPlane(0, 0, 0, 4, 4, stretch) .addFrontPlane(0, 0, 0, 4, 4, stretch)
.addBackPlane(0, 0, 4, 4, 4, stretch) .addBackPlane( 0, 0, 4, 4, 4, stretch)
.addEastPlane(4, 0, 0, 4, 4, stretch) .addEastPlane( 4, 0, 0, 4, 4, stretch)
.addWestPlane(0, 0, 0, 4, 4, stretch); .addWestPlane( 0, 0, 0, 4, 4, stretch);
} }
protected void preInitLegs() { protected void preInitLegs() {

6
src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
View file

@ -63,8 +63,8 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
@Override @Override
protected void initHead(float yOffset, float stretch) { protected void initHead(float yOffset, float stretch) {
super.initHead(yOffset, stretch * 1.1F); super.initHead(yOffset, stretch * 1.1F);
((PonyRenderer)bipedHead).child() ((PonyRenderer)bipedHead).child().tex(0, 4)
.tex(0, 4).box(2, -6, 1, 2, 2, 2, stretch / 2) .box( 2, -6, 1, 2, 2, 2, stretch / 2)
.box(-4, -6, 1, 2, 2, 2, stretch / 2); .box(-4, -6, 1, 2, 2, 2, stretch / 2);
} }
@ -74,7 +74,7 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
flankGuard = new PonyRenderer(this, 0, 0) flankGuard = new PonyRenderer(this, 0, 0)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.box(-4, 4, 6, 8, 8, 8, stretch); .box(-4, 4, 6, 8, 8, 8, stretch);
saddle = new PonyRenderer(this, 16, 8) saddle = new PonyRenderer(this, 16, 8)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.box(-4, 4, -2, 8, 8, 16, stretch); .box(-4, 4, -2, 8, 8, 16, stretch);

4
src/main/java/com/minelittlepony/model/components/ModelPonyHead.java
View file

@ -29,8 +29,8 @@ public class ModelPonyHead extends ModelHumanoidHead implements ICapitated {
ears = new PonyRenderer(this, 0, 0) ears = new PonyRenderer(this, 0, 0)
.offset(0, -3, 2).around(0, 0, -2) .offset(0, -3, 2).around(0, 0, -2)
.tex(12, 16).box(-4, -6, 1, 2, 2, 2, 0) .tex(12, 16).box(-4, -6, 1, 2, 2, 2, 0)
.flip().box(2, -6, 1, 2, 2, 2, 0); .flip().box( 2, -6, 1, 2, 2, 2, 0);
skeletonHead.addChild(ears); skeletonHead.addChild(ears);
} }

12
src/main/java/com/minelittlepony/model/components/ModelWing.java
View file

@ -38,12 +38,12 @@ public class ModelWing {
float r = right ? -1 : 1; float r = right ? -1 : 1;
extended.around(r * LEFT_WING_EXT_RP_X, LEFT_WING_EXT_RP_Y + rotationPointY, LEFT_WING_EXT_RP_Z).rotateAngleY = r * 3; extended.around(r * LEFT_WING_EXT_RP_X, LEFT_WING_EXT_RP_Y + rotationPointY, LEFT_WING_EXT_RP_Z).rotateAngleY = r * 3;
addFeather(0, l, 6, 0, 8, scale + 0.1F); addFeather(0, l, 6, 0, 8, scale + 0.1F);
addFeather(1, l, -1, -0.3F, 8, scale + 0.1F).rotateAngleX = -0.85F; addFeather(1, l, -1, -0.3F, 8, scale + 0.1F).rotateAngleX = -0.85F;
addFeather(2, l, 1.8F, 1.3F, 8, scale - 0.1F).rotateAngleX = -0.75F; addFeather(2, l, 1.8F, 1.3F, 8, scale - 0.1F).rotateAngleX = -0.75F;
addFeather(3, l, 5, 2, 8, scale).rotateAngleX = -0.5F; addFeather(3, l, 5, 2, 8, scale).rotateAngleX = -0.5F;
addFeather(4, l, 0, -0.2F, 6, scale + 0.3F); addFeather(4, l, 0, -0.2F, 6, scale + 0.3F);
addFeather(5, l, 0, 0, 3, scale + 0.19F).rotateAngleX = -0.85F; addFeather(5, l, 0, 0, 3, scale + 0.19F).rotateAngleX = -0.85F;
} }
private PonyRenderer addFeather(int i, boolean l, float y, float z, int h, float scale) { private PonyRenderer addFeather(int i, boolean l, float y, float z, int h, float scale) {

4
src/main/java/com/minelittlepony/model/components/PonyElytra.java
View file

@ -19,8 +19,8 @@ public class PonyElytra extends ModelBase {
private PonyRenderer leftWing = new PonyRenderer(this, 22, 0); private PonyRenderer leftWing = new PonyRenderer(this, 22, 0);
public PonyElytra() { public PonyElytra() {
leftWing.box(-10, 0, 0, 10, 20, 2, 1); leftWing .box(-10, 0, 0, 10, 20, 2, 1);
rightWing.flip().box(0, 0, 0, 10, 20, 2, 1); rightWing.flip().box( 0, 0, 0, 10, 20, 2, 1);
} }
/** /**

30
src/main/java/com/minelittlepony/model/components/PonySnout.java
View file

@ -40,22 +40,22 @@ public class PonySnout {
public void init(float yOffset, float stretch) { public void init(float yOffset, float stretch) {
mare.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) mare.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.tex(10, 14).addBackPlane(-2, 2, -5, 4, 2, stretch) .tex(10, 14).addBackPlane( -2, 2, -5, 4, 2, stretch)
.tex(11, 13).addBackPlane(-1, 1, -5, 2, 1, stretch) .tex(11, 13).addBackPlane( -1, 1, -5, 2, 1, stretch)
.tex(9, 14).addTopPlane(-2, 2, -5, 1, 1, stretch) .tex(9, 14).addTopPlane( -2, 2, -5, 1, 1, stretch)
.tex(14, 14).addTopPlane(1, 2, -5, 1, 1, stretch) .tex(14, 14).addTopPlane( 1, 2, -5, 1, 1, stretch)
.tex(11, 12).addTopPlane(-1, 1, -5, 2, 1, stretch) .tex(11, 12).addTopPlane( -1, 1, -5, 2, 1, stretch)
.tex(18, 7).addBottomPlane(-2, 4, -5, 4, 1, stretch) .tex(18, 7).addBottomPlane(-2, 4, -5, 4, 1, stretch)
.tex(9, 14).addWestPlane(-2, 2, -5, 2, 1, stretch) .tex(9, 14).addWestPlane( -2, 2, -5, 2, 1, stretch)
.tex(14, 14).addEastPlane(2, 2, -5, 2, 1, stretch) .tex(14, 14).addEastPlane( 2, 2, -5, 2, 1, stretch)
.tex(11, 12).addWestPlane(-1, 1, -5, 1, 1, stretch) .tex(11, 12).addWestPlane( -1, 1, -5, 1, 1, stretch)
.tex(12, 12).addEastPlane(1, 1, -5, 1, 1, stretch); .tex(12, 12).addEastPlane( 1, 1, -5, 1, 1, stretch);
stallion.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) stallion.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.tex(10, 13).addBackPlane(-2, 1, -5, 4, 3, stretch) .tex(10, 13).addBackPlane( -2, 1, -5, 4, 3, stretch)
.tex(10, 13).addTopPlane(-2, 1, -5, 4, 1, stretch) .tex(10, 13).addTopPlane( -2, 1, -5, 4, 1, stretch)
.tex(18, 7).addBottomPlane(-2, 4, -5, 4, 1, stretch) .tex(18, 7).addBottomPlane(-2, 4, -5, 4, 1, stretch)
.tex(10, 13).addWestPlane(-2, 1, -5, 3, 1, stretch) .tex(10, 13).addWestPlane( -2, 1, -5, 3, 1, stretch)
.tex(13, 13).addEastPlane(2, 1, -5, 3, 1, stretch); .tex(13, 13).addEastPlane( 2, 1, -5, 3, 1, stretch);
} }
public void setGender(PonyGender gender) { public void setGender(PonyGender gender) {

10
src/main/java/com/minelittlepony/model/components/PonyTail.java
View file

@ -106,11 +106,11 @@ public class PonyTail extends PlaneRenderer implements IModelPart {
tex(32, 0).addTopPlane(-2, 0, 2, 4, 4, stretch); tex(32, 0).addTopPlane(-2, 0, 2, 4, 4, stretch);
} }
tex(36, texX).addEastPlane(2, 0, 2, 4, 4, stretch) tex(36, texX).addEastPlane( 2, 0, 2, 4, 4, stretch)
.addWestPlane(-2, 0, 2, 4, 4, stretch); .addWestPlane( -2, 0, 2, 4, 4, stretch);
tex(32, texX).addBackPlane(-2, 0, 2, 4, 4, stretch) tex(32, texX).addBackPlane( -2, 0, 2, 4, 4, stretch)
.addFrontPlane(-2, 0, 6, 4, 4, stretch); .addFrontPlane( -2, 0, 6, 4, 4, stretch);
tex(32, 0).addBottomPlane(-2, 4, 2, 4, 4, stretch); tex(32, 0) .addBottomPlane( -2, 4, 2, 4, 4, stretch);
} }
@Override @Override

23
src/main/java/com/minelittlepony/model/components/SaddleBags.java
View file

@ -39,13 +39,13 @@ public class SaddleBags implements IModelPart {
strap.offset(-x, y + 0.2F, z + 3).around(0, 4, 4) strap.offset(-x, y + 0.2F, z + 3).around(0, 4, 4)
.tex(56, 31).addTopPlane(0, 0, 0, 8, 1, stretch) .tex(56, 31).addTopPlane(0, 0, 0, 8, 1, stretch)
.addTopPlane(0, 0, 1, 8, 1, stretch) .addTopPlane( 0, 0, 1, 8, 1, stretch)
.addBackPlane(0, 0, 2, 8, 1, stretch) .addBackPlane( 0, 0, 2, 8, 1, stretch)
.addFrontPlane(0, 0, 0, 8, 1, stretch) .addFrontPlane(0, 0, 0, 8, 1, stretch)
.child(0).offset(0, -3, -0.305F).tex(56, 31) .child(0).offset(0, -3, -0.305F).tex(56, 31)
.addWestPlane(4.0002F, 0, 0, 1, 3, stretch) // 0.0001 is there .addWestPlane( 4.0002F, 0, 0, 1, 3, stretch) // 0.0001 is there
.addWestPlane(4.0002F, -1, 0, 1, 3, stretch) // otherwise straps .addWestPlane( 4.0002F, -1, 0, 1, 3, stretch) // otherwise straps
.addWestPlane(-4.0002F, 0, 0, 1, 3, stretch) // clip into the body .addWestPlane(-4.0002F, 0, 0, 1, 3, stretch) // clip into the body
.addWestPlane(-4.0002F, -1, 0, 1, 3, stretch).rotateAngleX = ROTATE_270; .addWestPlane(-4.0002F, -1, 0, 1, 3, stretch).rotateAngleX = ROTATE_270;
leftBag.offset(x, y, z).around(0, 4, 4) leftBag.offset(x, y, z).around(0, 4, 4)
@ -54,9 +54,9 @@ public class SaddleBags implements IModelPart {
.tex(56, 19).addWestPlane(3, 0, 0, 6, 8, stretch) .tex(56, 19).addWestPlane(3, 0, 0, 6, 8, stretch)
.addWestPlane(0, 0, 0, 6, 8, stretch) .addWestPlane(0, 0, 0, 6, 8, stretch)
.child(0).offset(z, y, -x).tex(56, 16) .child(0).offset(z, y, -x).tex(56, 16)
.addTopPlane(0, 0, -3, 8, 3, stretch) .addTopPlane( 0, 0, -3, 8, 3, stretch)
.tex(56, 22).flipZ() .tex(56, 22).flipZ()
.addBottomPlane(0, 6, -3, 8, 3, stretch).rotateAngleY = ROTATE_270; .addBottomPlane(0, 6, -3, 8, 3, stretch).rotateAngleY = ROTATE_270;
x += 3; x += 3;
@ -66,8 +66,9 @@ public class SaddleBags implements IModelPart {
.tex(56, 19).addWestPlane(3, 0, 0, 6, 8, stretch) .tex(56, 19).addWestPlane(3, 0, 0, 6, 8, stretch)
.addWestPlane(0, 0, 0, 6, 8, stretch) .addWestPlane(0, 0, 0, 6, 8, stretch)
.child(0).offset(z, y, x).tex(56, 16) .child(0).offset(z, y, x).tex(56, 16)
.flipZ().addTopPlane(0, 0, -3, 8, 3, stretch) .flipZ().addTopPlane(0, 0, -3, 8, 3, stretch)
.tex(56, 22).flipZ().addBottomPlane(0, 6, -3, 8, 3, stretch).rotateAngleY = ROTATE_270; .tex(56, 22).flipZ()
.addBottomPlane(0, 6, -3, 8, 3, stretch).rotateAngleY = ROTATE_270;
} }

2
src/main/java/com/minelittlepony/model/components/SeaponyTail.java
View file

@ -38,7 +38,7 @@ public class SeaponyTail implements IModelPart {
tailFins.offset(1, 0, 4).rotate(-TAIL_ROTX, 0, 0) tailFins.offset(1, 0, 4).rotate(-TAIL_ROTX, 0, 0)
.addTopPlane(-8, 0, 0, 8, 8, stretch) .addTopPlane(-8, 0, 0, 8, 8, stretch)
.flip().addTopPlane(0, 0, 0, 8, 8, stretch); .flip().addTopPlane( 0, 0, 0, 8, 8, stretch);
} }
@Override @Override

2
src/main/java/com/minelittlepony/model/components/UnicornHorn.java
View file

@ -25,7 +25,7 @@ public class UnicornHorn {
horn.offset(HORN_X + x, HORN_Y + y, HORN_Z + z) horn.offset(HORN_X + x, HORN_Y + y, HORN_Z + z)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)
.box(0, 0, 0, 1, 4, 1, stretch).rotateAngleX = 0.5F; .box(0, 0, 0, 1, 4, 1, stretch).rotateAngleX = 0.5F;
glow.offset(HORN_X + x, HORN_Y + y, HORN_Z + z) glow.offset(HORN_X + x, HORN_Y + y, HORN_Z + z)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z)

4
src/main/java/com/minelittlepony/model/player/ModelUnicorn.java
View file

@ -156,7 +156,7 @@ public class ModelUnicorn extends ModelEarthPony implements IModelUnicorn {
unicornArmLeft = 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); unicornArmRight = new PonyRenderer(this, 40, 32).size(64, 64);
unicornArmLeft.box(FIRSTP_ARM_CENTRE_X, THIRDP_ARM_CENTRE_Y, THIRDP_ARM_CENTRE_Z, 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 + 0.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); unicornArmRight.box(FIRSTP_ARM_CENTRE_X, THIRDP_ARM_CENTRE_Y, THIRDP_ARM_CENTRE_Z, 4, 12, 4, stretch + 0.25F).around(-5, yOffset + 2, 0);
} }
} }

8
src/main/java/com/minelittlepony/model/player/ModelZebra.java
View file

@ -35,11 +35,11 @@ public class ModelZebra extends ModelEarthPony {
bristles.offset(-1, -1, -3) bristles.offset(-1, -1, -3)
.box(0, -10, 2, 2, 6, 2, stretch) .box(0, -10, 2, 2, 6, 2, stretch)
.box(0, -10, 4, 2, 8, 2, stretch) .box(0, -10, 4, 2, 8, 2, stretch)
.box(0, -8, 6, 2, 6, 2, stretch) .box(0, -8, 6, 2, 6, 2, stretch)
.rotate(0.3F, 0, 0) .rotate(0.3F, 0, 0)
.child(0).offset(-1.01F, 2, -7) //0.01 to prevent z-fighting .child(0).offset(-1.01F, 2, -7) //0.01 to prevent z-fighting
.box(0, -10, 4, 2, 8, 2, stretch) .box(0, -10, 4, 2, 8, 2, stretch)
.box(0, -8, 6, 2, 6, 2, stretch) .box(0, -8, 6, 2, 6, 2, stretch)
.rotate(-1, 0, 0); .rotate(-1, 0, 0);
} }
} }

14
src/main/java/com/minelittlepony/model/ponies/ModelBreezie.java
View file

@ -27,21 +27,21 @@ public class ModelBreezie extends ModelBiped {
bipedHead = new PonyRenderer(this) bipedHead = new PonyRenderer(this)
.child(new PonyRenderer(this) .child(new PonyRenderer(this)
.addBox(-3, -6, -3, 6, 6, 6).around(0, 0, -4) .addBox(-3, -6, -3, 6, 6, 6).around(0, 0, -4)
.tex(28, 0).addBox(2, -7, 1, 1, 1, 1) .tex(28, 0).addBox( 2, -7, 1, 1, 1, 1)
.tex(24, 0).addBox(-3, -7, 1, 1, 1, 1) .tex(24, 0).addBox(-3, -7, 1, 1, 1, 1)
.tex(24, 9).addBox(-1, -2, -4, 2, 2, 1)) .tex(24, 9).addBox(-1, -2, -4, 2, 2, 1))
.child(new PonyRenderer(this) .child(new PonyRenderer(this)
.tex(28, 2).addBox(1, -11, -2, 1, 6, 1) .tex(28, 2).addBox( 1, -11, -2, 1, 6, 1)
.tex(24, 2).addBox(-2, -11, -2, 1, 6, 1) .tex(24, 2).addBox(-2, -11, -2, 1, 6, 1)
.rotate(-0.2617994F, 0, 0)); .rotate(-0.2617994F, 0, 0));
bipedBody = new PonyRenderer(this, 2, 12) bipedBody = new PonyRenderer(this, 2, 12)
.addBox(0, 0, 0, 6, 7, 14).rotate(-0.5235988F, 0, 0).around(-3, 1, -3); .addBox(0, 0, 0, 6, 7, 14).rotate(-0.5235988F, 0, 0).around(-3, 1, -3);
bipedLeftArm = new PonyRenderer(this, 28, 12).addBox(0, 0, 0, 2, 12, 2).around(1, 8, -5); bipedLeftArm = new PonyRenderer(this, 28, 12) .addBox(0, 0, 0, 2, 12, 2).around( 1, 8, -5);
bipedRightArm = new PonyRenderer(this, 36, 12).addBox(0, 0, 0, 2, 12, 2).around(-3, 8, -5); bipedRightArm = new PonyRenderer(this, 36, 12).addBox(0, 0, 0, 2, 12, 2).around(-3, 8, -5);
bipedLeftLeg = new PonyRenderer(this, 8, 12).addBox(0, 0, 0, 2, 12, 2).around(1, 12, 3); bipedLeftLeg = new PonyRenderer(this, 8, 12) .addBox(0, 0, 0, 2, 12, 2).around( 1, 12, 3);
bipedRightLeg = new PonyRenderer(this, 0, 12).addBox(0, 0, 0, 2, 12, 2).around(-3, 12, 3); bipedRightLeg = new PonyRenderer(this, 0, 12) .addBox(0, 0, 0, 2, 12, 2).around(-3, 12, 3);
neck = new PonyRenderer(this, 40, 0) neck = new PonyRenderer(this, 40, 0)
.addBox(0, 0, 0, 2, 5, 2) .addBox(0, 0, 0, 2, 5, 2)
@ -86,7 +86,7 @@ public class ModelBreezie extends ModelBiped {
bipedLeftArm.rotateAngleZ = 0; bipedLeftArm.rotateAngleZ = 0;
((PonyRenderer)bipedRightArm).rotate(swing * MathHelper.cos(move * 0.6662F + PI), 0, 0); ((PonyRenderer)bipedRightArm).rotate(swing * MathHelper.cos(move * 0.6662F + PI), 0, 0);
((PonyRenderer)bipedLeftLeg).rotate(swing * MathHelper.cos(move * 0.6662F + PI) * 1.4F, 0, 0); ((PonyRenderer)bipedLeftLeg) .rotate(swing * MathHelper.cos(move * 0.6662F + PI) * 1.4F, 0, 0);
((PonyRenderer)bipedRightLeg).rotate(swing * MathHelper.cos(move * 0.6662F) * 1.4F, 0, 0); ((PonyRenderer)bipedRightLeg).rotate(swing * MathHelper.cos(move * 0.6662F) * 1.4F, 0, 0);
if (isRiding) { if (isRiding) {

16
src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java
View file

@ -97,13 +97,13 @@ public class ModelWitchPony extends ModelZebra {
witchHat.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2) witchHat.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2)
.tex(0, 64).box(-5, -6, -7, 10, 2, 10, stretch) .tex(0, 64).box(-5, -6, -7, 10, 2, 10, stretch)
.child(0).around(1.75F, -4, 2) .child(0).around(1.75F, -4, 2)
.tex(0, 76).box(-5, -5, -7, 7, 4, 7, stretch) .tex(0, 76).box(-5, -5, -7, 7, 4, 7, stretch)
.rotate(-0.05235988F, 0, 0.02617994F) .rotate(-0.05235988F, 0, 0.02617994F)
.child(0).around(1.75F, -4, 2) .child(0).around(1.75F, -4, 2)
.tex(0, 87).box(-5, -4, -7, 4, 4, 4, stretch) .tex(0, 87).box(-5, -4, -7, 4, 4, 4, stretch)
.rotate(-0.10471976F, 0, 0.05235988F) .rotate(-0.10471976F, 0, 0.05235988F)
.child(0).around(1.75F, -2, 2) .child(0).around(1.75F, -2, 2)
.tex(0, 95).box(-5, -2, -7, 1, 2, 1, stretch) .tex(0, 95).box(-5, -2, -7, 1, 2, 1, stretch)
.rotate(-0.20943952F, 0, 0.10471976F); .rotate(-0.20943952F, 0, 0.10471976F);
} }
} }

7
src/main/java/com/minelittlepony/pony/data/PonyRace.java
View file

@ -62,9 +62,10 @@ public enum PonyRace implements ITriggerPixelMapped<PonyRace> {
} }
/** /**
* Gets the actual race determined by the given pony level. PonyLevel.HUMANS would force all races * Gets the actual race determined by the given pony level.
* to be humans. PonyLevel.BOTH is no change. PonyLevel.PONIES (should) return a pony if this is a * PonyLevel.HUMANS would force all races to be humans.
* human. Don't be fooled, though. It doesn't. * PonyLevel.BOTH is no change.
* PonyLevel.PONIES (should) return a pony if this is a human. Don't be fooled, though. It doesn't.
*/ */
public PonyRace getEffectiveRace(PonyLevel level) { public PonyRace getEffectiveRace(PonyLevel level) {
if (level == PonyLevel.HUMANS) { if (level == PonyLevel.HUMANS) {

20
src/main/java/com/minelittlepony/render/HornGlow.java
View file

@ -42,20 +42,20 @@ public class HornGlow extends Box<HornGlowRenderer> {
// w:west e:east d:down u:up s:south n:north // w:west e:east d:down u:up s:south n:north
Vertex wds = vert(tipXmin, yMin, tipZmin, 0, 0); Vertex wds = vert(tipXmin, yMin, tipZmin, 0, 0);
Vertex eds = vert(tipXMax, yMin, tipZmin, 0, 8); Vertex eds = vert(tipXMax, yMin, tipZmin, 0, 8);
Vertex eus = vert(xMax, yMax, zMin, 8, 8); Vertex eus = vert( xMax, yMax, zMin, 8, 8);
Vertex wus = vert(xMin, yMax, zMin, 8, 0); Vertex wus = vert( xMin, yMax, zMin, 8, 0);
Vertex wdn = vert(tipXmin, yMin, tipZMax, 0, 0); Vertex wdn = vert(tipXmin, yMin, tipZMax, 0, 0);
Vertex edn = vert(tipXMax, yMin, tipZMax, 0, 8); Vertex edn = vert(tipXMax, yMin, tipZMax, 0, 8);
Vertex eun = vert(xMax, yMax, zMax, 8, 8); Vertex eun = vert( xMax, yMax, zMax, 8, 8);
Vertex wun = vert(xMin, yMax, zMax, 8, 0); Vertex wun = vert( xMin, yMax, zMax, 8, 0);
quadList = new Quad[] { quadList = new Quad[] {
quad(texX + d + w, d, texY + d, h, edn, eds, eus, eun), quad(texX + d + w, d, texY + d, h, edn, eds, eus, eun),
quad(texX, d, texY + d, h, wds, wdn, wun, wus), quad(texX, d, texY + d, h, wds, wdn, wun, wus),
quad(texX + d, w, texY, d, edn, wdn, wds, eds), quad(texX + d, w, texY, d, edn, wdn, wds, eds),
quad(texX + d + w, w, texY + d, -d, eus, wus, wun, eun), quad(texX + d + w, w, texY + d, -d, eus, wus, wun, eun),
quad(texX + d, w, texY + d, h, eds, wds, wus, eus), quad(texX + d, w, texY + d, h, eds, wds, wus, eus),
quad(texX + d + w + d, w, texY + d, h, wdn, edn, eun, wun) quad(texX + d + w + d, w, texY + d, h, wdn, edn, eun, wun)
}; };
if (renderer.mirror) { if (renderer.mirror) {