From 3509ff4f101c98a37e697abe63623d82bcb0092a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 18 May 2016 20:14:50 +0100 Subject: [PATCH] Clean up Ore Dic Registry, should fix INV Tweaks crash --- src/main/java/techreborn/init/ModBlocks.java | 29 ++++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 066019b96..019527757 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -9,6 +9,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; +import reborncore.common.util.StringUtils; import techreborn.Core; import techreborn.blocks.*; import techreborn.blocks.advanced_machine.BlockBlastFurnace; @@ -468,28 +469,14 @@ public class ModBlocks public static void registerOreDict() { - OreDictionary.registerOre("oreGalena", new ItemStack(ore, 1, 0)); - OreDictionary.registerOre("oreIridium", new ItemStack(ore, 1, 1)); - OreDictionary.registerOre("oreRuby", new ItemStack(ore, 1, 2)); - OreDictionary.registerOre("oreSapphire", new ItemStack(ore, 1, 3)); - OreDictionary.registerOre("oreBauxite", new ItemStack(ore, 1, 4)); - OreDictionary.registerOre("orePyrite", new ItemStack(ore, 1, 5)); - OreDictionary.registerOre("oreCinnabar", new ItemStack(ore, 1, 6)); - OreDictionary.registerOre("oreSphalerite", new ItemStack(ore, 1, 7)); - OreDictionary.registerOre("oreTungsten", new ItemStack(ore, 1, 8)); - OreDictionary.registerOre("oreSheldonite", new ItemStack(ore, 1, 9)); - OreDictionary.registerOre("orePlatinum", new ItemStack(ore, 1, 9)); - OreDictionary.registerOre("orePeridot", new ItemStack(ore, 1, 10)); - OreDictionary.registerOre("oreSodalite", new ItemStack(ore, 1, 11)); - OreDictionary.registerOre("oreTetrahedrite", new ItemStack(ore, 1, 12)); - OreDictionary.registerOre("oreTin", new ItemStack(ore, 1, 13)); - OreDictionary.registerOre("oreLead", new ItemStack(ore, 1, 14)); - OreDictionary.registerOre("oreSilver", new ItemStack(ore, 1, 15)); - - OreDictionary.registerOre("oreCopper", BlockOre2.getOreByName("copper")); - OreDictionary.registerOre("oreTin", BlockOre2.getOreByName("tin")); - + for(String ore : BlockOre.ores){ + OreDictionary.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); + } + for(String ore : BlockOre2.ores){ + OreDictionary.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre2.getOreByName(ore)); + } + OreDictionary.registerOre("blockSilver", new ItemStack(storage, 1, 0)); OreDictionary.registerOre("blockAluminum", new ItemStack(storage, 1, 1)); OreDictionary.registerOre("blockTitanium", new ItemStack(storage, 1, 2));