From 43be1f46a5f9528f550bf42fd29041ce3164452b Mon Sep 17 00:00:00 2001 From: E2 Date: Mon, 5 Jun 2017 20:43:37 -0400 Subject: [PATCH] RenderLivingEvent now stores partialTick 2 --- .../renderer/entity/RenderLivingBase.java.patch | 4 ++-- .../client/event/RenderLivingEvent.java | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch index eb6ce86f6c..cdefb47ee7 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch @@ -14,7 +14,7 @@ public void func_76986_a(T p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { -+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderLivingEvent.Pre(p_76986_1_, this, p_76986_2_, p_76986_4_, p_76986_6_))) return; ++ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderLivingEvent.Pre(p_76986_1_, this, p_76986_9_, p_76986_2_, p_76986_4_, p_76986_6_))) return; GlStateManager.func_179094_E(); GlStateManager.func_179129_p(); this.field_77045_g.field_78095_p = this.func_77040_d(p_76986_1_, p_76986_9_); @@ -45,7 +45,7 @@ GlStateManager.func_179089_o(); GlStateManager.func_179121_F(); super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); -+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderLivingEvent.Post(p_76986_1_, this, p_76986_2_, p_76986_4_, p_76986_6_)); ++ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderLivingEvent.Post(p_76986_1_, this, p_76986_9_, p_76986_2_, p_76986_4_, p_76986_6_)); } public float func_188322_c(T p_188322_1_, float p_188322_2_) diff --git a/src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java b/src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java index 787e1d6c1b..6d47cb2816 100644 --- a/src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java +++ b/src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java @@ -28,14 +28,22 @@ public abstract class RenderLivingEvent extends Even { private final EntityLivingBase entity; private final RenderLivingBase renderer; + private final float partialRenderTick; private final double x; private final double y; private final double z; + @Deprecated public RenderLivingEvent(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z) + { + this(entity, renderer, 1, x, y, z); + } + + public RenderLivingEvent(EntityLivingBase entity, RenderLivingBase renderer, float partialRenderTick, double x, double y, double z) { this.entity = entity; this.renderer = renderer; + this.partialRenderTick = partialRenderTick; this.x = x; this.y = y; this.z = z; @@ -43,6 +51,7 @@ public abstract class RenderLivingEvent extends Even public EntityLivingBase getEntity() { return entity; } public RenderLivingBase getRenderer() { return renderer; } + public float getPartialRenderTick() { return partialRenderTick; } public double getX() { return x; } public double getY() { return y; } public double getZ() { return z; } @@ -50,16 +59,20 @@ public abstract class RenderLivingEvent extends Even @Cancelable public static class Pre extends RenderLivingEvent { + @Deprecated public Pre(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, x, y, z); } + public Pre(EntityLivingBase entity, RenderLivingBase renderer, float partialRenderTick, double x, double y, double z){ super(entity, renderer, partialRenderTick, x, y, z); } } public static class Post extends RenderLivingEvent { + @Deprecated public Post(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, x, y, z); } + public Post(EntityLivingBase entity, RenderLivingBase renderer, float partialRenderTick, double x, double y, double z){ super(entity, renderer, partialRenderTick, x, y, z); } } public abstract static class Specials extends RenderLivingEvent { - public Specials(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, x, y, z); } + public Specials(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, 0, x, y, z); } @Cancelable public static class Pre extends Specials @@ -68,7 +81,7 @@ public abstract class RenderLivingEvent extends Even } public static class Post extends Specials { - public Post(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, x, y, z); } + public Post(EntityLivingBase entity, RenderLivingBase renderer, double x, double y, double z){ super(entity, renderer, x, y, z); } } } }