From 724f09c13017ebf9c2db00d2e9ac49c358c3dc15 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 19 Jul 2015 19:06:22 -0400 Subject: [PATCH] More arm stuffs! --- .../client/ClientEventHandler.java | 5 ++-- .../client/ClientUtils.java | 16 +++++++++---- .../client/POVArmourModelWrapper.java | 23 ++++++++----------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index a0a1e065..231d573a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -29,12 +29,13 @@ public class ClientEventHandler @SubscribeEvent public void renderPOVArmour(RenderHandEvent event) { -// if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) + if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) { currentPlayerTexture = ((AbstractClientPlayer) mc.thePlayer).getLocationSkin(); // if(mc.thePlayer.isAirBorne) - ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); + ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); + event.setCanceled(true); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java index ec997280..81a2aeb1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java @@ -217,13 +217,21 @@ public class ClientUtils float f = 1.0F; GL11.glColor3f(f, f, f); + GL11.glPushMatrix(); ModelRenderer mRenderer = new POVArmourModelWrapper(renderer.modelBipedMain); -// renderer.modelBipedMain.onGround = 0.0F; -// mRenderer.rotateAngleX = 1; - GL11.glTranslatef(-0.3f, -0.25f, 0); + renderer.modelBipedMain.onGround = 0.0F; + renderer.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, player); + renderer.modelBipedMain.bipedRightArm.render(0.0625F); + + GL11.glPushMatrix(); +// GL11.glTranslatef(-0.3f, -0.25f, 0); + mRenderer.rotateAngleX = renderer.modelBipedMain.bipedRightArm.rotateAngleX; + mRenderer.rotateAngleY = renderer.modelBipedMain.bipedRightArm.rotateAngleY; + mRenderer.rotateAngleZ = renderer.modelBipedMain.bipedRightArm.rotateAngleZ; mRenderer.render(0.0625F); + GL11.glPopMatrix(); + GL11.glPopMatrix(); // renderer.modelBipedMain.bipedRightArm.addChild(new POVArmourModelWrapper(renderer.modelBipedMain)); -// renderer.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, player); // renderer.modelBipedMain.bipedRightArm.render(0.0625F); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java b/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java index 9d40ae82..cac139e7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java @@ -32,19 +32,16 @@ public class POVArmourModelWrapper extends ModelRenderer @Override public void render(float partialTicks) { -// if (ClientEventHandler.currentEvent != null && ClientEventHandler.currentPartsData != null && ClientEventHandler.currentPlayerTexture != null) - { -// PartInfo info = ClientEventHandler.currentPartsData.getPartInfo(partType); -// if (info != null && info.hasPart) - { - GL11.glPushMatrix(); -// GL11.glTranslated(0.3, -.1, 0); - Minecraft.getMinecraft().renderEngine.bindTexture(resource); - armModel.render(partialTicks); + GL11.glPushMatrix(); +// GL11.glTranslated(0.3, -.1, 0); + Minecraft.getMinecraft().renderEngine.bindTexture(resource); + armModel.rotateAngleX = this.rotateAngleX; + armModel.rotateAngleY = this.rotateAngleY; + armModel.rotateAngleZ = this.rotateAngleZ; + armModel.render(partialTicks); + + GL11.glPopMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(ClientEventHandler.currentPlayerTexture); - GL11.glPopMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(ClientEventHandler.currentPlayerTexture); - } - } } }