From 56feac3d2320b6dffebc08410668ab84e877588e Mon Sep 17 00:00:00 2001 From: MachineMuse Date: Sun, 15 Dec 2013 17:50:24 -0700 Subject: [PATCH] add copying recipes to distribution directory --- .../recipes/ThermalExpansion.recipes | 217 ++++++++++++++++++ build.xml | 5 + .../general/recipe/RecipeManager.java | 6 - 3 files changed, 222 insertions(+), 6 deletions(-) create mode 100644 assets/powersuits/recipes/ThermalExpansion.recipes diff --git a/assets/powersuits/recipes/ThermalExpansion.recipes b/assets/powersuits/recipes/ThermalExpansion.recipes new file mode 100644 index 0000000..7441ff1 --- /dev/null +++ b/assets/powersuits/recipes/ThermalExpansion.recipes @@ -0,0 +1,217 @@ +[ + { + "ingredients" : [ + [ { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" } ], + [ { "oredictName" : "gearTin" }, { "unlocalizedName" : "item.ingotIron" } ], + [ { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" } ] + ], + "result" : { + "oredictName" : "componentPlatingBasic" + } + }, + { + "ingredients" : [ + [ { "unlocalizedName" : "item.diamond" }, { "unlocalizedName" : "item.diamond" } ], + [ { "oredictName" : "gearInvar" }, { "unlocalizedName" : "item.diamond" } ], + [ { "unlocalizedName" : "item.diamond" }, { "unlocalizedName" : "item.diamond" } ] + ], + "result" : { + "oredictName" : "componentPlatingAdvanced" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "ingotElectrum" }, { "unlocalizedName" : "item.yellowDust" }, { "oredictName" : "componentWiring" } ], + [ { "unlocalizedName" : "item.redstone" }, { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.yellowDust" } ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.redstone" }, { "oredictName" : "ingotElectrum" } ] + ], + "result" : { + "oredictName" : "componentControlCircuit" + }, + "mirror" : true + }, + { + "ingredients" : [ + [ { "oredictName" : "componentPlatingBasic" } ] + ], + "result" : { + "unlocalizedName" : "item.ingotIron", + "quantity" : 5 + } + }, + { + "ingredients" : [ + [ { "oredictName" : "componentPlatingAdvanced" } ] + ], + "result" : { + "unlocalizedName" : "item.diamond", + "quantity" : 5 + } + }, + { + "ingredients" : [ + [ { "oredictName" : "dyeRed" }, { "oredictName" : "dyeGreen" }, { "oredictName" : "dyeBlue" } ], + [ null, { "unlocalizedName" : "tile.glass" }, null ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.thermalexpansion.material.powerCoilGold" }, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "oredictName" : "componentLaserEmitter" + } + }, + { + "ingredients" : [ + [ null, { "unlocalizedName" : "item.emerald" }, null ], + [ { "oredictName" : "ingotElectrum" }, { "unlocalizedName" : "item.thermalexpansion.component.machineFrame" }, { "oredictName" : "ingotElectrum" } ], + [ null, { "unlocalizedName" : "item.thermalexpansion.material.powerCoilSilver" }, null ] + ], + "result" : { + "unlocalizedName" : "tile.tinkerTable" + } + }, + { + "ingredients" : [ + [ { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" } ], + [ { "oredictName" : "componentWiring" }, null, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "unlocalizedName" : "item.powerArmorHelmet" + } + }, + { + "ingredients" : [ + [ { "unlocalizedName" : "item.ingotIron" }, null, { "unlocalizedName" : "item.ingotIron" } ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.ingotIron" }, { "oredictName" : "componentWiring" } ], + [ { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" } ] + ], + "result" : { + "unlocalizedName" : "item.powerArmorChestplate" + } + }, + { + "ingredients" : [ + [ { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" }, { "unlocalizedName" : "item.ingotIron" } ], + [ { "oredictName" : "componentWiring" }, null, { "oredictName" : "componentWiring" } ], + [ { "unlocalizedName" : "item.ingotIron" }, null, { "unlocalizedName" : "item.ingotIron" } ] + ], + "result" : { + "unlocalizedName" : "item.powerArmorLeggings" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "componentWiring" }, null, { "oredictName" : "componentWiring" } ], + [ { "unlocalizedName" : "item.ingotIron" }, null, { "unlocalizedName" : "item.ingotIron" } ] + ], + "result" : { + "unlocalizedName" : "item.powerArmorBoots" + } + }, + { + "ingredients" : [ + [ null, { "unlocalizedName" : "item.ingotIron" }, null ], + [ { "unlocalizedName" : "item.ingotIron" }, { "oredictName" : "ingotElectrum" }, { "unlocalizedName" : "item.ingotIron" } ], + [ null, { "oredictName" : "componentWiring" }, null ] + ], + "result" : { + "unlocalizedName" : "item.powerFist" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "ingotCopper" }, { "oredictName" : "ingotCopper" }, { "oredictName" : "ingotCopper" } ], + [ { "oredictName" : "ingotSilver" }, { "oredictName" : "ingotSilver" }, { "oredictName" : "ingotSilver" } ], + [ { "oredictName" : "ingotCopper" }, { "oredictName" : "ingotCopper" }, { "oredictName" : "ingotCopper" } ], + ], + "result" : { + "oredictName" : "componentWiring", + "quantity" : 8 + } + }, + { + "ingredients" : [ + [ { "id" : 35 }, { "id" : 35 }, { "id" : 35 } ], + [ { "unlocalizedName" : "item.string" }, null, { "unlocalizedName" : "item.string" } ], + [ null, { "unlocalizedName" : "item.thermalexpansion.material.pneumaticServo" }, null ] + ], + "result" : { + "oredictName" : "componentParachute" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "ingotSilver" }, { "unlocalizedName" : "item.paper" }, { "unlocalizedName" : "item.ingotGold" } ], + [ { "oredictName" : "componentWiring" }, null, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "oredictName" : "componentLVCapacitor" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.thermalexpansion.component.conduitEnergyReinforcedEmpty" }, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "oredictName" : "componentMVCapacitor" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.thermalexpansion.component.cellReinforcedFrameFull" }, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "oredictName" : "componentHVCapacitor" + } + }, + { + "ingredients" : [ + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.ingotIron" }, { "oredictName" : "componentWiring" } ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.ingotIron" }, { "oredictName" : "componentWiring" } ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.ingotIron" }, { "oredictName" : "componentWiring" } ] + ], + "result" : { + "oredictName" : "componentSolenoid" + } + }, + { + "ingredients" : [ + [ null, { "oredictName" : "glassHardened" }, { "oredictName" : "glassHardened" } ], + [ { "oredictName" : "glassHardened" }, { "oredictName" : "glassHardened" }, { "oredictName" : "componentSolenoid" } ], + [ { "oredictName" : "glassHardened" }, null, null ] + ], + "result" : { + "oredictName" : "componentGliderWing" + } + }, + { + "ingredients" : [ + [ null, { "oredictName" : "componentSolenoid" }, null ], + [ { "oredictName" : "componentWiring" }, { "unlocalizedName" : "item.thermalexpansion.material.pneumaticServo" }, { "oredictName" : "componentWiring" } ], + [ null, { "oredictName" : "componentSolenoid" }, null ] + ], + "result" : { + "oredictName" : "componentServo" + } + }, + { + "ingredients" : [ + [ null, { "oredictName" : "componentWiring" }, null ], + [ { "oredictName" : "componentSolenoid" }, { "unlocalizedName" : "item.thermalexpansion.component.tesseractFrameFull" }, { "oredictName" : "componentSolenoid" } ], + [ null, { "oredictName" : "componentWiring" }, null ] + ], + "result" : { + "oredictName" : "componentFieldEmitter" + }, + "mirror" : true + }, + { + "ingredients" : [ + [ null, { "oredictName" : "componentFieldEmitter" }, { "oredictName" : "ingotInvar" } ], + [ { "oredictName" : "ingotInvar" }, { "unlocalizedName" : "item.yellowDust" }, null], + [ { "oredictName" : "componentWiring" }, { "oredictName" : "componentFieldEmitter" }, { "oredictName" : "ingotInvar" } ] + ], + "result" : { + "oredictName" : "componentIonThruster" + } + + } +] \ No newline at end of file diff --git a/build.xml b/build.xml index 9b2548b..9b3a179 100644 --- a/build.xml +++ b/build.xml @@ -221,10 +221,15 @@ + + + + + diff --git a/src/minecraft/net/machinemuse/general/recipe/RecipeManager.java b/src/minecraft/net/machinemuse/general/recipe/RecipeManager.java index cd46bb1..a2fa870 100644 --- a/src/minecraft/net/machinemuse/general/recipe/RecipeManager.java +++ b/src/minecraft/net/machinemuse/general/recipe/RecipeManager.java @@ -27,13 +27,10 @@ public class RecipeManager { ItemStack iron = new ItemStack(Item.ingotIron); ItemStack circuit = ItemComponent.wiring; ItemStack goldNugget = new ItemStack(Item.goldNugget); - ItemStack ingotGold = new ItemStack(Item.ingotGold); ItemStack redstone = new ItemStack(Item.redstone); ItemStack wool = new ItemStack(Block.cloth); ItemStack string = new ItemStack(Item.silk); - ItemStack paper = new ItemStack(Item.paper); ItemStack glass = new ItemStack(Block.glass); - ItemStack glassPane = new ItemStack(Block.thinGlass); ItemStack glowstone = new ItemStack(Item.glowstone); ItemStack emerald = new ItemStack(Item.emerald); ItemStack diamond = new ItemStack(Item.diamond); @@ -41,12 +38,9 @@ public class RecipeManager { ItemStack rosered = new ItemStack(Item.dyePowder, 1, 1); ItemStack cactusgreen = new ItemStack(Item.dyePowder, 1, 2); ItemStack enderPearl = new ItemStack(Item.enderPearl); - ItemStack stone = new ItemStack(Block.stone); if (ModCompatability.vanillaRecipesEnabled()) { JSONRecipeList.loadRecipesFromResource(CommonProxy.getResource("/assets/powersuits/recipes/vanilla.recipes")); -// JSONRecipeList.loadRecipesFromDir(Numina.configDir() + "/machinemuse/recipes/vanilla.recipes"); - } if (ModCompatability.UERecipesEnabled()) { String basicCircuit = "circuitBasic";