From d17f4295ec87316f2967cd4715f76953b280f1c4 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sun, 12 Apr 2020 01:07:37 +0100 Subject: % More adjustments to Vacuum Furnace NEI handler. $ Fixed Vacuum Furnace controller recipe. --- src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index ebc2c07a63..283b71ca9f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -2268,7 +2268,7 @@ public class RECIPES_Machines { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - GregtechItemList.Casing_Vacuum_Furnace.get(Casing_Amount), + GregtechItemList.Casing_Vacuum_Furnace.get(aCostMultiplier), CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4 * aCostMultiplier), CI.getEnergyCore(6, 1 * aCostMultiplier), CI.getRobotArm(4, 4 * aCostMultiplier), -- cgit From d2eb439ba60e633ad0418af295ab237f04d4e4ee Mon Sep 17 00:00:00 2001 From: Alkalus Date: Mon, 13 Apr 2020 11:25:01 +0100 Subject: + Added a recipe for the catalyst bus. % Adjusted use/creation of Pine Oil in recipes. --- src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 283b71ca9f..a0c4eaa7a3 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -265,6 +265,21 @@ public class RECIPES_Machines { GregtechItemList.ChemicalPlant_Controller.get(1), 120 * 20, MaterialUtils.getVoltageForTier(2)); + + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(15), + CI.getTieredGTPPMachineCasing(1, 2), + ItemList.Hatch_Input_Bus_MV.get(1), + CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8), + CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48), + CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), + }, + ALLOY.BRONZE.getFluid(2 * (144 * 4)), + GregtechItemList.Bus_Catalysts.get(1), + 60 * 20, + MaterialUtils.getVoltageForTier(2)); } -- cgit From 492aa5becc6c49cc3afde8c855b5bbcdc5055e51 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 14 Apr 2020 00:05:16 +0100 Subject: + Added an Advanced Hazmat Suit. + Added a T3 circuit for recipe selections. $ Disabled TT Thaumic Repairer patch. $ Fixed a bug in EnumUtils not correctly handling missing entries. --- src/Java/gtPlusPlus/core/recipe/common/CI.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index d67a372572..93ede378a8 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -1235,6 +1235,10 @@ public class CI { return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0); } + public static ItemStack getNumberedAdvancedCircuit(int i) { + return ItemUtils.simpleMetaStack(GenericChem.mAdvancedCircuit, i, 0); + } + public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) { GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV, -- cgit From 87ab3c0ab5f1b682295e2a010cc88cf4ae7db51c Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 14 Apr 2020 00:14:31 +0100 Subject: % Changed a heap of recipes to use the new circuits. --- src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 8 ++++---- src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (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 1561f4b475..ea1bcdb9de 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -120,7 +120,7 @@ public class RECIPES_GREGTECH { // Advanced method for Nitric Acid Production CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(17), + CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0), }, new FluidStack[] { @@ -140,7 +140,7 @@ public class RECIPES_GREGTECH { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(16), + CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0), }, new FluidStack[] { @@ -161,7 +161,7 @@ public class RECIPES_GREGTECH { // Produce Boric Acid CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(21), + CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 4), }, new FluidStack[] { @@ -182,7 +182,7 @@ public class RECIPES_GREGTECH { // Produce Th232 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(22), + CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16) }, new FluidStack[] { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index a0c4eaa7a3..387f7bef65 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -316,7 +316,7 @@ public class RECIPES_Machines { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(19), + CI.getNumberedAdvancedCircuit(19), ItemList.Distillation_Tower.get(2), GregtechItemList.GTPP_Casing_IV.get(16), CI.getTieredComponent(OrePrefixes.circuit, 6, 8) @@ -355,7 +355,7 @@ public class RECIPES_Machines { } CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(21), + CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10), CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), @@ -932,7 +932,7 @@ public class RECIPES_Machines { CI.getGear(1, GTNH ? 4 : 2) }; aSemiFluidInputs[1] = new ItemStack[]{ - CI.getNumberedBioCircuit(14), + CI.getNumberedCircuit(14), CI.getTieredMachineHull(2, 1), CI.getElectricPiston(2, GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2), @@ -940,7 +940,7 @@ public class RECIPES_Machines { CI.getGear(2, GTNH ? 4 : 2) }; aSemiFluidInputs[2] = new ItemStack[]{ - CI.getNumberedBioCircuit(14), + CI.getNumberedAdvancedCircuit(14), CI.getTieredMachineHull(3, 1), CI.getElectricPiston(3, GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 4 : 2), -- cgit