From fb9cfbd808e89837b9a60fa3d434dfec7410d365 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 6 Mar 2018 17:15:04 +1000 Subject: + Added temp recipes for the Cyclotron and it's casings. + Added a config option for the Cyclotron. - Reduced output chance and quantity of AM241 pellets. $ Fixed localization for all sizes of dusts. --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 814925a5ce..201235cc55 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1245,7 +1245,7 @@ public class RECIPES_GREGTECH { //Americium CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.americium", 1), - new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(8) }, null, new int[] { 7500 }, 20 * 300, 1020, + new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(4) }, null, new int[] { 2500 }, 20 * 300, 1020, 500 * 20); //PO Special Value //Strontium u235 diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index e600ac81a1..64df3ca43f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -84,6 +84,11 @@ public class RECIPES_Machines { public static ItemStack RECIPE_LFTRController; public static ItemStack RECIPE_LFTROuterCasing; public static ItemStack RECIPE_LFTRInnerCasing; + + //Cyclotron + public static ItemStack RECIPE_CyclotronController; + public static ItemStack RECIPE_CyclotronOuterCasing; + public static ItemStack RECIPE_CyclotronInnerCoil; //Buffer Cores @@ -1022,6 +1027,33 @@ public class RECIPES_Machines { + } + + + //Cyclotron + if (CORE.ConfigSwitches.enableMultiblock_Cyclotron){ + RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); + RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(Casing_Amount); + RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); + + RecipeUtils.recipeBuilder( + "plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956", + "plateIncoloyMA956", "frameGtIncoloy020", "plateIncoloyMA956", + "plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956", + RECIPE_CyclotronOuterCasing); + + RecipeUtils.recipeBuilder( + "plateIncoloy020", "plateIncoloy020", "plateIncoloy020", + "plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020", + "plateIncoloy020", "plateIncoloy020", "plateIncoloy020", + RECIPE_CyclotronInnerCoil); + + + RecipeUtils.recipeBuilder( + "plateIncoloy020", CI.getTieredCircuit(6), "plateIncoloy020", + RECIPE_CyclotronInnerCoil, CI.machineHull_IV, RECIPE_CyclotronInnerCoil, + "plateIncoloy020", "gearIncoloyMA956", "plateIncoloy020", + RECIPE_CyclotronController); } if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){ -- cgit