The partial tick should be available for all render player events. Weird it wasn't.

This commit is contained in:
Christian committed 2013-09-07 16:25:30 -04:00
1 parent f9728e8f3f
commit 519da32391
2 files changed
+11 -7

No files matched your search

@@ -9,30 +9,33 @@ import net.minecraftforge.event.entity.player.PlayerEvent;
public abstract class RenderPlayerEvent extends PlayerEvent
{
public final RenderPlayer renderer;
public final float partialRenderTick;
public RenderPlayerEvent(EntityPlayer player, RenderPlayer renderer)
public RenderPlayerEvent(EntityPlayer player, RenderPlayer renderer, float partialRenderTick)
{
super(player);
this.renderer = renderer;
this.partialRenderTick = partialRenderTick;
}
@Cancelable
public static class Pre extends RenderPlayerEvent
{
public Pre(EntityPlayer player, RenderPlayer renderer){ super(player, renderer); }
public Pre(EntityPlayer player, RenderPlayer renderer, float tick){ super(player, renderer, tick); }
}
public static class Post extends RenderPlayerEvent
{
public Post(EntityPlayer player, RenderPlayer renderer){ super(player, renderer); }
public Post(EntityPlayer player, RenderPlayer renderer, float tick){ super(player, renderer, tick); }
}
public abstract static class Specials extends RenderPlayerEvent
{
@Deprecated
public final float partialTicks;
public Specials(EntityPlayer player, RenderPlayer renderer, float partialTicks)
{
super(player, renderer);
super(player, renderer, partialTicks);
this.partialTicks = partialTicks;
}
@@ -59,11 +62,12 @@ public abstract class RenderPlayerEvent extends PlayerEvent
*/
public int result = -1;
public final int slot;
@Deprecated
public final float partialTick;
public final ItemStack stack;
public SetArmorModel(EntityPlayer player, RenderPlayer renderer, int slot, float partialTick, ItemStack stack)
{
super(player, renderer);
super(player, renderer, partialTick);
this.slot = slot;
this.partialTick = partialTick;
this.stack = stack;
@@ -80,7 +80,7 @@
public void func_130009_a(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
{
+ if (MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Pre(par1AbstractClientPlayer, this))) return;
+ if (MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Pre(par1AbstractClientPlayer, this, par9))) return;
float f2 = 1.0F;
GL11.glColor3f(f2, f2, f2);
ItemStack itemstack = par1AbstractClientPlayer.inventory.getCurrentItem();
@@ -88,7 +88,7 @@
this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false;
this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false;
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0;
+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Post(par1AbstractClientPlayer, this));
+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Post(par1AbstractClientPlayer, this, par9));
}
protected ResourceLocation func_110817_a(AbstractClientPlayer par1AbstractClientPlayer)