From 0ebbaf88ecce9a0e6fcd84498a0e4f1bcf387331 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Tue, 31 Dec 2019 15:22:02 +0000 Subject: + Added the Adv. DT. (Locked to T1 for now) + Added 10 new casing blocks, with assembler recipes. - Removed obsolete Chunkloading classes. --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 34 ++++++++++++++++++++++ src/Java/gtPlusPlus/core/recipe/common/CI.java | 2 +- 2 files changed, 35 insertions(+), 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 578ef8f89c..4feebce648 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -223,6 +223,7 @@ public class RECIPES_Machines { } initModItems(); + tieredMachineHulls(); controlCores(); energyCores(); wirelessChargers(); @@ -234,6 +235,39 @@ public class RECIPES_Machines { roundRobinators(); } + private static void tieredMachineHulls() { + + GregtechItemList[] aHulls = new GregtechItemList[] { + GregtechItemList.GTPP_Casing_ULV, + GregtechItemList.GTPP_Casing_LV, + GregtechItemList.GTPP_Casing_MV, + GregtechItemList.GTPP_Casing_HV, + GregtechItemList.GTPP_Casing_EV, + GregtechItemList.GTPP_Casing_IV, + GregtechItemList.GTPP_Casing_LuV, + GregtechItemList.GTPP_Casing_ZPM, + GregtechItemList.GTPP_Casing_UV, + GregtechItemList.GTPP_Casing_MAX + }; + + for (int i=0;i<10;i++) { + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(22), + CI.getTieredMachineCasing(i), + CI.getPlate(i, 8), + CI.getGear(i, 2), + CI.getTieredComponent(OrePrefixes.cableGt02, i, 4), + CI.getTieredComponent(OrePrefixes.circuit, i, 2) + }, + CI.getTieredFluid(i, 144 * i * 2), + aHulls[i].get(1), + 20 * 20, + MaterialUtils.getVoltageForTier(i)); + } + + } + private static void initModItems(){ if (LoadedMods.IndustrialCraft2){ IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1); diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index be1089a72a..cf4edcae99 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -592,7 +592,7 @@ public class CI { }; private static final Materials[] aMaterial_Cables = new Materials[] { - (CORE.ConfigSwitches.enableCustom_Cables && LoadedMods.EnderIO) ? Materials.RedstoneAlloy : CORE.GTNH ? Materials.Lead : Materials.Tin, + !CORE.GTNH ? Materials.Lead : Materials.Tin, Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, -- cgit From 9580c236c773899405c81a45cd6d670cdc12d4e4 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 6 Jan 2020 05:28:19 +0000 Subject: + Added recipe for Distillus. + Added recipes for Chunkloaders. + Added recipe for Algae Farm. + Added recipes for Overflow Hatches. % Halved recipe time on Algae Farming, enabled use of compost to increase output. $ Potentially fixed the Overflow Hatches. --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 140 +++++++++++++++++++++ src/Java/gtPlusPlus/core/recipe/common/CI.java | 20 +++ 2 files changed, 160 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 4feebce648..8225a40c29 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -8,6 +8,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; @@ -15,6 +16,7 @@ import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.*; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -231,8 +233,146 @@ public class RECIPES_Machines { industrialVacuumFurnace(); fakeMachineCasingCovers(); ztonesCoverRecipes(); + overflowValveCovers(); superBuses(); roundRobinators(); + chunkloaders(); + distillus(); + algaeFarm(); + chemPlant(); + + } + + private static void chemPlant() { + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(19), + CI.getTieredGTPPMachineCasing(1, 6), + CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGt, 6), + CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plate, 32), + CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16), + ALLOY.STAINLESS_STEEL.getFrameBox(4), + }, + ALLOY.STEEL.getFluid(2 * (144 * 4)), + GregtechItemList.ChemicalPlant_Controller.get(1), + 120 * 20, + MaterialUtils.getVoltageForTier(2)); + + } + + private static void algaeFarm() { + + // Give the shitty algae a use :) + CORE.RA.addDistilleryRecipe( + ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 32), + null, + null, + ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4), + 20 * 15, + 16, + false); + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(21), + CI.getTieredGTPPMachineCasing(0, 4), + CI.getTieredComponentOfMaterial(Materials.Iron, OrePrefixes.rod, 12), + CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32), + CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.bolt, 16), + CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32), + }, + ALLOY.POTIN.getFluid(2 * (144 * 4)), + GregtechItemList.AlgaeFarm_Controller.get(1), + 60 * 20, + MaterialUtils.getVoltageForTier(1)); + + + } + + private static void distillus() { + + CORE.RA.addFluidReactorRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(19), + ItemList.Distillation_Tower.get(2), + GregtechItemList.GTPP_Casing_IV.get(16), + CI.getTieredComponent(OrePrefixes.circuit, 6, 8) + }, + new FluidStack[] { + ALLOY.AQUATIC_STEEL.getFluid(144 * 32), + ALLOY.BABBIT_ALLOY.getFluid(144 * 16), + ALLOY.BRONZE.getFluid(144 * 64), + ALLOY.KANTHAL.getFluid(144 * 16), + }, + new ItemStack[] { + GregtechItemList.Machine_Adv_DistillationTower.get(1) + }, + new FluidStack[] { + + }, + 20 * 600, + MaterialUtils.getVoltageForTier(6), + 3); + + } + + private static void chunkloaders() { + + ItemStack aOutputs[] = new ItemStack[] { + GregtechItemList.GT_Chunkloader_HV.get(1L), + GregtechItemList.GT_Chunkloader_IV.get(1L), + GregtechItemList.GT_Chunkloader_ZPM.get(1L), + }; + + int aIndex = 0; + + for (int i=3;i<8;i++) { + if (i == 4 || i == 6) { + continue; + } + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(21), + CI.getElectricPiston(i, 10), + CI.getFieldGenerator(i + 1, 6), + CI.getPlate(i, 16), + CI.getEmitter(i - 1, 24), + CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) + }, + ALLOY.EGLIN_STEEL.getFluid(i * (144 * 4)), + aOutputs[aIndex++].copy(), + 300 * 20, + MaterialUtils.getVoltageForTier(i)); + } + + + } + + private static void overflowValveCovers() { + ItemStack aOutputs[] = new ItemStack[] { + GregtechItemList.Cover_Overflow_ULV.get(1L), + GregtechItemList.Cover_Overflow_LV.get(1L), + GregtechItemList.Cover_Overflow_MV.get(1L), + GregtechItemList.Cover_Overflow_HV.get(1L), + GregtechItemList.Cover_Overflow_EV.get(1L), + GregtechItemList.Cover_Overflow_IV.get(1L), + }; + + for (int i=0;i<6;i++) { + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(19), + CI.getElectricPump(i, 2), + CI.getElectricMotor(i, 2), + CI.getPlate(i, 4) + }, + FluidUtils.getWater(i * 1500), + aOutputs[i].copy(), + 20 * 20, + MaterialUtils.getVoltageForTier(i)); + } + } private static void tieredMachineHulls() { diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index cf4edcae99..6b8f992266 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -1244,4 +1244,24 @@ public class CI { return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0); } + public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) { + GregtechItemList[] aHulls = new GregtechItemList[] { + GregtechItemList.GTPP_Casing_ULV, + GregtechItemList.GTPP_Casing_LV, + GregtechItemList.GTPP_Casing_MV, + GregtechItemList.GTPP_Casing_HV, + GregtechItemList.GTPP_Casing_EV, + GregtechItemList.GTPP_Casing_IV, + GregtechItemList.GTPP_Casing_LuV, + GregtechItemList.GTPP_Casing_ZPM, + GregtechItemList.GTPP_Casing_UV, + GregtechItemList.GTPP_Casing_MAX + }; + return aHulls[aTier].get(aAmount); + } + + public static ItemStack getTieredComponentOfMaterial(Materials aMaterial, OrePrefixes aPrefix, int aAmount) { + return ItemUtils.getOrePrefixStack(aPrefix, aMaterial, aAmount); + } + } -- cgit From fbb298251275388777a7ff30d8b9f0fd0c88f39c Mon Sep 17 00:00:00 2001 From: botn365 <42187820+botn365@users.noreply.github.com> Date: Wed, 8 Jan 2020 00:14:32 +0100 Subject: Redone Turbodyne F1-A Logic (#597) - Removed free fuel tick on single block rocket engines. % Changed hg1223 from ZPM to LuV. % Spelling. % Adjusted logging. $ Rewrote large rocket engine logic. Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> --- src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.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_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 14858b15aa..cf2242067f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -645,7 +645,7 @@ public class RECIPES_GREGTECH { }, new int[] {10000}, //Output Chance 20 * 120, - 122880); + 30720); -- cgit