From 2671882e04868c2152f76825dd034c4958115b5e Mon Sep 17 00:00:00 2001 From: Calclavia Date: Thu, 30 Jan 2014 20:36:55 +0800 Subject: [PATCH] Fixed a invalid rubble crash --- .../java/resonantinduction/api/recipe/RecipeUtils.java | 5 +++++ .../archaic/engineering/ItemHammer.java | 1 - .../core/resource/ResourceGenerator.java | 9 +++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/resonantinduction/api/recipe/RecipeUtils.java b/src/main/java/resonantinduction/api/recipe/RecipeUtils.java index db9c4985..9c226b2d 100644 --- a/src/main/java/resonantinduction/api/recipe/RecipeUtils.java +++ b/src/main/java/resonantinduction/api/recipe/RecipeUtils.java @@ -78,6 +78,11 @@ public class RecipeUtils { super(); this.name = s; + + if (OreDictionary.getOres(name).size() <= 0) + { + throw new RuntimeException("Added invalid OreDictResource recipe: " + name); + } } public OreDictResource(String s, float chance) diff --git a/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java b/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java index 8e6e86f3..a94c9ef7 100644 --- a/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java +++ b/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java @@ -42,7 +42,6 @@ public class ItemHammer extends ItemRI { Resource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.CRUSHER, oreName); - // TODO: Fix multiple outputs. for (Resource resource : outputs) { ItemStack outputStack = resource.getItemStack().copy(); diff --git a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java index 25e3acbf..55c4edc9 100644 --- a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java @@ -86,12 +86,9 @@ public class ResourceGenerator if (OreDictionary.getOres("ore" + nameCaps).size() > 0) { - if (OreDictionary.getOres("dust" + nameCaps).size() == 0) - { - OreDictionary.registerOre("rubble" + nameCaps, ResonantInduction.itemRubble.getStackFromMaterial(materialName)); - OreDictionary.registerOre("dust" + nameCaps, ResonantInduction.itemDust.getStackFromMaterial(materialName)); - OreDictionary.registerOre("dustRefined" + nameCaps, ResonantInduction.itemRefinedDust.getStackFromMaterial(materialName)); - } + OreDictionary.registerOre("dust" + nameCaps, ResonantInduction.itemDust.getStackFromMaterial(materialName)); + OreDictionary.registerOre("rubble" + nameCaps, ResonantInduction.itemRubble.getStackFromMaterial(materialName)); + OreDictionary.registerOre("dustRefined" + nameCaps, ResonantInduction.itemRefinedDust.getStackFromMaterial(materialName)); MachineRecipes.INSTANCE.addRecipe(RecipeType.CRUSHER, "ore" + nameCaps, "rubble" + nameCaps); MachineRecipes.INSTANCE.addRecipe(RecipeType.GRINDER, "rubble" + nameCaps, "dust" + nameCaps, "dust" + nameCaps);