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 a59082f183..15a937f2a6 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -210,32 +210,38 @@ public class GameData { return (BiMap)getMain().iItemRegistry.getSlaveMap(BLOCK_TO_ITEM, BiMap.class); } - static > K register(K object, ResourceLocation location) + + @SuppressWarnings("unchecked") + static > K register_impl(Object object, ResourceLocation location) { if (object == null) { FMLLog.getLogger().log(Level.ERROR, "Attempt to register a null object"); throw new NullPointerException("Attempt to register a null object"); } - object.setRegistryName(location); - return register(object); + ((K)object).setRegistryName(location); + // explicit type is needed for some reason + return GameData.register_impl(object); } - static > K register(K object) + // argument is Object due to incorrect inferrence of the type if source level = 6, probably related to https://bugs.openjdk.java.net/browse/JDK-8026527 + @SuppressWarnings("unchecked") + static > K register_impl(Object object) { + K castedObj = (K)object; if (object == null) { FMLLog.getLogger().log(Level.ERROR, "Attempt to register a null object"); throw new NullPointerException("Attempt to register a null object"); } - if (object.getRegistryName() == null) + if (castedObj.getRegistryName() == null) { FMLLog.getLogger().log(Level.ERROR, "Attempt to register object without having set a registry name {} (type {})", object, object.getClass().getName()); throw new IllegalArgumentException(String.format("No registry name set for object %s (%s)", object, object.getClass().getName())); } - final IForgeRegistry registry = PersistentRegistryManager.findRegistry(object); - registry.register(object); - return object; + final IForgeRegistry registry = PersistentRegistryManager.findRegistry(castedObj); + registry.register(castedObj); + return castedObj; } @SuppressWarnings("unchecked") diff --git a/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java index 290b225785..ab0d43eb26 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/GameRegistry.java @@ -140,9 +140,10 @@ public class GameRegistry * @throws IllegalArgumentException if the object is not yet named (use {@link #register(IForgeRegistryEntry, ResourceLocation)} instead) * @return The object */ - public static > K register(K object) + @SuppressWarnings("unchecked") + public static > K register(K object) { - return GameData.register(object); + return (K)GameData.register_impl(object); } /** @@ -159,9 +160,10 @@ public class GameRegistry * @throws IllegalStateException if the object already has an existing name (use {@link #register(IForgeRegistryEntry)} instead) * @return The object */ - public static > K register(K object, ResourceLocation name) + @SuppressWarnings("unchecked") + public static > K register(K object, ResourceLocation name) { - return GameData.register(object, name); + return (K)GameData.register_impl(object, name); } diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/DynBucketTest.java index 167acd67d9..1846a92c2e 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/DynBucketTest.java @@ -1,5 +1,6 @@ package net.minecraftforge.debug; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -11,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -49,6 +51,8 @@ public class DynBucketTest public static final String MODID = "DynBucketTest"; public static final Item dynBucket = new DynBucket(); public static final Item dynBottle = new DynBottle(); + private static final ResourceLocation simpleTankName = new ResourceLocation(MODID, "simpletank"); + private static final ResourceLocation testItemName = new ResourceLocation(MODID, "testitem"); static { @@ -86,8 +90,8 @@ public class DynBucketTest } }); ModelBakery.registerItemVariants(dynBottle, bottle); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GameRegistry.findBlock(MODID, "simpletank")), 0, new ModelResourceLocation(new ResourceLocation(MODID, "simpletank"), "normal")); - ModelLoader.setCustomModelResourceLocation(GameRegistry.findItem(MODID, "testitem"), 0, new ModelResourceLocation(new ResourceLocation("minecraft", "stick"), "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.itemRegistry.getObject(simpleTankName), 0, new ModelResourceLocation(simpleTankName, "normal")); + ModelLoader.setCustomModelResourceLocation(Item.itemRegistry.getObject(testItemName), 0, new ModelResourceLocation(new ResourceLocation("minecraft", "stick"), "inventory")); } } @@ -95,15 +99,17 @@ public class DynBucketTest @EventHandler public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerItem(new TestItem(), "testitem"); - GameRegistry.registerBlock(new BlockSimpleTank(), "simpletank"); + GameRegistry.register(new TestItem(), testItemName); + Block tank = new BlockSimpleTank(); + GameRegistry.register(tank, simpleTankName); + GameRegistry.register(new ItemBlock(tank), simpleTankName); GameRegistry.registerTileEntity(TileSimpleTank.class, "simpletank"); FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestFluid.name)); FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestGas.name)); //GameRegistry.registerItem(dynBucket, "dynbucket"); - GameRegistry.registerItem(dynBottle, "dynbottle"); + GameRegistry.register(dynBottle); // register fluid containers int i = 0; @@ -232,6 +238,7 @@ public class DynBucketTest { super(250, new ItemStack(Items.glass_bottle), true); setUnlocalizedName("dynbottle"); + setRegistryName(new ResourceLocation(MODID, "dynbottle")); setMaxStackSize(16); setHasSubtypes(true); setCreativeTab(CreativeTabs.tabMisc); diff --git a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java b/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java index 492b9cb807..fcd979faf6 100644 --- a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java +++ b/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java @@ -54,8 +54,8 @@ public class ForgeBlockStatesLoaderDebug { //GameRegistry.registerBlock(blockCustom); blockCustomWall.setUnlocalizedName(MODID + ".customWall").setRegistryName(nameCustomWall); - GameRegistry.registerBlock(blockCustomWall, (Class)null); - GameRegistry.registerItem(itemCustomWall); + GameRegistry.register(blockCustomWall); + GameRegistry.register(itemCustomWall); GameData.getBlockItemMap().put(blockCustomWall, itemCustomWall); if (event.getSide() == Side.CLIENT) diff --git a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java index 296ba40668..1e827bb0c3 100644 --- a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java @@ -3,6 +3,7 @@ package net.minecraftforge.debug; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -26,7 +27,7 @@ public class ItemLayerModelDebug { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerItem(TestItem.instance, TestItem.name); + GameRegistry.register(TestItem.instance); } } @@ -52,6 +53,7 @@ public class ItemLayerModelDebug { setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } } } diff --git a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java index 309a4ea6c5..8cd2b7a84b 100644 --- a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java +++ b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java @@ -8,7 +8,9 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.ModelBakeEvent; @@ -44,7 +46,8 @@ public class ItemTileDebug { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerBlock(TestBlock.instance, TestBlock.name); + GameRegistry.register(TestBlock.instance); + GameRegistry.register(new ItemBlock(TestBlock.instance).setRegistryName(TestBlock.instance.getRegistryName())); GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity"); } @@ -123,6 +126,7 @@ public class ItemTileDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override diff --git a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java index 05bb4b3c04..f546b01f8c 100644 --- a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java @@ -64,6 +64,7 @@ public class ModelAnimationDebug public static final String VERSION = "0.0"; public static String blockName = "test_animation_block"; + public static ResourceLocation blockId = new ResourceLocation(MODID, blockName); public static final PropertyDirection FACING = PropertyDirection.create("facing"); @Instance(MODID) @@ -76,11 +77,12 @@ public class ModelAnimationDebug { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerBlock(new Block(Material.wood) + GameRegistry.register(new Block(Material.wood) { { setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + "." + blockName); + setRegistryName(blockId); } @Override @@ -149,15 +151,15 @@ public class ModelAnimationDebug } return true; } - }, null, blockName); - GameRegistry.registerItem(new ItemBlock(GameRegistry.findBlock(MODID, blockName)) + }); + GameRegistry.register(new ItemBlock(Block.blockRegistry.getObject(blockId)) { @Override public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { return new ItemAnimationHolder(); } - }, blockName); + }.setRegistryName(blockId)); GameRegistry.registerTileEntity(Chest.class, MODID + ":" + "tile_" + blockName); } @@ -179,7 +181,7 @@ public class ModelAnimationDebug { super.preInit(event); B3DLoader.INSTANCE.addDomain(MODID); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GameRegistry.findBlock(MODID, blockName)), 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + blockName, "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.itemRegistry.getObject(blockId), 0, new ModelResourceLocation(blockId, "inventory")); ClientRegistry.bindTileEntitySpecialRenderer(Chest.class, new AnimationTESR() { @Override diff --git a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java index ace5cdec09..478b140a86 100644 --- a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java @@ -21,11 +21,13 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; @@ -54,7 +56,7 @@ public class ModelBakeEventDebug public static final String VERSION = "1.0"; public static final int cubeSize = 3; - private static String blockName = MODID.toLowerCase() + ":" + CustomModelBlock.name; + private static ResourceLocation blockName = new ResourceLocation(MODID, CustomModelBlock.name); @SuppressWarnings("unchecked") public static final IUnlistedProperty[] properties = new IUnlistedProperty[6]; @@ -77,7 +79,8 @@ public class ModelBakeEventDebug { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerBlock(CustomModelBlock.instance, CustomModelBlock.name); + GameRegistry.register(CustomModelBlock.instance); + GameRegistry.register(new ItemBlock(CustomModelBlock.instance).setRegistryName(CustomModelBlock.instance.getRegistryName())); GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity"); } } @@ -132,6 +135,7 @@ public class ModelBakeEventDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(blockName); } @Override diff --git a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java b/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java index b697f76d91..9937c33429 100644 --- a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; @@ -41,9 +42,12 @@ public class ModelFluidDebug FluidRegistry.registerFluid(TestFluid.instance); FluidRegistry.registerFluid(TestGas.instance); FluidRegistry.registerFluid(milkFluid); - GameRegistry.registerBlock(TestFluidBlock.instance, TestFluidBlock.name); - GameRegistry.registerBlock(TestGasBlock.instance, TestGasBlock.name); - GameRegistry.registerBlock(MilkFluidBlock.instance, MilkFluidBlock.name); + GameRegistry.register(TestFluidBlock.instance); + GameRegistry.register(new ItemBlock(TestFluidBlock.instance).setRegistryName(TestFluidBlock.instance.getRegistryName())); + GameRegistry.register(TestGasBlock.instance); + GameRegistry.register(new ItemBlock(TestGasBlock.instance).setRegistryName(TestGasBlock.instance.getRegistryName())); + GameRegistry.register(MilkFluidBlock.instance); + GameRegistry.register(new ItemBlock(MilkFluidBlock.instance).setRegistryName(MilkFluidBlock.instance.getRegistryName())); } } @@ -157,6 +161,7 @@ public class ModelFluidDebug super(TestFluid.instance, Material.water); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } } @@ -170,6 +175,7 @@ public class ModelFluidDebug super(milkFluid, Material.water); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } } @@ -183,6 +189,7 @@ public class ModelFluidDebug super(TestGas.instance, Material.lava); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } } } diff --git a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java b/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java index 809f70b2a2..430072227a 100644 --- a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java @@ -24,6 +24,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -63,14 +64,20 @@ public class ModelLoaderRegistryDebug @EventHandler public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerBlock(CustomModelBlock.instance, CustomModelBlock.name); - GameRegistry.registerBlock(OBJTesseractBlock.instance, OBJTesseractBlock.name); - GameRegistry.registerBlock(OBJVertexColoring1.instance, OBJVertexColoring1.name); - //GameRegistry.registerBlock(OBJDirectionEye.instance, OBJDirectionEye.name); - GameRegistry.registerBlock(OBJVertexColoring2.instance, OBJVertexColoring2.name); - GameRegistry.registerBlock(OBJDirectionBlock.instance, OBJDirectionBlock.name); - GameRegistry.registerBlock(OBJCustomDataBlock.instance, OBJCustomDataBlock.name); - //GameRegistry.registerBlock(OBJDynamicEye.instance, OBJDynamicEye.name); + List blocks = Lists.newArrayList(); + blocks.add(CustomModelBlock.instance); + blocks.add(OBJTesseractBlock.instance); + blocks.add(OBJVertexColoring1.instance); + //blocks.add(OBJDirectionEye.instance); + blocks.add(OBJVertexColoring2.instance); + blocks.add(OBJDirectionBlock.instance); + blocks.add(OBJCustomDataBlock.instance); + //blocks.add(OBJDynamicEye.instance); + for(Block block : blocks) + { + GameRegistry.register(block); + GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); + } GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name); GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name); //GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name); @@ -121,6 +128,7 @@ public class ModelLoaderRegistryDebug this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -220,6 +228,7 @@ public class ModelLoaderRegistryDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -365,6 +374,7 @@ public class ModelLoaderRegistryDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -397,6 +407,7 @@ public class ModelLoaderRegistryDebug setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -479,6 +490,7 @@ public class ModelLoaderRegistryDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -582,6 +594,7 @@ public class ModelLoaderRegistryDebug this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -669,6 +682,7 @@ public class ModelLoaderRegistryDebug this.setDefaultState(this.blockState.getBaseState().withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(WEST, false).withProperty(EAST, false)); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override @@ -724,6 +738,7 @@ public class ModelLoaderRegistryDebug super(Material.iron); setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override diff --git a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java index 42906bfd5a..468d37c5f8 100644 --- a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java @@ -6,7 +6,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -20,7 +22,8 @@ public class MultiLayerModelDebug public static final String MODID = "forgedebugmultilayermodel"; public static final String VERSION = "0.0"; - public static String blockName = "test_layer_block"; + private static String blockName = "test_layer_block"; + private static final ResourceLocation blockId = new ResourceLocation(MODID, blockName); @SidedProxy public static CommonProxy proxy; @@ -29,11 +32,12 @@ public class MultiLayerModelDebug { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerBlock(new Block(Material.wood) + GameRegistry.register(new Block(Material.wood) { { setCreativeTab(CreativeTabs.tabBlock); setUnlocalizedName(MODID + "." + blockName); + setRegistryName(blockId); } @Override @@ -47,7 +51,8 @@ public class MultiLayerModelDebug { return layer == BlockRenderLayer.SOLID || layer == BlockRenderLayer.TRANSLUCENT; } - }, blockName); + }); + GameRegistry.register(new ItemBlock(Block.blockRegistry.getObject(blockId)).setRegistryName(blockId)); } } @@ -59,7 +64,7 @@ public class MultiLayerModelDebug public void preInit(FMLPreInitializationEvent event) { super.preInit(event); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GameRegistry.findBlock(MODID, blockName)), 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + blockName, "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.itemRegistry.getObject(blockId), 0, new ModelResourceLocation(blockId, "inventory")); } } diff --git a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java index b4f728a440..fe1cf7f39c 100644 --- a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java @@ -47,7 +47,7 @@ public class NoBedSleepingTest { public void preInit(FMLPreInitializationEvent event) { - GameRegistry.registerItem(ItemSleepingPill.instance, ItemSleepingPill.name); + GameRegistry.register(ItemSleepingPill.instance); CapabilityManager.INSTANCE.register(IExtraSleeping.class, new Storage(), DefaultImpl.class); MinecraftForge.EVENT_BUS.register(new EventHandler()); } @@ -154,6 +154,7 @@ public class NoBedSleepingTest { setCreativeTab(CreativeTabs.tabMisc); setUnlocalizedName(MODID + ":" + name); + setRegistryName(new ResourceLocation(MODID, name)); } @Override