102 lines
5.4 KiB
Diff
102 lines
5.4 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java
|
|
@@ -216,7 +216,7 @@
|
|
bufferbuilder.func_181662_b(135.0D, -7.0D, 0.0D).func_187315_a(1.0D, 0.0D).func_181675_d();
|
|
bufferbuilder.func_181662_b(-7.0D, -7.0D, 0.0D).func_187315_a(0.0D, 0.0D).func_181675_d();
|
|
tessellator.func_78381_a();
|
|
- MapData mapdata = Items.field_151098_aY.func_77873_a(p_187461_1_, this.field_78455_a.field_71441_e);
|
|
+ MapData mapdata = ((net.minecraft.item.ItemMap) p_187461_1_.func_77973_b()).func_77873_a(p_187461_1_, this.field_78455_a.field_71441_e);
|
|
|
|
if (mapdata != null)
|
|
{
|
|
@@ -312,7 +312,7 @@
|
|
{
|
|
ItemStack itemstack = abstractclientplayer.func_184607_cu();
|
|
|
|
- if (itemstack.func_77973_b() == Items.field_151031_f)
|
|
+ if (!itemstack.func_190926_b() && itemstack.func_77973_b() == Items.field_151031_f) //Forge: Data watcher can desync and cause this to NPE...
|
|
{
|
|
EnumHand enumhand1 = abstractclientplayer.func_184600_cs();
|
|
flag = enumhand1 == EnumHand.MAIN_HAND;
|
|
@@ -329,6 +329,7 @@
|
|
{
|
|
float f3 = enumhand == EnumHand.MAIN_HAND ? f : 0.0F;
|
|
float f5 = 1.0F - (this.field_187470_g + (this.field_187469_f - this.field_187470_g) * p_78440_1_);
|
|
+ if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(EnumHand.MAIN_HAND, p_78440_1_, f1, f3, f5, this.field_187467_d))
|
|
this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.MAIN_HAND, f3, this.field_187467_d, f5);
|
|
}
|
|
|
|
@@ -336,6 +337,7 @@
|
|
{
|
|
float f4 = enumhand == EnumHand.OFF_HAND ? f : 0.0F;
|
|
float f6 = 1.0F - (this.field_187472_i + (this.field_187471_h - this.field_187472_i) * p_78440_1_);
|
|
+ if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(EnumHand.OFF_HAND, p_78440_1_, f1, f4, f6, this.field_187468_e))
|
|
this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.OFF_HAND, f4, this.field_187468_e, f6);
|
|
}
|
|
|
|
@@ -356,7 +358,7 @@
|
|
this.func_187456_a(p_187457_7_, p_187457_5_, enumhandside);
|
|
}
|
|
}
|
|
- else if (p_187457_6_.func_77973_b() == Items.field_151098_aY)
|
|
+ else if (p_187457_6_.func_77973_b() instanceof net.minecraft.item.ItemMap)
|
|
{
|
|
if (flag && this.field_187468_e.func_190926_b())
|
|
{
|
|
@@ -440,6 +442,7 @@
|
|
if (this.field_78455_a.field_71439_g.func_70094_T())
|
|
{
|
|
IBlockState iblockstate = this.field_78455_a.field_71441_e.func_180495_p(new BlockPos(this.field_78455_a.field_71439_g));
|
|
+ BlockPos overlayPos = new BlockPos(this.field_78455_a.field_71439_g);
|
|
EntityPlayer entityplayer = this.field_78455_a.field_71439_g;
|
|
|
|
for (int i = 0; i < 8; ++i)
|
|
@@ -453,11 +456,13 @@
|
|
if (iblockstate1.func_191058_s())
|
|
{
|
|
iblockstate = iblockstate1;
|
|
+ overlayPos = blockpos;
|
|
}
|
|
}
|
|
|
|
if (iblockstate.func_185901_i() != EnumBlockRenderType.INVISIBLE)
|
|
{
|
|
+ if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(field_78455_a.field_71439_g, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, iblockstate, overlayPos))
|
|
this.func_178108_a(this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(iblockstate));
|
|
}
|
|
}
|
|
@@ -466,11 +471,13 @@
|
|
{
|
|
if (this.field_78455_a.field_71439_g.func_70055_a(Material.field_151586_h))
|
|
{
|
|
+ if (!net.minecraftforge.event.ForgeEventFactory.renderWaterOverlay(field_78455_a.field_71439_g, p_78447_1_))
|
|
this.func_78448_c(p_78447_1_);
|
|
}
|
|
|
|
if (this.field_78455_a.field_71439_g.func_70027_ad())
|
|
{
|
|
+ if (!net.minecraftforge.event.ForgeEventFactory.renderFireOverlay(field_78455_a.field_71439_g, p_78447_1_))
|
|
this.func_78442_d();
|
|
}
|
|
}
|
|
@@ -592,8 +599,17 @@
|
|
else
|
|
{
|
|
float f = entityplayersp.func_184825_o(1.0F);
|
|
- this.field_187469_f += MathHelper.func_76131_a((Objects.equals(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
|
|
- this.field_187471_h += MathHelper.func_76131_a((float)(Objects.equals(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
|
|
+
|
|
+ boolean requipM = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187467_d, itemstack, entityplayersp.field_71071_by.field_70461_c);
|
|
+ boolean requipO = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187468_e, itemstack1, -1);
|
|
+
|
|
+ if (!requipM && !Objects.equals(this.field_187467_d, itemstack))
|
|
+ this.field_187467_d = itemstack;
|
|
+ if (!requipM && !Objects.equals(this.field_187468_e, itemstack1))
|
|
+ this.field_187468_e = itemstack1;
|
|
+
|
|
+ this.field_187469_f += MathHelper.func_76131_a((!requipM ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
|
|
+ this.field_187471_h += MathHelper.func_76131_a((float)(!requipO ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
|
|
}
|
|
|
|
if (this.field_187469_f < 0.1F)
|