PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-29 15:37: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

4
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);

4
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);
} }

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

@ -67,7 +67,8 @@ public class SaddleBags implements IModelPart {
.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;
} }

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);
} }
} }

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) {