PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Skeletons don't need two armour layers, do they?

Browse source
This commit is contained in:
Sollace 2018-08-16 21:32:09 +02:00
parent 4bea2e77a3
commit 23f2151eed
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/model/ModelWrapper.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.model; package com.minelittlepony.model;
import com.minelittlepony.model.armour.IEquestrianArmor;
import com.minelittlepony.model.armour.PonyArmor; import com.minelittlepony.model.armour.PonyArmor;
import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.model.capabilities.IModelWrapper;
import com.minelittlepony.pony.data.IPonyData; import com.minelittlepony.pony.data.IPonyData;
@ -29,7 +30,7 @@ public class ModelWrapper implements IModelWrapper {
* Returns the contained armour model. * Returns the contained armour model.
* @return * @return
*/ */
public PonyArmor getArmor() { public IEquestrianArmor getArmor() {
return armor; return armor;
} }

13
src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java
View file

@ -10,7 +10,6 @@ import com.mojang.authlib.GameProfile;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderManager; 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.AbstractSkeleton;
import net.minecraft.entity.monster.EntityStray; import net.minecraft.entity.monster.EntityStray;
import net.minecraft.entity.monster.EntityWitherSkeleton; import net.minecraft.entity.monster.EntityWitherSkeleton;
@ -38,18 +37,6 @@ public class RenderPonySkeleton<Skeleton extends AbstractSkeleton> extends Rende
super(manager, PMAPI.skeleton); 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 @Override
protected ResourceLocation getTexture(Skeleton entity) { protected ResourceLocation getTexture(Skeleton entity) {
return SKELETON; return SKELETON;