Merge pull request #31 from dshadowwolf/master-1.11.2-dev

Undo the temporary fix that was here - proper fix is in more recent b…

Author: jriwanek

src/main/java/com/mcmoddev/nethermetals/init/NetherBlocks.java

@@ -27,56 +27,7 @@ public static void init() {
 		}
 
 		Materials.init();
-//		ItemGroups.init();
-
-		if( !Materials.getMaterialByName("coal").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("coal");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.COAL_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.COAL_ORE);
-		}
-
-		if( !Materials.getMaterialByName("diamond").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("diamond");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.DIAMOND_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.DIAMOND_ORE);
-		}
-
-		if( !Materials.getMaterialByName("emerald").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("emerald");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.EMERALD_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.EMERALD_ORE);
-		}
-
-		if( !Materials.getMaterialByName("gold").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("gold");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.GOLD_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.GOLD_ORE);
-		}
-		
-		if( !Materials.getMaterialByName("lapis").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("lapis");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.LAPIS_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.LAPIS_ORE);
-		}
-
-		if( !Materials.getMaterialByName("iron").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("iron");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.IRON_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.IRON_ORE);
-		}
-		
-		if( !Materials.getMaterialByName("redstone").hasBlock(Names.ORE) ) {
-			final MMDMaterial material = Materials.getMaterialByName("redstone");
-			
-			material.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.REDSTONE_BLOCK);
-			material.addNewBlock(Names.ORE, net.minecraft.init.Blocks.REDSTONE_ORE);
-		}
+		ItemGroups.init();
 
 		createNetherOreWrapper(Options.enableCoalNetherOre, Materials.getMaterialByName("coal"));
 		createNetherOreWrapper(Options.enableDiamondNetherOre, Materials.getMaterialByName("diamond"));

src/main/java/com/mcmoddev/nethermetals/init/NetherFluids.java

@@ -13,11 +13,8 @@ public class CommonProxy {
 
 	public void preInit(FMLPreInitializationEvent event) {
 		Config.init();
-		NetherMaterials.init();
-		NetherFluids.init();
 		ItemGroups.init();
 		NetherBlocks.init();
-		NetherItems.init();
 		ItemGroups.setupIcons();
 
 		FMLInterModComms.sendFunctionMessage("orespawn", "api", "com.mcmoddev.orespawn.NetherMetalsOreSpawn");