upstream/StorageDrawers
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/StorageDrawers.git synced 2026-11-13 17:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from ganymedes01/patch-1

Browse Source 
OreDictionary all the things. Closes #118
This commit is contained in:
Justin Aquadro committed 2015-07-10 15:48:25 +00:00
2 parents db064d0cb6 eb0fe3fda9
commit e33204cd14
1 file changed
+28 -26
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java
+28 -26
View File
@@ -15,24 +15,26 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
public class ModRecipes
{
public void init () {
OreDictionary.registerOre("chestWood", new ItemStack(Blocks.chest)); // Remove when porting to 1.8
ConfigManager config = StorageDrawers.config;
for (int i = 0; i < BlockWood.field_150096_a.length; i++) {
if (config.isBlockEnabled("fulldrawers1"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), i), "xxx", " y ", "xxx",
'x', new ItemStack(Blocks.planks, 1, i), 'y', Blocks.chest);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), i), "xxx", " y ", "xxx",
'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood"));
if (config.isBlockEnabled("fulldrawers2"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), "xyx", "xxx", "xyx",
'x', new ItemStack(Blocks.planks, 1, i), 'y', Blocks.chest);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), "xyx", "xxx", "xyx",
'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood"));
if (config.isBlockEnabled("halfdrawers2"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), "xyx", "xxx", "xyx",
'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), "xyx", "xxx", "xyx",
'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', "chestWood"));
if (config.isBlockEnabled("fulldrawers4"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), "yxy", "xxx", "yxy",
'x', new ItemStack(Blocks.planks, 1, i), 'y', Blocks.chest);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), "yxy", "xxx", "yxy",
'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood"));
if (config.isBlockEnabled("halfdrawers4"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), "yxy", "xxx", "yxy",
'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), "yxy", "xxx", "yxy",
'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', "chestWood"));
if (config.isBlockEnabled("trim")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), i), "xyx", "yyy", "xyx",
'x', "stickWood", 'y', new ItemStack(Blocks.planks, 1, i)));
@@ -42,61 +44,61 @@ public class ModRecipes
// Fallback recipes
if (config.isBlockEnabled("fulldrawers1"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), 0), "xxx", " y ", "xxx",
'x', "plankWood", 'y', Blocks.chest));
'x', "plankWood", 'y', "chestWood"));
if (config.isBlockEnabled("fulldrawers2"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), 0), "xyx", "xxx", "xyx",
'x', "plankWood", 'y', Blocks.chest));
'x', "plankWood", 'y', "chestWood"));
if (config.isBlockEnabled("halfdrawers2"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), 0), "xyx", "xxx", "xyx",
'x', "plankWood", 'y', Blocks.chest));
'x', "plankWood", 'y', "chestWood"));
if (config.isBlockEnabled("fulldrawers4"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), 0), "yxy", "xxx", "yxy",
'x', "slabWood", 'y', Blocks.chest));
'x', "slabWood", 'y', "chestWood"));
if (config.isBlockEnabled("halfdrawers4"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), 0), "yxy", "xxx", "yxy",
'x', "slabWood", 'y', Blocks.chest));
'x', "slabWood", 'y', "chestWood"));
if (config.isBlockEnabled("trim"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), 0), "xyx", "yyy", "xyx",
'x', "stickWood", 'y', "plankWood"));
if (config.isBlockEnabled("compdrawers"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.compDrawers, config.getBlockRecipeOutput("compdrawers")), "xxx", "zwz", "xyx",
'x', new ItemStack(Blocks.stone), 'y', Items.iron_ingot, 'z', new ItemStack(Blocks.piston), 'w', "drawerBasic"));
'x', new ItemStack(Blocks.stone), 'y', "ingotIron", 'z', new ItemStack(Blocks.piston), 'w', "drawerBasic"));
if (config.isBlockEnabled("controller"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controller), "xxx", "yzy", "xwx",
'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', Items.diamond));
'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', "gemDiamond"));
if (config.isBlockEnabled("controllerSlave"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controllerSlave), "xxx", "yzy", "xwx",
'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', Items.gold_ingot));
'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', "ingotGold"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
'x', "stickWood", 'y', "drawerBasic"));
if (config.cache.enableStorageUpgrades) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 2), "xyx", "yzy", "xyx",
'x', Items.iron_ingot, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'x', "ingotIron", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 3), "xyx", "yzy", "xyx",
'x', Items.gold_ingot, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'x', "ingotGold", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 4), "xyx", "yzy", "xyx",
'x', Blocks.obsidian, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 5), "xyx", "yzy", "xyx",
'x', Items.diamond, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'x', "gemDiamond", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 6), "xyx", "yzy", "xyx",
'x', Items.emerald, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'x', "gemEmerald", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
}
if (config.cache.enableIndicatorUpgrades) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 1), "wyw", "yzy", "xyx",
'w', new ItemStack(Blocks.redstone_torch), 'x', Items.redstone, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'w', new ItemStack(Blocks.redstone_torch), 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 2), "wyw", "yzy", "xyx",
'w', Items.comparator, 'x', Items.redstone, 'y', "stickWood", 'z', ModItems.upgradeTemplate));
'w', Items.comparator, 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate));
}
if (config.cache.enableLockUpgrades) {
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeLock), "xy ", " y ", " z ",
'x', Items.gold_nugget, 'y', Items.gold_ingot, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeLock), "xy ", " y ", " z ",
'x', "nuggetGold", 'y', "ingotGold", 'z', ModItems.upgradeTemplate));
}
if (config.cache.enableVoidUpgrades) {