Updated to the latest Forge. Closes #730

build.properties

@@ -1,4 +1,4 @@
 minecraft_version=1.9
-forge_version=12.16.0.1807-1.9
+forge_version=12.16.0.1829-1.9
 mod_version=4.0.0
 mappings_version=snapshot_nodoc_20160324

src/main/java/biomesoplenty/common/init/ModBlocks.java

@@ -87,6 +87,7 @@ import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemDoor;
 import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ColorizerFoliage;
 import net.minecraft.world.ColorizerGrass;
@@ -97,6 +98,7 @@ import net.minecraftforge.fluids.BlockFluidBase;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fml.common.registry.GameData;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -322,9 +324,9 @@ public class ModBlocks
     }
 
     
-    public static Block registerFluidBlock(Fluid fluid, BlockFluidBase fluidBlock, String name)
+    public static Block registerFluidBlock(Fluid fluid, Block fluidBlock, String name)
     {
-        Block block = GameRegistry.registerBlock(fluidBlock, null, name);
+        Block block = GameRegistry.register(fluidBlock, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
         BiomesOPlenty.proxy.registerFluidBlockRendering(block, name);
         fluid.setBlock(fluidBlock);
         return block;
@@ -365,8 +367,8 @@ public class ModBlocks
         {
             // if this block supports the IBOPBlock interface then we can determine the item block class, and sub-blocks automatically
             IBOPBlock bopBlock = (IBOPBlock)block;
-            GameRegistry.registerBlock(block, bopBlock.getItemClass(), blockName);
+
-            
+            registerBlockWithItem(block, blockName, bopBlock.getItemClass());
             BiomesOPlenty.proxy.registerBlockSided(block);
             
             // check for missing default states
@@ -398,11 +400,27 @@ public class ModBlocks
         else
         {
             // for vanilla blocks, just register a single variant with meta=0 and assume ItemBlock for the item class
-            GameRegistry.registerBlock(block, ItemBlock.class , blockName);
+            registerBlockWithItem(block, blockName, ItemBlock.class);
             registerBlockVariant(block, blockName, 0);
         }
 
         return block;
     }
     
+    private static void registerBlockWithItem(Block block, String blockName, Class<? extends ItemBlock> clazz)
+    {
+        try
+        {
+            Item itemBlock = clazz != null ? (Item)clazz.getConstructor(Block.class).newInstance(block) : null;
+            ResourceLocation location = new ResourceLocation(BiomesOPlenty.MOD_ID, blockName);
+
+            GameRegistry.register(block, location);
+            if (itemBlock != null) GameRegistry.register(itemBlock, location);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("An error occurred associating an item block during registration...");
+        }
+    }
+    
 }

src/main/java/biomesoplenty/common/init/ModHandlers.java

@@ -42,7 +42,7 @@ public class ModHandlers
         MinecraftForge.EVENT_BUS.register(new PotionPossessionEventHandler());
         MinecraftForge.EVENT_BUS.register(new ItemEventHandler());
         MinecraftForge.EVENT_BUS.register(new UseHoeEventHandler());
-        FMLCommonHandler.instance().bus().register(new AchievementEventHandler());
+        MinecraftForge.EVENT_BUS.register(new AchievementEventHandler());
         
         if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
         {
@@ -54,6 +54,6 @@ public class ModHandlers
     private static void registerClientEvents()
     {
         MinecraftForge.EVENT_BUS.register(new GuiEventHandler());
-        FMLCommonHandler.instance().bus().register(new TrailsEventHandler());
+        MinecraftForge.EVENT_BUS.register(new TrailsEventHandler());
     }
 }

src/main/java/biomesoplenty/common/init/ModItems.java

@@ -310,7 +310,8 @@ public class ModItems
         {
             item.setCreativeTab(CreativeTabBOP.instance);
         }
-        GameRegistry.registerItem(item,name);
+
+        GameRegistry.register(item, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
         BOPCommand.itemCount++;
         BiomesOPlenty.proxy.registerItemSided(item);
         

src/main/java/biomesoplenty/core/ClientProxy.java

@@ -160,7 +160,7 @@ public class ClientProxy extends CommonProxy
         }
         else
         {
-            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(BiomesOPlenty.MOD_ID + ":" + item.delegate.getResourceName().getResourcePath(), "inventory"));
+            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(BiomesOPlenty.MOD_ID + ":" + item.delegate.name().getResourcePath(), "inventory"));
         }
         
         //Register colour handlers