All saddles are layers now instead of seperate textures.

src/main/java/com/legacy/aether/client/models/entities/FlyingCowModel.java

@@ -12,9 +12,9 @@ public class FlyingCowModel extends ModelQuadruped
     ModelRenderer horn1;
     ModelRenderer horn2;
 
-    public FlyingCowModel()
+    public FlyingCowModel(float scale)
     {
-        super(12, 0.0F);
+        super(12, scale);
         this.head = new ModelRenderer(this, 0, 0);
         this.head.addBox(-4.0F, -4.0F, -6.0F, 8, 8, 6, 0.0F);
         this.head.setRotationPoint(0.0F, 4.0F, -8.0F);
@@ -29,7 +29,7 @@ public class FlyingCowModel extends ModelQuadruped
         this.udders.setRotationPoint(0.0F, 14.0F, 6.0F);
         this.udders.rotateAngleX = ((float)Math.PI / 2F);
         this.body = new ModelRenderer(this, 18, 4);
-        this.body.addBox(-6.0F, -10.0F, -7.0F, 12, 18, 10, 0.0F);
+        this.body.addBox(-6.0F, -10.0F, -7.0F, 12, 18, 10, scale);
         this.body.setRotationPoint(0.0F, 5.0F, 2.0F);
         --this.leg1.rotationPointX;
         ++this.leg2.rotationPointX;

src/main/java/com/legacy/aether/client/renders/entities/FlyingCowRenderer.java

@@ -6,6 +6,7 @@ import net.minecraft.util.ResourceLocation;
 
 import com.legacy.aether.client.models.entities.FlyingCowModel;
 import com.legacy.aether.client.renders.entities.layer.FlyingCowWingLayer;
+import com.legacy.aether.client.renders.entities.layer.LayerFlyingCowSaddle;
 import com.legacy.aether.common.entities.passive.mountable.EntityFlyingCow;
 
 public class FlyingCowRenderer extends RenderLiving<EntityFlyingCow>
@@ -13,18 +14,17 @@ public class FlyingCowRenderer extends RenderLiving<EntityFlyingCow>
 
 	private static final ResourceLocation TEXTURE = new ResourceLocation("aether_legacy", "textures/entities/flying_cow/flying_cow.png");
 
-	private static final ResourceLocation TEXTURE_SADDLED = new ResourceLocation("aether_legacy", "textures/entities/flying_cow/saddle.png");
-
 	public FlyingCowRenderer(RenderManager renderManager)
 	{
-		super(renderManager, new FlyingCowModel(), 0.7F);
+		super(renderManager, new FlyingCowModel(0.0F), 0.7F);
 		this.addLayer(new FlyingCowWingLayer(renderManager));
+		this.addLayer(new LayerFlyingCowSaddle(this));
 	}
 
 	@Override
 	protected ResourceLocation getEntityTexture(EntityFlyingCow entity) 
 	{
-		return entity.getSaddled() ? TEXTURE_SADDLED : TEXTURE;
+		return TEXTURE;
 	}
 
 }

src/main/java/com/legacy/aether/client/renders/entities/MoaRenderer.java

@@ -9,8 +9,8 @@ import net.minecraft.util.math.MathHelper;
 import org.lwjgl.opengl.GL11;
 
 import com.legacy.aether.client.models.entities.MoaModel;
+import com.legacy.aether.client.renders.entities.layer.LayerMoaSaddle;
 import com.legacy.aether.client.renders.entities.layer.MoaDonatorLayer;
-import com.legacy.aether.client.renders.entities.layer.MoaLayer;
 import com.legacy.aether.common.entities.passive.mountable.EntityMoa;
 import com.legacy.aether.common.player.PlayerAether;
 
