keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Capture ItemBlock remaps.

This commit is contained in:
cpw 2015-12-23 15:07:16 -05:00
parent 53227982e3
commit 54e9a36b67
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minecraftforge/fml/common/registry/GameData.java
View File

@ -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();