ForgePatch/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch

--- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java
@@ -313,7 +313,7 @@
 
         if (this.itemToRender != null)
         {
-            if (this.itemToRender.getItem() == Items.filled_map)
+            if (this.itemToRender.getItem() instanceof net.minecraft.item.ItemMap)
             {
                 this.func_178097_a(abstractclientplayer, f2, f, f1);
             }
@@ -365,6 +365,7 @@
         if (this.mc.thePlayer.isEntityInsideOpaqueBlock())
         {
             IBlockState iblockstate = this.mc.theWorld.getBlockState(new BlockPos(this.mc.thePlayer));
+            BlockPos overlayPos = new BlockPos(this.mc.thePlayer);
             EntityPlayer entityplayer = this.mc.thePlayer;
 
             for (int i = 0; i < 8; ++i)
@@ -378,11 +379,13 @@
                 if (iblockstate1.getBlock().isVisuallyOpaque())
                 {
                     iblockstate = iblockstate1;
+                    overlayPos = blockpos;
                 }
             }
 
             if (iblockstate.getBlock().getRenderType() != -1)
             {
+                if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(mc.thePlayer, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, iblockstate, overlayPos))
                 this.func_178108_a(p_78447_1_, this.mc.getBlockRendererDispatcher().getBlockModelShapes().getTexture(iblockstate));
             }
         }
@@ -391,11 +394,13 @@
         {
             if (this.mc.thePlayer.isInsideOfMaterial(Material.water))
             {
+                if (!net.minecraftforge.event.ForgeEventFactory.renderWaterOverlay(mc.thePlayer, p_78447_1_))
                 this.renderWaterOverlayTexture(p_78447_1_);
             }
 
             if (this.mc.thePlayer.isBurning())
             {
+                if (!net.minecraftforge.event.ForgeEventFactory.renderFireOverlay(mc.thePlayer, p_78447_1_))
                 this.renderFireInFirstPerson(p_78447_1_);
             }
         }
@@ -512,6 +517,12 @@
         {
             if (!this.itemToRender.getIsItemStackEqual(itemstack))
             {
+                if (!this.itemToRender.getItem().shouldCauseReequipAnimation(this.itemToRender, itemstack, equippedItemSlot != entityplayer.inventory.currentItem))
+                {
+                    this.itemToRender = itemstack;
+                    this.equippedItemSlot = entityplayer.inventory.currentItem;
+                    return;
+                }
                 flag = true;
             }
         }