Fix glitches with humans

Fix settings not loading.
This commit is contained in:
Matthew Messinger 2016-01-28 22:11:11 -05:00
parent aa9cd16293
commit 1a7860ff69
3 changed files with 5 additions and 2 deletions

View file

@ -52,6 +52,7 @@ public class MineLittlePony {
this.ponyManager = new PonyManager(config); this.ponyManager = new PonyManager(config);
this.proxy = new ProxyContainer(); this.proxy = new ProxyContainer();
LiteLoader.getInstance().registerExposable(config, null);
} }
void postInit(Minecraft minecraft) { void postInit(Minecraft minecraft) {

View file

@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL14;
import com.brohoof.minelittlepony.PonySize; import com.brohoof.minelittlepony.PonySize;
import com.brohoof.minelittlepony.model.BodyPart; import com.brohoof.minelittlepony.model.BodyPart;
import com.brohoof.minelittlepony.model.PlayerModel; import com.brohoof.minelittlepony.model.PlayerModel;
import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer;
import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; import com.brohoof.minelittlepony.model.pony.ModelPlayerPony;
import com.brohoof.minelittlepony.renderer.IRenderPony; import com.brohoof.minelittlepony.renderer.IRenderPony;
@ -43,7 +44,7 @@ public class LayerHeldPonyItem implements LayerRenderer {
public void doRenderLayer(EntityLivingBase entity, float p_177141_2_, float p_177141_3_, public void doRenderLayer(EntityLivingBase entity, float p_177141_2_, float p_177141_3_,
float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) {
PlayerModel pony = ((IRenderPony) livingPonyEntity).getPony(); PlayerModel pony = ((IRenderPony) livingPonyEntity).getPony();
if (pony.getModel().metadata.getRace() == null) { if (pony.getModel() instanceof ModelHumanPlayer) {
held.doRenderLayer(entity, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, held.doRenderLayer(entity, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_,
p_177141_7_, scale); p_177141_7_, scale);
return; return;

View file

@ -4,6 +4,7 @@ import static net.minecraft.client.renderer.GlStateManager.*;
import com.brohoof.minelittlepony.PonySize; import com.brohoof.minelittlepony.PonySize;
import com.brohoof.minelittlepony.model.PlayerModel; import com.brohoof.minelittlepony.model.PlayerModel;
import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer;
import com.brohoof.minelittlepony.renderer.IRenderPony; import com.brohoof.minelittlepony.renderer.IRenderPony;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
@ -34,7 +35,7 @@ public class LayerPonyCape implements LayerRenderer {
public void doRenderLayer(AbstractClientPlayer clientPlayer, float p2, float p3, float ticks, float p5, float p6, public void doRenderLayer(AbstractClientPlayer clientPlayer, float p2, float p3, float ticks, float p5, float p6,
float p7, float scale) { float p7, float scale) {
PlayerModel model = ((IRenderPony) renderer).getPony(); PlayerModel model = ((IRenderPony) renderer).getPony();
if (model.getModel().metadata.getRace() == null) { if (model.getModel() instanceof ModelHumanPlayer) {
cape.doRenderLayer(clientPlayer, p2, p3, ticks, p5, p6, p7, scale); cape.doRenderLayer(clientPlayer, p2, p3, ticks, p5, p6, p7, scale);
} else if (clientPlayer.hasPlayerInfo() && !clientPlayer.isInvisible() } else if (clientPlayer.hasPlayerInfo() && !clientPlayer.isInvisible()
&& clientPlayer.isWearing(EnumPlayerModelParts.CAPE) && clientPlayer.getLocationCape() != null) { && clientPlayer.isWearing(EnumPlayerModelParts.CAPE) && clientPlayer.getLocationCape() != null) {