From 63deffda98c6773e05fc6b4daddd4236d4e61c1f Mon Sep 17 00:00:00 2001 From: Daniel Mendes <70096037+Steelux8@users.noreply.github.com> Date: Fri, 9 Aug 2024 11:40:57 +0100 Subject: Add New Butane Crafting Option for Anti-Knock Agent (#2762) * Add new butane option for Anti-Knock -> Add new alternative MTBE fluid made from Butane instead of Butene, to prevent mixing the two fluids; -> Add equivalent recipes for the new fluid, with Butane instead of Butene. * Spotless apply for branch Butane_For_AntiKnock for #2762 (#2763) spotlessApply Co-authored-by: GitHub GTNH Actions <> * duct tape fix (cherry picked from commit 7cfb3923d6ff6abe6d56d6bbab3d05eb5529bb64) (cherry picked from commit 670b21508b9f429eace6bee29b7426dd30c4dd00) (cherry picked from commit 881dcefd8d2e6d72d1fa4970ee9704adfbf68c4c) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dream Master --- src/main/java/gregtech/api/enums/Materials.java | 6 +++++- .../gregtech/loaders/postload/recipes/ChemicalRecipes.java | 8 ++++++++ .../gregtech/loaders/postload/recipes/DistilleryRecipes.java | 10 ++++++++++ .../java/gregtech/loaders/postload/recipes/MixerRecipes.java | 7 +++++++ 4 files changed, 30 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 8bfbc94699..5cbcd164d6 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -850,7 +850,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Polybenzimidazole = new Materials(599, TextureSet.SET_DULL ,3.0F, 64, 1, 1|2 |64|128 , 45, 45, 45, 0, "Polybenzimidazole" , "Polybenzimidazole" , 0, 0, 1450, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 0, Arrays.asList(new MaterialStack(Carbon, 20), new MaterialStack(Nitrogen, 4), new MaterialStack(Hydrogen, 12)), Arrays.asList(new TC_AspectStack(TC_Aspects.ORDO, 2),new TC_AspectStack(TC_Aspects.VOLATUS, 1))); //Gasoline - public static Materials MTBEMixture = new MaterialBuilder(983, TextureSet.SET_FLUID , "MTBE Reaction Mixture").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 12), new MaterialStack(Oxygen, 1)).constructMaterial(); + public static Materials MTBEMixture = new MaterialBuilder(983, TextureSet.SET_FLUID , "MTBE Reaction Mixture (Butene)").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 12), new MaterialStack(Oxygen, 1)).constructMaterial(); + public static Materials MTBEMixtureAlt = makeMTBEMixtureAlt(); + private static Materials makeMTBEMixtureAlt() { + return new MaterialBuilder(425, TextureSet.SET_FLUID , "MTBE Reaction Mixture (Butane)").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 1)).constructMaterial(); + } public static Materials NitrousOxide = new MaterialBuilder(993, TextureSet.SET_FLUID , "Nitrous Oxide").addCell().addGas().setRGB(125, 200, 255).setColor(Dyes.dyeBlue).setMaterialList(new MaterialStack(Nitrogen, 2), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials AntiKnock = new MaterialBuilder(994, TextureSet.SET_FLUID , "Anti-Knock Agent").setName("EthylTertButylEther").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 1)).constructMaterial(); public static Materials Octane = new MaterialBuilder(995, TextureSet.SET_FLUID , "Octane").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setFuelType(MaterialBuilder.DIESEL).setFuelPower(80).setMaterialList(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 18)).constructMaterial(); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 5add456f34..9a8ce44947 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -5608,6 +5608,14 @@ public class ChemicalRecipes implements Runnable { .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Butane.getGas(1000)) + .fluidOutputs(Materials.MTBEMixtureAlt.getGas(1000)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) .fluidInputs( diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 1cae357f24..449bda7b27 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -567,6 +567,16 @@ public class DistilleryRecipes implements Runnable { .eut(TierEU.RECIPE_MV) .addTo(distillationTowerRecipes); + GT_Values.RA.stdBuilder() + .fluidInputs(Materials.MTBEMixtureAlt.getGas(900L)) + .fluidOutputs( + Materials.AntiKnock.getFluid(400L), + Materials.Methanol.getFluid(500L), + Materials.Butane.getGas(400L)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(distillationTowerRecipes); + GT_Values.RA.stdBuilder() .itemOutputs(ItemList.IC2_Fertilizer.get(1)) .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index 6f2de1d6b3..3974dd2b68 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -1488,6 +1488,13 @@ public class MixerRecipes implements Runnable { .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), Materials.Butane.getCells(1)) + .itemOutputs(Materials.MTBEMixtureAlt.getCells(1), Materials.Empty.getCells(1)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(mixerRecipes); + GT_Values.RA.stdBuilder() .itemInputs( Materials.Naphtha.getCells(16), -- cgit