From 06f58135c44414dafdf3c677d2cd69f91b8dd7db Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 21 Jul 2018 09:50:42 +1000 Subject: + Added generic token type items to use for various trades. $ Hopefully this fixes Hand Pump recipes. --- src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 2001248668..3d4a071d82 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -290,26 +290,32 @@ public class RECIPES_General { CI.electricPump_LV, "circuitBasic", null, "ringBrass", CI.electricMotor_LV, "circuitBasic", "plateSteel", "plateSteel", "rodBrass", - ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1)); + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)); Logger.INFO("Added recipe for Hand Pump I - "+a[0]); a[1] = RecipeUtils.recipeBuilder( CI.electricPump_MV, "circuitAdvanced", null, "ringMagnalium", CI.electricMotor_MV, "circuitAdvanced", "plateAluminium", "plateAluminium", "rodMagnalium", - ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1)); + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)); Logger.INFO("Added recipe for Hand Pump II - "+a[1]); a[2] = RecipeUtils.recipeBuilder( CI.electricPump_HV, "circuitData", null, "ringChrome", CI.electricMotor_HV, "circuitData", "plateStainlessSteel", "plateStainlessSteel", "rodChrome", - ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1)); + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)); Logger.INFO("Added recipe for Hand Pump III - "+a[2]); a[3] = RecipeUtils.recipeBuilder( CI.electricPump_EV, "circuitElite", null, "ringTitanium", CI.electricMotor_EV, "circuitElite", "plateStungstenSteel", "plateTungstenSteel", "rodTitanium", - ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1)); + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)); Logger.INFO("Added recipe for Hand Pump IV - "+a[3]); + + GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1), 30, 30); + GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1), 120, 120); + GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1), 480, 480); + GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1), 1820, 1820); + return a[0] && a[1] && a[2] && a[3]; } -- cgit