tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed a invalid rubble crash

Browse source
This commit is contained in:
Calclavia 2014-01-30 20:36:55 +08:00
parent 74bfb96976
commit 2671882e04
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/resonantinduction/api/recipe/RecipeUtils.java
View file

@ -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)

1
src/main/java/resonantinduction/archaic/engineering/ItemHammer.java
View file

@ -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();

9
src/main/java/resonantinduction/core/resource/ResourceGenerator.java
View file

@ -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);