@@ -19,9 +19,9 @@ public class MoaRenderer extends RenderLiving<EntityMoa>
 
 	public MoaRenderer(RenderManager renderManager)
 	{
-		super(renderManager, new MoaModel(), 1.0F);
+		super(renderManager, new MoaModel(0.0F), 1.0F);
 
-		this.addLayer(new MoaLayer(renderManager, (MoaModel) this.getMainModel()));
+		this.addLayer(new LayerMoaSaddle(this));
 		this.addLayer(new MoaDonatorLayer(renderManager, (MoaModel) this.getMainModel()));
 	}
 

src/main/java/com/legacy/aether/client/renders/entities/PhygRenderer.java

@@ -5,6 +5,7 @@ import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.util.ResourceLocation;
 
+import com.legacy.aether.client.renders.entities.layer.LayerPhygSaddle;
 import com.legacy.aether.client.renders.entities.layer.PhygWingLayer;
 import com.legacy.aether.common.entities.passive.mountable.EntityPhyg;
 
@@ -13,18 +14,17 @@ public class PhygRenderer extends RenderLiving<EntityPhyg>
 
 	private static final ResourceLocation TEXTURE = new ResourceLocation("aether_legacy", "textures/entities/phyg/phyg.png");
 
-	private static final ResourceLocation TEXTURE_SADDLED = new ResourceLocation("aether_legacy", "textures/entities/phyg/saddle.png");
-
 	public PhygRenderer(RenderManager rendermanagerIn)
 	{
 		super(rendermanagerIn, new ModelPig(), 0.7F);
 		this.addLayer(new PhygWingLayer(rendermanagerIn));
+		this.addLayer(new LayerPhygSaddle(this));
 	}
 
 	@Override
 	protected ResourceLocation getEntityTexture(EntityPhyg entity)
 	{
-		return ((EntityPhyg) entity).getSaddled() ? TEXTURE_SADDLED : TEXTURE;
+		return TEXTURE;
 	}
 
 }

src/main/java/com/legacy/aether/client/renders/entities/layer/LayerFlyingCowSaddle.java

@@ -0,0 +1,39 @@
+package com.legacy.aether.client.renders.entities.layer;
+
+import com.legacy.aether.client.models.entities.FlyingCowModel;
+import com.legacy.aether.client.renders.entities.FlyingCowRenderer;
+import com.legacy.aether.common.entities.passive.mountable.EntityFlyingCow;
+import net.minecraft.client.model.ModelCow;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class LayerFlyingCowSaddle implements LayerRenderer<EntityFlyingCow>
+{
+    private static final ResourceLocation TEXTURE = new ResourceLocation("aether_legacy", "textures/entities/flying_cow/saddle.png");
+
+    private final FlyingCowRenderer cowRenderer;
+    private final FlyingCowModel cowModel = new FlyingCowModel(0.5F);
+
+    public LayerFlyingCowSaddle(FlyingCowRenderer cowRendererIn)
+    {
+        this.cowRenderer = cowRendererIn;
+    }
+
+    public void doRenderLayer(EntityFlyingCow entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale)
+    {
+        if (entitylivingbaseIn.getSaddled())
+        {
+            this.cowRenderer.bindTexture(TEXTURE);
+            this.cowModel.setModelAttributes(this.cowRenderer.getMainModel());
+            this.cowModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
+        }
+    }
+
+    public boolean shouldCombineTextures()
+    {
+        return false;
+    }
+}

src/main/java/com/legacy/aether/client/renders/entities/layer/LayerMoaSaddle.java

