--- a/net/minecraft/client/renderer/entity/RenderItemFrame.java
+++ b/net/minecraft/client/renderer/entity/RenderItemFrame.java
@@ -45,7 +45,7 @@
       this.field_76990_c.field_78724_e.func_110577_a(TextureMap.field_110575_b);
       BlockRendererDispatcher blockrendererdispatcher = this.field_147917_g.func_175602_ab();
       ModelManager modelmanager = blockrendererdispatcher.func_175023_a().func_178126_b();
-      ModelResourceLocation modelresourcelocation = p_76986_1_.func_82335_i().func_77973_b() == Items.field_151098_aY ? field_209586_g : field_209585_f;
+      ModelResourceLocation modelresourcelocation = p_76986_1_.func_82335_i().func_77973_b() instanceof ItemMap ? field_209586_g : field_209585_f;
       GlStateManager.func_179094_E();
       GlStateManager.func_179109_b(-0.5F, -0.5F, -0.5F);
       if (this.field_188301_f) {
@@ -87,17 +87,17 @@
       ItemStack itemstack = p_82402_1_.func_82335_i();
       if (!itemstack.func_190926_b()) {
          GlStateManager.func_179094_E();
-         boolean flag = itemstack.func_77973_b() == Items.field_151098_aY;
-         int i = flag ? p_82402_1_.func_82333_j() % 4 * 2 : p_82402_1_.func_82333_j();
+         MapData mapdata = ItemMap.func_195950_a(itemstack, p_82402_1_.field_70170_p);
+         int i = mapdata != null ? p_82402_1_.func_82333_j() % 4 * 2 : p_82402_1_.func_82333_j();
          GlStateManager.func_179114_b((float)i * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F);
-         if (flag) {
+         if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderItemInFrameEvent(p_82402_1_, this))) {
+         if (mapdata != null) {
             GlStateManager.func_179140_f();
             this.field_76990_c.field_78724_e.func_110577_a(field_110789_a);
             GlStateManager.func_179114_b(180.0F, 0.0F, 0.0F, 1.0F);
             float f = 0.0078125F;
             GlStateManager.func_179152_a(0.0078125F, 0.0078125F, 0.0078125F);
             GlStateManager.func_179109_b(-64.0F, -64.0F, 0.0F);
-            MapData mapdata = ItemMap.func_195950_a(itemstack, p_82402_1_.field_70170_p);
             GlStateManager.func_179109_b(0.0F, 0.0F, -1.0F);
             if (mapdata != null) {
                this.field_147917_g.field_71460_t.func_147701_i().func_148250_a(mapdata, true);
@@ -106,6 +106,7 @@
             GlStateManager.func_179152_a(0.5F, 0.5F, 0.5F);
             this.field_177074_h.func_181564_a(itemstack, ItemCameraTransforms.TransformType.FIXED);
          }
+         }
 
          GlStateManager.func_179121_F();
       }