Merge pull request #22 from ganymedes01/patch-1

Added ore dict support for glass, iron, gold and diamond as well
This commit is contained in:
Zach 2014-09-20 14:04:31 -04:00
commit 62abf62ee5
1 changed files with 3 additions and 19 deletions

View File

@ -127,12 +127,12 @@ public enum IronChestType {
mainMaterial = translateOreName(mat); mainMaterial = translateOreName(mat);
addRecipe(new ItemStack(blockResult, 1, type.ordinal()), recipeSplit, addRecipe(new ItemStack(blockResult, 1, type.ordinal()), recipeSplit,
'm', mainMaterial, 'P', previousTier, /* previous tier of chest */ 'm', mainMaterial, 'P', previousTier, /* previous tier of chest */
'G', Blocks.glass, 'C', "chestWood", 'G', "blockGlass", 'C', "chestWood",
'0', new ItemStack(blockResult, 1, 0), /* Iron Chest */ '0', new ItemStack(blockResult, 1, 0), /* Iron Chest */
'1', new ItemStack(blockResult, 1, 1), /* Gold Chest */ '1', new ItemStack(blockResult, 1, 1), /* Gold Chest */
'2', new ItemStack(blockResult, 1, 2), /* Diamond Chest */ '2', new ItemStack(blockResult, 1, 2), /* Diamond Chest */
'3', new ItemStack(blockResult, 1, 3), /* Copper Chest */ '3', new ItemStack(blockResult, 1, 3), /* Copper Chest */
'4', new ItemStack(blockResult, 1, 4)/* Silver Chest */ '4', new ItemStack(blockResult, 1, 4) /* Silver Chest */
); );
} }
} }
@ -140,23 +140,7 @@ public enum IronChestType {
public static Object translateOreName(String mat) public static Object translateOreName(String mat)
{ {
if (mat.equals("ingotIron")) if (mat.equals("obsidian"))
{
return Items.iron_ingot;
}
else if (mat.equals("ingotGold"))
{
return Items.gold_ingot;
}
else if (mat.equals("gemDiamond"))
{
return Items.diamond;
}
else if (mat.equals("blockGlass"))
{
return Blocks.glass;
}
else if (mat.equals("obsidian"))
{ {
return Blocks.obsidian; return Blocks.obsidian;
} }