From 76f3e8e4d2eb62a4d6e0b86788b4f8153f33fcda Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Wed, 28 Dec 2022 22:41:12 +0100 Subject: Add light, medium and heavy oil to get lube (#1584) * Add light, medium and heavy oil to get lube Add distillation recipe to get lube out of oil add control circuit * spotlessApply (#1585) Co-authored-by: Martin Robertz Co-authored-by: GitHub GTNH Actions <> * fix misstype Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../loaders/postload/GT_MachineRecipeLoader.java | 111 +++++++++++++++++++++ 1 file changed, 111 insertions(+) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 9dd2b31f76..962ad39ecf 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -5263,6 +5263,27 @@ public class GT_MachineRecipeLoader implements Runnable { 160, 30, false); + GT_Values.RA.addDistilleryRecipe( + GT_Utility.getIntegratedCircuit(24), + Materials.OilLight.getFluid(120L), + Materials.Lubricant.getFluid(30L), + 160, + 30, + false); + GT_Values.RA.addDistilleryRecipe( + GT_Utility.getIntegratedCircuit(24), + Materials.OilMedium.getFluid(120L), + Materials.Lubricant.getFluid(60L), + 160, + 30, + false); + GT_Values.RA.addDistilleryRecipe( + GT_Utility.getIntegratedCircuit(24), + Materials.OilHeavy.getFluid(120L), + Materials.Lubricant.getFluid(90L), + 160, + 30, + false); GT_Values.RA.addDistilleryRecipe( GT_Utility.getIntegratedCircuit(1), Materials.Biomass.getFluid(40L), @@ -5374,6 +5395,72 @@ public class GT_MachineRecipeLoader implements Runnable { FluidRegistry.getFluid("oil"), FluidRegistry.getFluid("lubricant"), false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), + FluidRegistry.getFluidStack("liquid_light_oil", 750), + FluidRegistry.getFluidStack("lubricant", 500), + 128, + 4, + false); + + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), + FluidRegistry.getFluidStack("liquid_light_oil", 750), + FluidRegistry.getFluidStack("lubricant", 500), + 128, + 4, + false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + FluidRegistry.getFluidStack("liquid_light_oil", 750), + FluidRegistry.getFluidStack("lubricant", 500), + 128, + 4, + false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), + FluidRegistry.getFluidStack("liquid_medium_oil", 750), + FluidRegistry.getFluidStack("lubricant", 750), + 128, + 4, + false); + + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), + FluidRegistry.getFluidStack("liquid_medium_oil", 750), + FluidRegistry.getFluidStack("lubricant", 750), + 128, + 4, + false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + FluidRegistry.getFluidStack("liquid_medium_oil", 750), + FluidRegistry.getFluidStack("lubricant", 750), + 128, + 4, + false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), + FluidRegistry.getFluidStack("liquid_heavy_oil", 500), + FluidRegistry.getFluidStack("lubricant", 750), + 64, + 4, + false); + + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L), + FluidRegistry.getFluidStack("liquid_heavy_oil", 500), + FluidRegistry.getFluidStack("lubricant", 750), + 64, + 4, + false); + GT_Values.RA.addBrewingRecipeCustom( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + FluidRegistry.getFluidStack("liquid_heavy_oil", 500), + FluidRegistry.getFluidStack("lubricant", 750), + 64, + 4, + false); GT_Values.RA.addBrewingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L), FluidRegistry.getFluid("creosote"), @@ -7044,18 +7131,21 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addDistillationTowerRecipe( Materials.Creosote.getFluid(1000L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, new FluidStack[] {Materials.Lubricant.getFluid(500L)}, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.SeedOil.getFluid(1400L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, new FluidStack[] {Materials.Lubricant.getFluid(500L)}, null, 400, 120); GT_Values.RA.addDistillationTowerRecipe( Materials.FishOil.getFluid(1200L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, new FluidStack[] {Materials.Lubricant.getFluid(500L)}, null, 400, @@ -7072,6 +7162,27 @@ public class GT_MachineRecipeLoader implements Runnable { null, 32, 120); + GT_Values.RA.addDistillationTowerRecipe( + Materials.OilLight.getFluid(1000L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, + new FluidStack[] {Materials.Lubricant.getFluid(250L)}, + null, + 400, + 120); + GT_Values.RA.addDistillationTowerRecipe( + Materials.OilMedium.getFluid(1000L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, + new FluidStack[] {Materials.Lubricant.getFluid(500L)}, + null, + 400, + 120); + GT_Values.RA.addDistillationTowerRecipe( + Materials.OilHeavy.getFluid(1000L), + new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, + new FluidStack[] {Materials.Lubricant.getFluid(750L)}, + null, + 400, + 120); if (!GregTech_API.mIC2Classic) { GT_Values.RA.addDistillationTowerRecipe( -- cgit