From 32e6539debd78a47d6ae07dc36e54e118d3b6d7c Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 19 Jul 2015 17:01:18 -0400 Subject: [PATCH] More attempts at the armour rendering, and an attempt to fix the entities. --- .../client/ClientEventHandler.java | 6 +++-- .../client/ClientUtils.java | 24 ++++++++++++------- .../client/POVArmourModelWrapper.java | 2 +- .../common/entity/mob/EntityBileDemon.java | 1 - .../common/entity/mob/EntityFallenAngel.java | 1 - .../common/entity/mob/EntityIceDemon.java | 1 - .../entity/mob/EntityLowerGuardian.java | 1 - .../common/entity/mob/EntityShade.java | 1 - .../entity/mob/EntitySmallEarthGolem.java | 1 - .../entity/mob/EntityWingedFireDemon.java | 1 - 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index 0575846f..a0a1e065 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -29,10 +29,12 @@ public class ClientEventHandler @SubscribeEvent public void renderPOVArmour(RenderHandEvent event) { - if (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(); - ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); + +// if(mc.thePlayer.isAirBorne) + ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java index c53b9843..ec997280 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientUtils.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.client; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.Render; @@ -26,11 +27,11 @@ public class ClientUtils float f1 = 1.0f;//this.prevEquippedProgress + (this.equippedProgress - this.prevEquippedProgress) * partialTickTime; EntityClientPlayerMP entityclientplayermp = mc.thePlayer; float f2 = entityclientplayermp.prevRotationPitch + (entityclientplayermp.rotationPitch - entityclientplayermp.prevRotationPitch) * partialTickTime; - GL11.glPushMatrix(); - GL11.glRotatef(f2, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(entityclientplayermp.prevRotationYaw + (entityclientplayermp.rotationYaw - entityclientplayermp.prevRotationYaw) * partialTickTime, 0.0F, 1.0F, 0.0F); +// GL11.glPushMatrix(); + GL11.glRotatef(180 - (entityclientplayermp.prevRotationYaw + (entityclientplayermp.rotationYaw - entityclientplayermp.prevRotationYaw) * partialTickTime), 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-f2, 1.0F, 0.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GL11.glPopMatrix(); +// GL11.glPopMatrix(); EntityPlayerSP entityplayersp = (EntityPlayerSP)entityclientplayermp; float f3 = entityplayersp.prevRenderArmPitch + (entityplayersp.renderArmPitch - entityplayersp.prevRenderArmPitch) * partialTickTime; float f4 = entityplayersp.prevRenderArmYaw + (entityplayersp.renderArmYaw - entityplayersp.prevRenderArmYaw) * partialTickTime; @@ -212,12 +213,17 @@ public class ClientUtils } public static void renderFirstPersonArm(RenderPlayer renderer, EntityPlayer player) - { + { float f = 1.0F; GL11.glColor3f(f, f, f); - renderer.modelBipedMain.onGround = 0.0F; - renderer.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, player); - renderer.modelBipedMain.bipedRightArm.addChild(new POVArmourModelWrapper(renderer.modelBipedMain)); - renderer.modelBipedMain.bipedRightArm.render(0.0625F); + + ModelRenderer mRenderer = new POVArmourModelWrapper(renderer.modelBipedMain); +// renderer.modelBipedMain.onGround = 0.0F; +// mRenderer.rotateAngleX = 1; + GL11.glTranslatef(-0.3f, -0.25f, 0); + mRenderer.render(0.0625F); +// 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 66100182..9d40ae82 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/POVArmourModelWrapper.java @@ -38,7 +38,7 @@ public class POVArmourModelWrapper extends ModelRenderer // if (info != null && info.hasPart) { GL11.glPushMatrix(); - GL11.glTranslated(0.3, -.1, 0); +// GL11.glTranslated(0.3, -.1, 0); Minecraft.getMinecraft().renderEngine.bindTexture(resource); armModel.render(partialTicks); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java index 65cc085a..1d9203da 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java @@ -98,7 +98,6 @@ public class EntityBileDemon extends EntityDemon { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1))); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java index 13d6630e..5f841983 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java @@ -105,7 +105,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java index a5e2130d..288a0d54 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java @@ -115,7 +115,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java index 18fc2c28..35aacd14 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java @@ -99,7 +99,6 @@ public class EntityLowerGuardian extends EntityDemon { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java index 2b57f5c2..cac5c5ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java @@ -105,7 +105,6 @@ public class EntityShade extends EntityDemon { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java index 562ec17d..70cb907c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java @@ -103,7 +103,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java index 18733e43..0697085d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java @@ -107,7 +107,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM { super.entityInit(); this.dataWatcher.addObject(18, this.getHealth()); - this.dataWatcher.addObject(19, 0); } /**