Merge pull request #54 from dshadowwolf/cleanup-block-create

Cleanup block create

Author: jriwanek

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

@@ -1,5 +1,8 @@
 package com.mcmoddev.nethermetals.init;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.mcmoddev.lib.block.*;
 import com.mcmoddev.lib.data.Names;
 import com.mcmoddev.lib.data.SharedStrings;
@@ -17,74 +20,43 @@
  *
  */
 public class NetherBlocks extends com.mcmoddev.lib.init.Blocks {
-
-	private static boolean initDone = false;
-
 	/**
 	 *
 	 */
 	public static void init() {
-		if (initDone) {
-			return;
-		}
-
 		Materials.init();
 		ItemGroups.init();
 
-		createVanillaNetherOreWrapper("coal");
-		createVanillaNetherOreWrapper("diamond");
-		createVanillaNetherOreWrapper("emerald");
-		createVanillaNetherOreWrapper("gold");
-		createVanillaNetherOreWrapper("iron");
-		createVanillaNetherOreWrapper("lapis");
-		createVanillaNetherOreWrapper("redstone");
-
-		if (Loader.isModLoaded("basemetals")) {
-			createNetherOreWrapper("antimony");
-			createNetherOreWrapper("bismuth");
-			createNetherOreWrapper("copper");
-			createNetherOreWrapper("lead");
-			createNetherOreWrapper("mercury");
-			createNetherOreWrapper("nickel");
-			createNetherOreWrapper("platinum");
-			createNetherOreWrapper("silver");
-			createNetherOreWrapper("tin");
-			createNetherOreWrapper("zinc");
-		}
-		
-		if (Loader.isModLoaded("modernmetals")) {
-			createNetherOreWrapper("aluminum");
-			createNetherOreWrapper("cadmium");
-			createNetherOreWrapper("chromium");
-			createNetherOreWrapper("iridium");
-			createNetherOreWrapper("magnesium");
-			createNetherOreWrapper("manganese");
-			createNetherOreWrapper("osmium");
-			createNetherOreWrapper("plutonium");
-			createNetherOreWrapper("rutile");
-			createNetherOreWrapper("tantalum");
-			createNetherOreWrapper("titanium");
-			createNetherOreWrapper("tungsten");
-			createNetherOreWrapper("uranium");
-			createNetherOreWrapper("zirconium");
-		}
-		
-		initDone = true;
+		List<String> knownMaterials = Arrays.asList("coal", "diamond", "emerald", "gold", "iron", "lapis",
+				"redstone", "antimony", "bismuth", "copper", "lead", "mercury", "nickel", "platinum",
+				"silver", "tin", "zinc", "aluminum", "cadmium", "chromium", "iridium", "magnesium",
+				"manganese", "osmium", "plutonium", "rutile", "tantalum", "titanium", "tungsten",
+				"uranium", "zirconium");
+		Materials.getAllMaterials().stream()
+		.map(mat -> mat.getName())
+		.filter(knownMaterials::contains)
+		.forEach(NetherBlocks::createNetherOreWrapper);
 	}
 
 	private static void createVanillaNetherOreWrapper(String materialName) {
 		final MMDMaterial material = Materials.getMaterialByName(materialName);
-			material.addNewBlock(Names.NETHERORE, addBlock(new BlockMMDNetherOre(material), Names.NETHERORE.toString(), material, ItemGroups.getTab(SharedStrings.TAB_BLOCKS)));
-			final Block b = material.getBlock(Names.NETHERORE);
-			final String oredict = getOredictFromName(Names.NETHERORE);
-			if ((oredict != null) && (b != null)) {
-				Oredicts.registerOre(oredict + material.getCapitalizedName(), b);
-			}
+		material.addNewBlock(Names.NETHERORE, addBlock(new BlockMMDNetherOre(material), Names.NETHERORE.toString(), material, ItemGroups.getTab(SharedStrings.TAB_BLOCKS)));
+		final Block b = material.getBlock(Names.NETHERORE);
+		final String oredict = getOredictFromName(Names.NETHERORE);
+		if ((oredict != null) && (b != null)) {
+			Oredicts.registerOre(oredict + material.getCapitalizedName(), b);
+		}
 	}
 
-	private static void createNetherOreWrapper(String materialName ) {
-		if (Materials.hasMaterial(materialName)) {
-			create(Names.NETHERORE, materialName);
-		}
-	}	
+	private static void createBasicNetherOreWrapper(String materialName ) {
+		create(Names.NETHERORE, materialName);
+	}
+	
+	private static void createNetherOreWrapper(String materialName) {
+		List<String> vanillaMats = Arrays.asList("coal", "diamond", "emerald", "gold", "iron", "lapis", "redstone");
+		if (vanillaMats.contains(materialName))
+			createVanillaNetherOreWrapper(materialName);
+		else
+			createBasicNetherOreWrapper(materialName);
+	}
 }

src/main/java/com/mcmoddev/nethermetals/proxy/CommonProxy.java

@@ -24,6 +24,7 @@
 import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -77,29 +78,40 @@ public void postInit(FMLPostInitializationEvent event) {
 	public void registerItems(RegistryEvent.Register<Item> event) {
 		// NetherMetals doesn't do any of its own materials, just its own blocks
 		// so it actually needs this helper :)
-		for( MMDMaterial mat : Materials.getAllMaterials()) {
-			for( Item item : mat.getItems() ) {
-				if( item.getRegistryName().getResourceDomain().equals(NetherMetals.MODID) ) {
-					event.getRegistry().register(item);
-				}
-			}
-		}
+		Materials.getAllMaterials().stream()
+		.forEach( mat -> {
+			mat.getItems().stream()
+			.map(itemStack -> itemStack.getItem())
+			.filter(this::itemFilterFunc)
+			.forEach(event.getRegistry()::register);
+		});
+
 		Oredicts.registerItemOreDictionaryEntries();
 		Oredicts.registerBlockOreDictionaryEntries();
 	}
 
+	private boolean itemFilterFunc(Item item) {
+		return matchModId(item.getRegistryName());
+	}
+	
 	@SubscribeEvent
 	public void registerBlocks(RegistryEvent.Register<Block> event) {
 		// NetherMetals doesn't do any of its own materials, just its own blocks
 		// so it actually needs this helper :)
-		for( MMDMaterial mat : Materials.getAllMaterials()) {
-			for( Block block : mat.getBlocks() ) {
-				if( block.getRegistryName().getResourceDomain().equals(NetherMetals.MODID) ) {
-					((BlockMMDNetherOre)block).explode();
-					event.getRegistry().register(block);
-				}
-			}
-		}
+		Materials.getAllMaterials().stream()
+		.forEach( mat -> {
+			mat.getBlocks().stream()
+			.filter(this::blockFilterFunc)
+			.forEach(event.getRegistry()::register);
+		});
+	}
+
+	private boolean blockFilterFunc(Block block) {
+		return matchModId(block.getRegistryName());
+	}
+	
+	private boolean matchModId(ResourceLocation rl) {
+		return rl.getResourceDomain().equals(NetherMetals.MODID);
 	}
 
 	public void angerPigmen(BlockPos pos, World world, EntityPlayer player, int range) {