From d68b335a6202b102672d4df43fdfd1426a9425c8 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Thu, 29 Dec 2016 03:07:43 -0500 Subject: [PATCH] override transform in humanplayer instead of testing instanceof. --- .../java/com/minelittlepony/model/AbstractPonyModel.java | 7 +------ .../com/minelittlepony/model/pony/ModelHumanPlayer.java | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index b04936bd..6906c5b8 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -2,7 +2,6 @@ package com.minelittlepony.model; import com.minelittlepony.PonyData; import com.minelittlepony.PonySize; -import com.minelittlepony.model.pony.ModelHumanPlayer; import com.minelittlepony.model.pony.ModelPlayerPony; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelPlayer; @@ -12,9 +11,7 @@ import net.minecraft.util.math.MathHelper; import java.util.Random; -import static net.minecraft.client.renderer.GlStateManager.rotate; -import static net.minecraft.client.renderer.GlStateManager.scale; -import static net.minecraft.client.renderer.GlStateManager.translate; +import static net.minecraft.client.renderer.GlStateManager.*; /** * TODO move this into constructor and make separate classes for the races. @@ -88,8 +85,6 @@ public abstract class AbstractPonyModel extends ModelPlayer { } public void transform(BodyPart part) { - if (this instanceof ModelHumanPlayer) - return; if (this.isRiding) { translate(0.0F, -0.6F, -0.2F); } diff --git a/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java b/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java index 3a18d313..1087319c 100644 --- a/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java @@ -1,6 +1,7 @@ package com.minelittlepony.model.pony; import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; public class ModelHumanPlayer extends AbstractPonyModel { @@ -13,4 +14,7 @@ public class ModelHumanPlayer extends AbstractPonyModel { return true; } + @Override + public void transform(BodyPart part) { + } }