Revert "Add some model children. May be buggy"

This reverts commit 57404a01cf.

src/main/java/com/brohoof/minelittlepony/model/part/AbstractHeadPart.java

@@ -4,7 +4,6 @@ import com.brohoof.minelittlepony.PonyData;
 import com.brohoof.minelittlepony.model.BodyPart;
 import com.brohoof.minelittlepony.model.AbstractPonyModel;
 
-import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 
 public abstract class AbstractHeadPart implements IPonyPart {
@@ -14,9 +13,6 @@ public abstract class AbstractHeadPart implements IPonyPart {
     @Override
     public void init(AbstractPonyModel pony, float yOffset, float stretch) {
         this.pony = pony;
-        for (ModelRenderer m : getModels()) {
-            this.pony.bipedHead.addChild(m);
-        }
     }
 
     @Override
@@ -55,8 +51,6 @@ public abstract class AbstractHeadPart implements IPonyPart {
         return pony;
     }
 
-    protected abstract ModelRenderer[] getModels();
-
     protected abstract void position(float posX, float posY, float posZ);
 
     protected abstract void rotate(float rotX, float rotY);

src/main/java/com/brohoof/minelittlepony/model/part/PegasusWings.java

@@ -41,17 +41,6 @@ public class PegasusWings implements IPonyPart, PonyModelConstants {
         }
 
         initPositions(yOffset, stretch);
-
-        addChildren(this.leftWing);
-        addChildren(this.rightWing);
-        addChildren(this.leftWingExt);
-        addChildren(this.rightWingExt);
-    }
-
-    private void addChildren(ModelRenderer... models) {
-        for (ModelRenderer m : models) {
-            this.pony.bipedBody.addChild(m);
-        }
     }
 
     private void initPositions(float yOffset, float stretch) {

src/main/java/com/brohoof/minelittlepony/model/part/PonyEars.java

@@ -45,8 +45,4 @@ public class PonyEars extends AbstractHeadPart implements PonyModelConstants {
         right.render(scale);
     }
 
-    @Override
-    protected ModelRenderer[] getModels() {
-        return new ModelRenderer[] { left, right };
-    }
 }

src/main/java/com/brohoof/minelittlepony/model/part/PonySnout.java

@@ -9,9 +9,6 @@ import com.brohoof.minelittlepony.model.AbstractPonyModel;
 import com.brohoof.minelittlepony.model.PonyModelConstants;
 import com.brohoof.minelittlepony.renderer.PlaneRenderer;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ObjectArrays;
-
-import net.minecraft.client.model.ModelRenderer;
 
 public class PonySnout extends AbstractHeadPart implements PonyModelConstants {
 
@@ -106,11 +103,4 @@ public class PonySnout extends AbstractHeadPart implements PonyModelConstants {
         }
     }
 
-    @Override
-    protected ModelRenderer[] getModels() {
-        ModelRenderer[] male = MUZZLES.get(PonyGender.STALLION);
-        ModelRenderer[] female =  MUZZLES.get(PonyGender.MARE);
-        return ObjectArrays.concat(male, female, ModelRenderer.class);
-    }
-
 }

src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java

@@ -24,7 +24,6 @@ public class UnicornHorn extends AbstractHeadPart implements PonyModelConstants
         this.hornglow = new HornGlowRenderer[2];
         for (int i = 0; i < hornglow.length; i++) {
             this.hornglow[i] = new HornGlowRenderer(pony, 0, 3);
-            this.horn.addChild(this.hornglow[i]);
         }
 
         this.horn.addBox(-0.5F + HEAD_CENTRE_X, -10.0F + HEAD_CENTRE_Y, -1.5F + HEAD_CENTRE_Z, 1, 4, 1, stretch);