@@ -0,0 +1,50 @@
+package com.legacy.aether.client.renders.entities.layer;
+
+import com.legacy.aether.client.models.entities.MoaModel;
+import com.legacy.aether.client.renders.entities.MoaRenderer;
+import com.legacy.aether.common.entities.AetherEntities;
+import com.legacy.aether.common.entities.passive.mountable.EntityMoa;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class LayerMoaSaddle implements LayerRenderer<EntityMoa>
+{
+    private static final ResourceLocation SADDLE = new ResourceLocation("aether_legacy", "textures/entities/moa/moa_saddle.png");
+
+    private static final ResourceLocation BLACK_SADDLE = new ResourceLocation("aether_legacy", "textures/entities/moa/black_moa_saddle.png");
+
+    private final MoaRenderer moaRenderer;
+    private final MoaModel moaModel = new MoaModel(0.25F);
+
+    public LayerMoaSaddle(MoaRenderer moaRendererIn)
+    {
+        this.moaRenderer = moaRendererIn;
+    }
+
+    public void doRenderLayer(EntityMoa entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale)
+    {
+        if (entitylivingbaseIn.getSaddled() && !(entitylivingbaseIn.getMoaType() == AetherEntities.BLACK_MOA))
+        {
+        	this.moaModel.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entitylivingbaseIn);
+            this.moaRenderer.bindTexture(SADDLE);
+            this.moaModel.setModelAttributes(this.moaRenderer.getMainModel());
+            this.moaModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
+        }
+        
+        else if (entitylivingbaseIn.getSaddled())
+        {
+        	this.moaModel.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entitylivingbaseIn);
+            this.moaRenderer.bindTexture(BLACK_SADDLE);
+            this.moaModel.setModelAttributes(this.moaRenderer.getMainModel());
+            this.moaModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
+        }
+    }
+
+    public boolean shouldCombineTextures()
+    {
+        return false;
+    }
+}

src/main/java/com/legacy/aether/client/renders/entities/layer/LayerPhygSaddle.java

@@ -0,0 +1,38 @@
+package com.legacy.aether.client.renders.entities.layer;
+
+import com.legacy.aether.client.renders.entities.PhygRenderer;
+import com.legacy.aether.common.entities.passive.mountable.EntityPhyg;
+
+import net.minecraft.client.model.ModelPig;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class LayerPhygSaddle implements LayerRenderer<EntityPhyg>
+{
+    private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/pig/pig_saddle.png");
+    private final PhygRenderer phygRenderer;
+    private final ModelPig pigModel = new ModelPig(0.5F);
+
+    public LayerPhygSaddle(PhygRenderer phygRendererIn)
+    {
+        this.phygRenderer = phygRendererIn;
+    }
+
+    public void doRenderLayer(EntityPhyg entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale)
+    {
+        if (entitylivingbaseIn.getSaddled())
+        {
+            this.phygRenderer.bindTexture(TEXTURE);
+            this.pigModel.setModelAttributes(this.phygRenderer.getMainModel());
+            this.pigModel.render(entitylivingbaseIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
+        }
+    }
+
+    public boolean shouldCombineTextures()
+    {
+        return false;
+    }
+}

src/main/java/com/legacy/aether/client/renders/entities/layer/MoaLayer.java

@@ -1,41 +0,0 @@
-package com.legacy.aether.client.renders.entities.layer;
-
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.util.ResourceLocation;
-
-import com.legacy.aether.client.models.entities.MoaModel;
-import com.legacy.aether.common.entities.passive.mountable.EntityMoa;
-
-public class MoaLayer implements LayerRenderer<EntityMoa>
-{
-
-	private static final ResourceLocation TEXTURE_BRACE = new ResourceLocation("aether_legacy", "textures/entities/moa/moa_brace.png");
-
-	private RenderManager renderManager;
-
-	private MoaModel moaModel;
-
-	public MoaLayer(RenderManager manager, MoaModel moaModel)
-	{
-		this.renderManager = manager;
-		this.moaModel = moaModel;
-	}
-
-	@Override
-	public void doRenderLayer(EntityMoa moa, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale)
-	{
-		if (moa.isSitting())
-		{
-			this.renderManager.renderEngine.bindTexture(TEXTURE_BRACE);
-			this.moaModel.render(moa, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
-		}
-	}
-
-	@Override
-	public boolean shouldCombineTextures()
-	{
-		return false;
-	}
-
-}