From a7fde237bb570789aa8e2dd267f8f69c3f9689c8 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 20 Sep 2013 21:17:38 -0400 Subject: [PATCH] Clean patch fuzz --- .../entity/RendererLivingEntity.java.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch index c2e922186..e336a3838 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java -@@ -17,6 +17,9 @@ - import net.minecraft.entity.projectile.EntityArrow; +@@ -18,6 +18,9 @@ + import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.RenderLivingEvent; @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -@@ -29,6 +32,9 @@ +@@ -30,6 +33,9 @@ /** The model to be used during the render passes. */ protected ModelBase renderPassModel; @@ -20,7 +20,7 @@ public RendererLivingEntity(ModelBase par1ModelBase, float par2) { this.mainModel = par1ModelBase; -@@ -68,6 +74,7 @@ +@@ -69,6 +75,7 @@ public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9) { @@ -28,7 +28,7 @@ GL11.glPushMatrix(); GL11.glDisable(GL11.GL_CULL_FACE); this.mainModel.onGround = this.renderSwingProgress(par1EntityLivingBase, par9); -@@ -277,6 +284,7 @@ +@@ -278,6 +285,7 @@ GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); this.passSpecialRender(par1EntityLivingBase, par2, par4, par6); @@ -36,7 +36,7 @@ } /** -@@ -442,12 +450,13 @@ +@@ -448,12 +456,13 @@ */ protected void passSpecialRender(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6) { @@ -51,7 +51,7 @@ if (d3 < (double)(f2 * f2)) { -@@ -491,6 +500,7 @@ +@@ -497,6 +506,7 @@ } } }