From 23f2151eedf2c7f51b6eb7c10c573e29f2c2e661 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 16 Aug 2018 21:32:09 +0200 Subject: [PATCH] Skeletons don't need two armour layers, do they? --- .../java/com/minelittlepony/model/ModelWrapper.java | 3 ++- .../render/ponies/RenderPonySkeleton.java | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/ModelWrapper.java b/src/main/java/com/minelittlepony/model/ModelWrapper.java index 3a48db66..28a887dc 100644 --- a/src/main/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/main/java/com/minelittlepony/model/ModelWrapper.java @@ -1,5 +1,6 @@ package com.minelittlepony.model; +import com.minelittlepony.model.armour.IEquestrianArmor; import com.minelittlepony.model.armour.PonyArmor; import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.pony.data.IPonyData; @@ -29,7 +30,7 @@ public class ModelWrapper implements IModelWrapper { * Returns the contained armour model. * @return */ - public PonyArmor getArmor() { + public IEquestrianArmor getArmor() { return armor; } diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java b/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java index 5f0bc6e1..c229a60c 100644 --- a/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java +++ b/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java @@ -10,7 +10,6 @@ import com.mojang.authlib.GameProfile; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.AbstractSkeleton; import net.minecraft.entity.monster.EntityStray; import net.minecraft.entity.monster.EntityWitherSkeleton; @@ -38,18 +37,6 @@ public class RenderPonySkeleton extends Rende super(manager, PMAPI.skeleton); } - @Override - protected void addLayers() { - super.addLayers(); - addLayer(new LayerBipedArmor(this) { - @Override - protected void initArmor() { - modelLeggings = getModelWrapper().getArmor().innerLayer; - modelArmor = getModelWrapper().getArmor().outerLayer; - } - }); - } - @Override protected ResourceLocation getTexture(Skeleton entity) { return SKELETON;