From 555af2184fb2db1968409b4ab6bb1b2924d3a044 Mon Sep 17 00:00:00 2001 From: SteveKunG Date: Thu, 21 Sep 2017 13:10:10 +0700 Subject: [PATCH] Bug fixes --- .../carryon/client/event/RenderEvents.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index 280f368..8046313 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -2,7 +2,6 @@ package tschipp.carryon.client.event; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -19,8 +18,8 @@ import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -50,6 +49,11 @@ import tschipp.carryon.network.server.SyncKeybindPacket; public class RenderEvents { + private static boolean initModels; + private ModelRenderer fakeLeftArm; + private ModelRenderer fakeRightArm; + private ModelRenderer fakeLeftArmwear; + private ModelRenderer fakeRightArmwear; /* * Prevents the Player from scrolling @@ -226,6 +230,8 @@ public class RenderEvents ModelPlayer modelPlayer = renderPlayer.getMainModel(); modelPlayer.bipedLeftArm.isHidden = false; modelPlayer.bipedRightArm.isHidden = false; + modelPlayer.bipedLeftArmwear.isHidden = false; + modelPlayer.bipedRightArmwear.isHidden = false; } } } @@ -311,22 +317,22 @@ public class RenderEvents @SubscribeEvent public void onPlayerRenderPre(RenderPlayerEvent.Pre event) { - if (!Loader.isModLoaded("mobends") && CarryOnConfig.settings.renderArms) { - EntityPlayer player = event.getEntityPlayer(); AbstractClientPlayer aplayer = (AbstractClientPlayer) player; ItemStack stack = player.getHeldItemMainhand(); ModelPlayer model = event.getRenderer().getMainModel(); - EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player; - ResourceLocation skinLoc = DefaultPlayerSkin.getDefaultSkin(player.getPersistentID()); - ModelRenderer fakeLeftArm = new ModelRenderer(model, 32, 48); - ModelRenderer fakeRightArm = new ModelRenderer(model, 40, 16); - ModelRenderer fakeLeftArmwear = new ModelRenderer(model, 48, 48); - ModelRenderer fakeRightArmwear = new ModelRenderer(model, 40, 32); + if (!initModels) + { + fakeLeftArm = new ModelRenderer(model, 32, 48); + fakeRightArm = new ModelRenderer(model, 40, 16); + fakeLeftArmwear = new ModelRenderer(model, 48, 48); + fakeRightArmwear = new ModelRenderer(model, 40, 32); + initModels = true; + } player.setArrowCountInEntity(0); // TODO Temporary Fix @@ -422,11 +428,11 @@ public class RenderEvents model.bipedBody.addChild(fakeLeftArm); model.bipedBody.addChild(fakeRightArm); - if (Minecraft.getMinecraft().gameSettings.getModelParts().contains(EnumPlayerModelParts.LEFT_SLEEVE)) + if (player.isWearing(EnumPlayerModelParts.LEFT_SLEEVE)) { model.bipedBody.addChild(fakeLeftArmwear); } - if (Minecraft.getMinecraft().gameSettings.getModelParts().contains(EnumPlayerModelParts.RIGHT_SLEEVE)) + if (player.isWearing(EnumPlayerModelParts.RIGHT_SLEEVE)) { model.bipedBody.addChild(fakeRightArmwear); }