From 61688e1d620e48c29746406827e89dee67fc17b2 Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 7 Jan 2017 00:05:08 -0800 Subject: [PATCH 1/3] Actually call mixed metal ingot recipes #releaseBuild Fixes #890 --- src/main/java/techreborn/init/recipes/CraftingTableRecipes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 66a5666e5..ae09a714b 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -25,6 +25,7 @@ import java.security.InvalidParameterException; public class CraftingTableRecipes extends RecipeMethods { public static void init() { registerCompressionRecipes(); + registerMixedMetalIngotRecipes(); registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), getStack(Blocks.STONE), getMaterial("iridium", Type.INGOT)); registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), getMaterial("iridium", Type.INGOT)); registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), getMaterial("tungstensteel", Type.INGOT)); From 49ae0045aad73ffc34956f7d87f1bfd3cf261d7f Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 7 Jan 2017 00:29:19 -0800 Subject: [PATCH 2/3] Fix a few recipes --- src/main/java/techreborn/init/ModRecipes.java | 14 +++++++------- .../init/recipes/CraftingTableRecipes.java | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 4fa71cd31..cf9e1d775 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -124,6 +124,11 @@ public class ModRecipes { ItemDusts.getDustByName("netherrack"), 300, 27)); + RecipeHandler.addRecipe(new GrinderRecipe( + new ItemStack(Items.COAL), + ItemDusts.getDustByName("coal"), + 300, 27)); + for (String oreDictionaryName : OreDictionary.getOreNames()) { if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) { ItemStack oreStack = getDictOreOrEmpty(oreDictionaryName, 1); @@ -722,17 +727,12 @@ public class ModRecipes { // "plateIridium", 'C', "circuitBasic", // 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor); - CraftingHelper - .addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C', - "circuitAdvanced", 'B', "machineBlockAdvanced", 'E', - IC2Duplicates.EXTRACTOR.getStackBasedOnConfig()); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B', BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig()); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), "ECP", "GGG", "CBC", 'E', - ModBlocks.INDUSTRIAL_ELECTROLYZER, 'P', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C', + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', + ModBlocks.INDUSTRIAL_ELECTROLYZER, 'H', "craftingGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', IC2Duplicates.GRINDER.getStackBasedOnConfig()); diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index ae09a714b..2475bfc1d 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -131,7 +131,9 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(ModItems.RE_BATTERY), "XWX", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', getStack(IC2Duplicates.CABLE_ICOPPER)); - registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', getStack(IC2Duplicates.REFINED_IRON), 'E', getStack(IC2Duplicates.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitBasic"); + registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', getStack(IC2Duplicates.REFINED_IRON), 'E', getStack(IC2Duplicates.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); + registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotAluminum", 'E', getStack(IC2Duplicates.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); + registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotAluminium", 'E', getStack(IC2Duplicates.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); registerShaped(getStack(ModItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); registerShaped(getStack(ModItems.LAPOTRONIC_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic"); registerShapeless(getStack(IC2Duplicates.GENERATOR), getStack(ModItems.RE_BATTERY), getMaterial("machine", Type.MACHINE_FRAME), Blocks.FURNACE); From d435d5d7728ad8d8c4168bb0515c87a807b7f636 Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 7 Jan 2017 00:30:01 -0800 Subject: [PATCH 3/3] #releaseBuild