From f48dafda7ea20bf7fe70d66a6590b765dea7833f Mon Sep 17 00:00:00 2001 From: iChun Date: Fri, 26 Jul 2013 12:38:17 +0800 Subject: [PATCH 1/4] Add Pre and Post events for RenderLivingEvent --- .../minecraftforge/client/event/RenderLivingEvent.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/net/minecraftforge/client/event/RenderLivingEvent.java b/client/net/minecraftforge/client/event/RenderLivingEvent.java index 6c64db9c3b..7b028e1f59 100644 --- a/client/net/minecraftforge/client/event/RenderLivingEvent.java +++ b/client/net/minecraftforge/client/event/RenderLivingEvent.java @@ -15,6 +15,16 @@ public abstract class RenderLivingEvent extends Event this.entity = entity; this.renderer = renderer; } + + @Cancelable + public static class Pre extends RenderLivingEvent + { + public Pre(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); } + } + public static class Post extends RenderLivingEvent + { + public Post(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); } + } public abstract static class Specials extends RenderLivingEvent { From 3e8711580e5d305d9e7474580931e7a31d85e535 Mon Sep 17 00:00:00 2001 From: iChun Date: Fri, 26 Jul 2013 12:46:52 +0800 Subject: [PATCH 2/4] Add Pre and Post events firing for RendererLivingEntity --- .../renderer/entity/RendererLivingEntity.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) 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 59d63e9a6a..990032eb83 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch @@ -43,3 +43,12 @@ } protected boolean func_110813_b(EntityLivingBase par1EntityLivingBase) +@@ -570,7 +578,9 @@ + */ + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) + { ++ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre((EntityLivingBase)par1Entity, this)); + this.func_130000_a((EntityLivingBase)par1Entity, par2, par4, par6, par8, par9); ++ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Post((EntityLivingBase)par1Entity, this)); + } +} From fb04d108867bbdeaf030d34307f9af06d807337f Mon Sep 17 00:00:00 2001 From: iChun Date: Fri, 26 Jul 2013 12:49:14 +0800 Subject: [PATCH 3/4] if statement added --- .../client/renderer/entity/RendererLivingEntity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 990032eb83..c0f9df38e1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch @@ -47,7 +47,7 @@ */ public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { -+ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre((EntityLivingBase)par1Entity, this)); ++ if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre((EntityLivingBase)par1Entity, this))) return; this.func_130000_a((EntityLivingBase)par1Entity, par2, par4, par6, par8, par9); + MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Post((EntityLivingBase)par1Entity, this)); } From abdcd23d8b0c274d55dfd6b79022c95428e663aa Mon Sep 17 00:00:00 2001 From: iChun Date: Fri, 26 Jul 2013 12:51:42 +0800 Subject: [PATCH 4/4] Update RendererLivingEntity.java.patch --- .../client/renderer/entity/RendererLivingEntity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0f9df38e1..4a92efc5f9 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java.patch @@ -43,7 +43,7 @@ } protected boolean func_110813_b(EntityLivingBase par1EntityLivingBase) -@@ -570,7 +578,9 @@ +@@ -570,6 +578,8 @@ */ public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) {