@@ -67,9 +66,9 @@ public class UnicornHorn extends AbstractHeadPart implements PonyModelConstants
 
     protected void position(float posX, float posY, float posZ) {
         AbstractPonyModel.setRotationPoint(this.horn, posX, posY, posZ);
-//        for (int i = 0; i < this.hornglow.length; i++) {
+        for (int i = 0; i < this.hornglow.length; i++) {
-//            AbstractPonyModel.setRotationPoint(this.hornglow[i], posX, posY, posZ);
+            AbstractPonyModel.setRotationPoint(this.hornglow[i], posX, posY, posZ);
-//        }
+        }
     }
 
     protected void rotate(float rotX, float rotY) {
@@ -77,15 +76,10 @@ public class UnicornHorn extends AbstractHeadPart implements PonyModelConstants
         this.horn.rotateAngleX = rotX + 0.5F;
         this.horn.rotateAngleY = rotY;
 
-//        for (int i = 0; i < this.hornglow.length; i++) {
+        for (int i = 0; i < this.hornglow.length; i++) {
-//            this.hornglow[i].rotateAngleX = rotX + 0.5F;
+            this.hornglow[i].rotateAngleX = rotX + 0.5F;
-//            this.hornglow[i].rotateAngleY = rotY;
+            this.hornglow[i].rotateAngleY = rotY;
-//        }
+        }
     }
 
-    @Override
-    protected ModelRenderer[] getModels() {
-        // TODO Auto-generated method stub
-        return new ModelRenderer[] { horn };
-    }
 }

src/main/java/com/brohoof/minelittlepony/model/pony/ModelVillagerPony.java

@@ -35,6 +35,24 @@ public class ModelVillagerPony extends ModelPlayerPony {
         this.VillagerTrinket.rotateAngleY = bodySwingRotation * 0.2F;
     }
 
+    @Override
+    protected void adjustBodyComponents(float rotateAngleX, float rotationPointY, float rotationPointZ) {
+        super.adjustBodyComponents(rotateAngleX, rotationPointY, rotationPointZ);
+
+        for (int i = 0; i < this.VillagerBagPiece.length; ++i) {
+            this.VillagerBagPiece[i].rotateAngleX = rotateAngleX;
+            this.VillagerBagPiece[i].rotationPointY = rotationPointY;
+            this.VillagerBagPiece[i].rotationPointZ = rotationPointZ;
+        }
+
+        this.VillagerApron.rotateAngleX = rotateAngleX;
+        this.VillagerApron.rotationPointY = rotationPointY;
+        this.VillagerApron.rotationPointZ = rotationPointZ;
+        this.VillagerTrinket.rotateAngleX = rotateAngleX;
+        this.VillagerTrinket.rotationPointY = rotationPointY;
+        this.VillagerTrinket.rotationPointZ = rotationPointZ;
+    }
+
     @Override
     protected void renderBody() {
         super.renderBody();
@@ -70,12 +88,6 @@ public class ModelVillagerPony extends ModelPlayerPony {
         this.VillagerBagPiece[13] = new PlaneRenderer(this, 56, 31);
         this.VillagerApron = new PlaneRenderer(this, 56, 16);
         this.VillagerTrinket = new PlaneRenderer(this, 0, 3);
-        
-        for (PlaneRenderer p : this.VillagerBagPiece) {
-            this.bipedBody.addChild(p);
-        }
-        this.bipedBody.addChild(this.VillagerApron);
-        this.bipedBody.addChild(this.VillagerTrinket);
     }
 
     @Override

src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java

@@ -21,8 +21,8 @@ public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> {
         addLayer(new LayerBipedArmor(this) {
             @Override
             protected void initArmor() {
-                this.modelLeggings = PMAPI.skeleton.getArmor().modelArmor;
+                this.field_177189_c = PMAPI.skeleton.getArmor().modelArmor;
-                this.modelArmor = PMAPI.skeleton.getArmor().modelArmorChestplate;
+                this.field_177186_d = PMAPI.skeleton.getArmor().modelArmorChestplate;
             }
         });
     }