diff --git a/build.number b/build.number index 93eb7e02..92d0d4c8 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Apr 10 14:03:42 CAT 2018 -build.number=497 +#Mon Jun 04 04:49:51 MSK 2018 +build.number=498 diff --git a/src/main/java/com/minelittlepony/model/components/ModelWing.java b/src/main/java/com/minelittlepony/model/components/ModelWing.java index b4026b7d..2145f564 100644 --- a/src/main/java/com/minelittlepony/model/components/ModelWing.java +++ b/src/main/java/com/minelittlepony/model/components/ModelWing.java @@ -51,13 +51,11 @@ public class ModelWing { } - public void render(boolean hasBags, boolean extend, float scale) { + public void render(boolean extend, float scale) { extended.rotationPointX = (mirror ? -1 : 1) * LEFT_WING_EXT_RP_X; - extended.rotationPointY = LEFT_WING_EXT_RP_Y + (hasBags ? -1f : 0f); - extended.rotationPointZ = LEFT_WING_EXT_RP_Z + (hasBags ? 1f : 0f); - extended.rotateAngleY = 3; + extended.rotationPointY = LEFT_WING_EXT_RP_Y; - folded.offset((hasBags ? (mirror ? -0.5f : 0.5f) : 0f), (hasBags ? -0.5f : 0f), (hasBags ? -1.5f : 0f)); + extended.rotateAngleY = 3; if (extend) { extended.render(scale); } else { diff --git a/src/main/java/com/minelittlepony/model/components/PegasusWings.java b/src/main/java/com/minelittlepony/model/components/PegasusWings.java index 4a4e69c7..3e76b66c 100644 --- a/src/main/java/com/minelittlepony/model/components/PegasusWings.java +++ b/src/main/java/com/minelittlepony/model/components/PegasusWings.java @@ -68,11 +68,10 @@ public class PegasusWings implements IModelPart { @Override public void render(float scale) { AbstractPonyModel model = ((AbstractPonyModel) pegasus); - boolean hasBags = model.metadata.hasBags(); - if (!hasBags || model.textureHeight == 64) { + if (!model.metadata.hasBags() || model.textureHeight == 64) { boolean standing = pegasus.wingsAreOpen(); - leftWing.render(hasBags, standing, scale); - rightWing.render(hasBags, standing, scale); + leftWing.render(standing, scale); + rightWing.render(standing, scale); } } } diff --git a/src/main/java/com/minelittlepony/model/components/PonyAccessory.java b/src/main/java/com/minelittlepony/model/components/PonyAccessory.java index 40e9e2cd..b534969f 100644 --- a/src/main/java/com/minelittlepony/model/components/PonyAccessory.java +++ b/src/main/java/com/minelittlepony/model/components/PonyAccessory.java @@ -3,8 +3,6 @@ package com.minelittlepony.model.components; import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.capabilities.IModelPart; import com.minelittlepony.render.plane.PlaneRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.MathHelper; import static com.minelittlepony.model.PonyModelConstants.*; diff --git a/src/main/java/com/minelittlepony/pony/data/IPonyData.java b/src/main/java/com/minelittlepony/pony/data/IPonyData.java index f3330b03..4589f5c2 100644 --- a/src/main/java/com/minelittlepony/pony/data/IPonyData.java +++ b/src/main/java/com/minelittlepony/pony/data/IPonyData.java @@ -37,7 +37,7 @@ public interface IPonyData extends IMetadataSection { boolean hasMagic(); /** - * Returns true if and only if this metadata represents a pony that has bags. + * Returns true if and only if this metadata represents a pony that has accessories. */ boolean hasAccessory();