keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Clean patch fuzz

Browse source
This commit is contained in:
Christian 2013-09-20 21:17:38 -04:00
parent e03a4db2b9
commit a7fde237bb
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java --- ../src_base/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java +++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
@@ -17,6 +17,9 @@ @@ -18,6 +18,9 @@
import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.RenderLivingEvent; +import net.minecraftforge.client.event.RenderLivingEvent;
@ -10,7 +10,7 @@
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;
@@ -29,6 +32,9 @@ @@ -30,6 +33,9 @@
/** The model to be used during the render passes. */ /** The model to be used during the render passes. */
protected ModelBase renderPassModel; protected ModelBase renderPassModel;
@ -20,7 +20,7 @@
public RendererLivingEntity(ModelBase par1ModelBase, float par2) public RendererLivingEntity(ModelBase par1ModelBase, float par2)
{ {
this.mainModel = par1ModelBase; 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) public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9)
{ {
@ -28,7 +28,7 @@
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glDisable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_CULL_FACE);
this.mainModel.onGround = this.renderSwingProgress(par1EntityLivingBase, par9); this.mainModel.onGround = this.renderSwingProgress(par1EntityLivingBase, par9);
@@ -277,6 +284,7 @@ @@ -278,6 +285,7 @@
GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix(); GL11.glPopMatrix();
this.passSpecialRender(par1EntityLivingBase, par2, par4, par6); 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) protected void passSpecialRender(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6)
{ {
@ -51,7 +51,7 @@
if (d3 < (double)(f2 * f2)) if (d3 < (double)(f2 * f2))
{ {
@@ -491,6 +500,7 @@ @@ -497,6 +506,7 @@
} }
} }
} }