From 21df57a0543fa7570414188df601d90f9d77a457 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 30 Oct 2013 18:29:02 +1100 Subject: [PATCH] Fixed wasp hurt highlighting --- .../entities/models/ModelWasp.java | 5 ----- .../entities/render/RenderWasp.java | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/common/biomesoplenty/entities/models/ModelWasp.java b/common/biomesoplenty/entities/models/ModelWasp.java index 2a2d18bfe..6b9a36628 100644 --- a/common/biomesoplenty/entities/models/ModelWasp.java +++ b/common/biomesoplenty/entities/models/ModelWasp.java @@ -1,7 +1,5 @@ package biomesoplenty.entities.models; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -134,9 +132,6 @@ public class ModelWasp extends ModelBase @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.75F, 0.0F); - this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); /*Head*/ diff --git a/common/biomesoplenty/entities/render/RenderWasp.java b/common/biomesoplenty/entities/render/RenderWasp.java index 98d186f97..5907b22ca 100644 --- a/common/biomesoplenty/entities/render/RenderWasp.java +++ b/common/biomesoplenty/entities/render/RenderWasp.java @@ -1,14 +1,17 @@ package biomesoplenty.entities.render; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import biomesoplenty.entities.models.ModelWasp; +import org.lwjgl.opengl.GL11; + +import biomesoplenty.entities.models.ModelWasp; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) public class RenderWasp extends RenderLiving { public RenderWasp() @@ -17,6 +20,13 @@ public class RenderWasp extends RenderLiving this.shadowSize = 0.0F; } + @Override + protected void preRenderCallback(EntityLivingBase entity, float partialTickTime) + { + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.75F, 0.0F); + } + @Override protected ResourceLocation getEntityTexture(Entity entity) {