From 54e9a36b67e5498fbd6d768ef40bc8d002b67c81 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Wed, 23 Dec 2015 15:07:16 -0500
Subject: [PATCH] Capture ItemBlock remaps.

---
 .../fml/common/registry/GameData.java          | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
index e094bd6b3..5dd4537f1 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
@@ -19,6 +19,7 @@ import com.google.common.collect.Maps;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.ObjectIntIdentityMap;
 import net.minecraft.util.ResourceLocation;
@@ -110,7 +111,7 @@ public class GameData
 
     // internal registry objects
     private final FMLControlledNamespacedRegistry<Block> iBlockRegistry = PersistentRegistryManager.createRegistry(PersistentRegistryManager.BLOCKS, Block.class, new ResourceLocation("minecraft:air"), MAX_BLOCK_ID, MIN_BLOCK_ID, true, BlockStateCapture.INSTANCE);
-    private final FMLControlledNamespacedRegistry<Item> iItemRegistry = PersistentRegistryManager.createRegistry(PersistentRegistryManager.ITEMS, Item.class, null, MAX_ITEM_ID, MIN_ITEM_ID, true);
+    private final FMLControlledNamespacedRegistry<Item> iItemRegistry = PersistentRegistryManager.createRegistry(PersistentRegistryManager.ITEMS, Item.class, null, MAX_ITEM_ID, MIN_ITEM_ID, true, ItemBlockCapture.INSTANCE);
     private final FMLControlledNamespacedRegistry<Potion> iPotionRegistry = PersistentRegistryManager.createRegistry(PersistentRegistryManager.POTIONS, Potion.class, null, MAX_POTION_ID, MIN_POTION_ID, false, PotionArrayCapture.INSTANCE);
 
     int registerItem(Item item, String name) // from GameRegistry
@@ -243,6 +244,21 @@ public class GameData
         }
     }
 
+    private static class ItemBlockCapture implements FMLControlledNamespacedRegistry.AddCallback<Item>
+    {
+        static final ItemBlockCapture INSTANCE = new ItemBlockCapture();
+
+        @Override
+        public void onAdd(Item item, int blockId)
+        {
+            if (item instanceof ItemBlock)
+            {
+                ItemBlock itemBlock = (ItemBlock)item;
+                BLOCK_TO_ITEM.put(itemBlock.getBlock(), item);
+            }
+        }
+    }
+
     private static class PotionArrayCapture implements FMLControlledNamespacedRegistry.AddCallback<Potion>
     {
         static final PotionArrayCapture INSTANCE = new PotionArrayCapture();