From c323e84c7ebf6c911f177573e6aa16f063840a35 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Wed, 4 Sep 2024 18:55:32 +0100 Subject: [PATCH 01/17] Fent Chain PT1 --- build.gradle | 4 +- .../GTFOMaterialHandler.java | 39 ++++++++- .../recipe/chain/FentChain.java | 82 +++++++++++++++++++ 3 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/FentChain.java diff --git a/build.gradle b/build.gradle index a99d4771..892add04 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1720840170 +//version: 1723428048 /* * DO NOT CHANGE THIS FILE! * Also, you may replace this file at any time if there is an update available. @@ -1391,7 +1391,7 @@ def getChangelog() { // Buildscript updating -def buildscriptGradleVersion = '8.5' +def buildscriptGradleVersion = '8.9' tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index be4e7fc1..5f62cbe5 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -510,6 +510,35 @@ public class GTFOMaterialHandler { public static final Material EnergizedCoffee = fluidBuilderFood(21991, "energized_coffee", 368) .color(0x695934) .build(); + public static final Material EthyleneOxide = fluidBuilderFood(21992, "Ethlylene_oxide") + .color(0xFFFFFF) + .build(); + public static final Material DiethylEther = fluidBuilderFood(21993, "Diethyl_Ether") + .color(0xFFFFFF) + .build(); + public static final Material BromoBenzene = fluidBuilderFood(21994, "Bromo_Benzene") + .color(0xFFFFE4) + .build(); + public static final Material Acetylene = fluidBuilderFood(21995, "Acetylene") + .color(0xFFFFFF) + .build(); + public static final Material Formaldehyde = fluidBuilderFood(21996, "Formaldehyde") + .color(0x00B140) + .build(); + public static final Material onefourButynediol = fluidBuilderFood(21997, "onefourButynediol") + .color(0xFFFFFF) + .build(); + public static final Material onefourButanediol = fluidBuilderFood(21998, "onefourButanediol") + .color(0xFFFFFF) + .build(); + public static final Material gammabutyrolacetone = fluidBuilderFood(21999, "gammabutyrolacetone") + .color(0xFFFFFF) + .build(); + public static final Material Methylamine = fluidBuilderFood(22000, "Methylamine") + .color(0xFFFFFF) + .build(); + + public static final GTFOOredictItem.OreDictValueItem COFFEE_GROUNDS = SHAPED_ITEM.addOreDictItem(1017, "coffee_grounds", 0x1a1612, MaterialIconSet.DULL, OrePrefix.dust); @@ -625,11 +654,19 @@ public class GTFOMaterialHandler { public static final GTFOOredictItem.OreDictValueItem CRACKER_GRAHAM_UNGRADED = SHAPED_ITEM.addOreDictItem(1049, "cracker_graham_ungraded", 0xf0c25d, MaterialIconSet.DULL, OrePrefix.plate); public static final GTFOOredictItem.OreDictValueItem CHOCOLATE_LIQUOR_PRESSED = SHAPED_ITEM.addOreDictItem(1050, "chocolate_liquor_pressed", 0xa6795a, GTFOValues.Organic, OrePrefix.crushed); public static final GTFOOredictItem.OreDictValueItem CHOCOLATE_LIQUOR_DUTCHED_PRESSED = SHAPED_ITEM.addOreDictItem(1051, "chocolate_liquor_dutched_pressed", 0xab7550, GTFOValues.Organic, OrePrefix.crushed); - public static final Material Paracetamol = new Material.Builder(21900, gtfoId("paracetamol")).dust() .color(0x0045A0).iconSet(MaterialIconSet.SHINY) .components(Carbon, 8, Hydrogen, 9, Nitrogen, 1, Oxygen, 2) .build(); + public static final Material PhenylmagnesiumBromide = new Material.Builder(21901, gtfoId("Phenylmagnesium_Bromide")).dust() + .color(0x964B00).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 6, Hydrogen, 5, Magnesium, 1, Bromine, 1) + .build(); + public static final Material BenzoPhenone = new Material.Builder(21902, gtfoId("Benzo_Phenone")).dust() + .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 13, Hydrogen, 10, Oxygen, 1) + .build(); + public static void onMaterialsInit() { Materials.Iron.addFlags(GENERATE_FRAME); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java new file mode 100644 index 00000000..8ee33112 --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -0,0 +1,82 @@ +package gregtechfoodoption.recipe.chain; + +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.ore.OrePrefix; +import gregtech.common.items.MetaItems; +import gregtechfoodoption.GTFOConfig; +import gregtechfoodoption.item.GTFOMetaItem; +import net.minecraft.init.Items; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtech.api.unification.ore.OrePrefix.dustSmall; +import static gregtechfoodoption.GTFOMaterialHandler.*; +import static gregtechfoodoption.item.GTFOMetaItem.*; + +public class FentChain { + public static void init() { + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .notConsumable(OrePrefix.dust, Silver) + .fluidInputs(Oxygen.getFluid(144)) + .fluidInputs(Ethylene.getFluid(144)) + .fluidOutputs(EthyleneOxide.getFluid(144)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(OrePrefix.dust, Aluminium) + .fluidInputs(Ethylene.getFluid(288)) + .fluidOutputs(DiethylEther.getFluid(144)) + .fluidOutputs(Water.getFluid(144)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Benzene.getFluid(144)) + .fluidInputs(Bromine.getFluid(144)) + .fluidOutputs(BromoBenzene.getFluid(144)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(OrePrefix.dust, Magnesium) + .fluidInputs(BromoBenzene.getFluid(144)) + .fluidInputs(DiethylEther.getFluid(144)) + .output(dust, PhenylmagnesiumBromide, 5) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(dustSmall, PhenylmagnesiumBromide) + .fluidInputs(CarbonDioxide.getFluid(144)) + .output(dust, BenzoPhenone, 5) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(dust, Calcite, 5) + .fluidInputs(Water.getFluid(2000)) + .fluidOutputs(Acetylene.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Acetylene.getFluid(144)) + .fluidInputs(Formaldehyde.getFluid(144)) + .fluidOutputs(onefourButynediol.getFluid(288)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .notConsumable(OrePrefix.dust, Silver) + .fluidInputs(Methanol.getFluid(288)) + .fluidInputs(Oxygen.getFluid(288)) + .fluidOutputs(Formaldehyde.getFluid(288)) + .fluidOutputs(Water.getFluid(288)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(onefourButynediol.getFluid(144)) + .fluidInputs(Water.getFluid(144)) + .fluidOutputs(onefourButanediol.getFluid(288)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(onefourButanediol.getFluid(144)) + .notConsumable(OrePrefix.wireGtSingle, Copper) + .fluidOutputs(gammabutyrolacetone.getFluid(144)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Ammonia.getFluid(144)) + .fluidInputs(Methanol.getFluid(144)) + .notConsumable(dust, SiliconDioxide) + .fluidOutputs(Methylamine.getFluid(144)) + .buildAndRegister(); + } + + } \ No newline at end of file From da1c98067a954d083bd430562cc63f053d8b7195 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Wed, 4 Sep 2024 22:07:16 +0100 Subject: [PATCH 02/17] Fent Chain PT1 --- .../java/gregtechfoodoption/CommonProxy.java | 1 + .../GTFOMaterialHandler.java | 63 +++++++++- .../recipe/GTFORecipeAddition.java | 1 + .../recipe/chain/FentChain.java | 119 +++++++++++++++++- 4 files changed, 178 insertions(+), 6 deletions(-) diff --git a/src/main/java/gregtechfoodoption/CommonProxy.java b/src/main/java/gregtechfoodoption/CommonProxy.java index 74486229..b3fdc049 100644 --- a/src/main/java/gregtechfoodoption/CommonProxy.java +++ b/src/main/java/gregtechfoodoption/CommonProxy.java @@ -82,6 +82,7 @@ public void onPostLoad() { "17aaqe0i1q/1/2/3/7/10/")); + if (Loader.isModLoaded(GTFOValues.MODID_NUGT) && GTFOConfig.gtfoOtherFoodModConfig.enableGTFONutrition) { GTFONutritionCompatibility.init(); } diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 5f62cbe5..8df9034f 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -5,11 +5,13 @@ import gregtech.api.fluids.FluidBuilder; import gregtech.api.fluids.attribute.FluidAttribute; import gregtech.api.fluids.attribute.FluidAttributes; +import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.items.metaitem.MetaOreDictItem; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.info.MaterialIconSet; +import gregtech.api.unification.material.properties.FluidProperty; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.util.FluidTooltipUtil; @@ -537,6 +539,61 @@ public class GTFOMaterialHandler { public static final Material Methylamine = fluidBuilderFood(22000, "Methylamine") .color(0xFFFFFF) .build(); + public static final Material NphenethylFourpiperidone = fluidBuilderFood(22001, "NphenethylFourpiperidone") + .color(0xFFFFFF) + .build(); + public static final Material γButyrolactone = fluidBuilderFood(22002, "γButyrolactone") + .color(0xFFFFFF) + .build(); + public static final Material γButyrolactoneammonia = fluidBuilderFood(22003, "γButyrolactoneammonia") + .color(0xFFFFFF) + .build(); + public static final Material cooledγButyrolactoneammonia = fluidBuilderFood(22004, "cooledγButyrolactoneammonia") + .color(0xFFFFFF) + .build(); + public static final Material twoPyrrolidone = fluidBuilderFood(22005, "twoPyrrolidone") + .color(0xFFFFFF) + .build(); + public static final Material aqueoustwoPyrrolidone = fluidBuilderFood(22006, "aqueoustwoPyrrolidone") + .color(0xFFFFFF) + .build(); + public static final Material acidicaqueoustwoPyrrolidone = fluidBuilderFood(22007, "acidicaqueoustwoPyrrolidone") + .color(0xFFFFFF) + .build(); + public static final Material cooledacidicaqueoustwoPyrrolidone = fluidBuilderFood(22008, "cooledacidicaqueoustwoPyrrolidone") + .color(0xFFFFFF) + .build(); + public static final Material fouraminobutyric = fluidBuilderFood(22009, "fouraminobutyric") + .color(0xFFFFFF) + .build(); + public static final Material acidicfouraminobutyric = fluidBuilderFood(22010, "acidicfouraminobutyric") + .color(0xFFFFFF) + .build(); + public static final Material fourpiperidone = fluidBuilderFood(22011, "fourpiperidone") + .color(0xFFFFFF) + .build(); + public static final Material Benzylchloride = fluidBuilderFood(22012, "Benzylchloride") + .color(0xFFFFFF) + .build(); + public static final Material Phenylacetonitrile = fluidBuilderFood(22013, "Phenylacetonitrile") + .color(0xFFFFFF) + .build(); + public static final Material dissolvedPhenylacetonitrile = fluidBuilderFood(22014, "dissolvedPhenylacetonitrile") + .color(0xFFFFFF) + .build(); + public static final Material phenethylamine = fluidBuilderFood(22015, "phenethylamine") + .color(0xFFFFFF) + .build(); + public static final Material crudeNphenethylfourpiperidone = fluidBuilderFood(22016, "crudeNphenethylfourpiperidone") + .color(0xFFFFFF) + .build(); + public static final Material Nphenethylfourpiperidone = fluidBuilderFood(22017, "Nphenethylfourpiperidone") + .color(0xFFFFFF) + .build(); + public static final Material Succinicacid = fluidBuilderFood(22018, "Succinicacid") + .color(0xFFFFFF) + .build(); + @@ -666,7 +723,10 @@ public class GTFOMaterialHandler { .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) .components(Carbon, 13, Hydrogen, 10, Oxygen, 1) .build(); - + public static final Material Maleicanhydride = new Material.Builder(21902, gtfoId("Maleicanhydride")).dust() + .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) + .build(); public static void onMaterialsInit() { Materials.Iron.addFlags(GENERATE_FRAME); @@ -675,6 +735,7 @@ public static void onMaterialsInit() { Materials.StainlessSteel.addFlags(GENERATE_DENSE, GENERATE_SPRING_SMALL); Materials.Titanium.addFlags(GENERATE_DENSE); Materials.Aluminium.addFlags(GENERATE_DENSE); + Bromine.setProperty(PropertyKey.FLUID, new FluidProperty(FluidStorageKeys.LIQUID, new FluidBuilder())); Water.setProperty(FERTILIZER, new FertilizerProperty(5)); Blood.setProperty(FERTILIZER, new FertilizerProperty(30)); diff --git a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java index ed70aa20..c39c1e1e 100644 --- a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java +++ b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java @@ -39,6 +39,7 @@ public static void init() { RussianChain.init(); ChorusChain.init(); SorbetChain.init(); + FentChain.init(); if (Loader.isModLoaded(GTFOValues.MODID_GCYS)) { PopcornChain.init(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 8ee33112..09809a2a 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -1,5 +1,7 @@ package gregtechfoodoption.recipe.chain; +import com.cleanroommc.groovyscript.api.IIngredient; +import gregtech.api.recipes.ingredients.GTRecipeInput; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.common.items.MetaItems; @@ -18,8 +20,7 @@ public class FentChain { public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .notConsumable(OrePrefix.dust, Silver) - .fluidInputs(Oxygen.getFluid(144)) - .fluidInputs(Ethylene.getFluid(144)) + .fluidInputs(Oxygen.getFluid(144), Ethylene.getFluid(144)) .fluidOutputs(EthyleneOxide.getFluid(144)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) @@ -77,6 +78,114 @@ public static void init() { .notConsumable(dust, SiliconDioxide) .fluidOutputs(Methylamine.getFluid(144)) .buildAndRegister(); - } - - } \ No newline at end of file + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(SaltWater.getFluid(12000)) + .fluidInputs(Chlorine.getFluid(12000)) + .notConsumable(SulfuricAcid.getFluid(1000)) + .fluidOutputs(Bromine.getFluid(1000)) + .fluidOutputs(Chlorine.getFluid(12000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(NphenethylFourpiperidone.getFluid(1000)) + .fluidInputs(Chlorine.getFluid(12000)) + .notConsumable(SulfuricAcid.getFluid(1000)) + .fluidOutputs(Bromine.getFluid(1000)) + .fluidOutputs(Chlorine.getFluid(12000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(onefourButanediol.getFluid(1000)) + .fluidInputs(Chlorine.getFluid(1000)) + .fluidOutputs(γButyrolactone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(γButyrolactone.getFluid(1000)) + .fluidInputs(Ammonia.getFluid(1000)) + .fluidOutputs(γButyrolactoneammonia.getFluid(1000)) + .buildAndRegister(); + VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(γButyrolactoneammonia.getFluid(1000)) + .fluidOutputs(cooledγButyrolactoneammonia.getFluid(1000)) + .buildAndRegister(); + DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(cooledγButyrolactoneammonia.getFluid(1000)) + .fluidOutputs(twoPyrrolidone.getFluid(100)) + .buildAndRegister(); + DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(twoPyrrolidone.getFluid(100)) + .fluidInputs(Water.getFluid(1000)) + .fluidOutputs(aqueoustwoPyrrolidone.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(aqueoustwoPyrrolidone.getFluid(100)) + .fluidInputs(HydrochloricAcid.getFluid(1000)) + .fluidOutputs(acidicaqueoustwoPyrrolidone.getFluid(100)) + .buildAndRegister(); + VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(acidicaqueoustwoPyrrolidone.getFluid(1000)) + .fluidOutputs(cooledacidicaqueoustwoPyrrolidone.getFluid(1000)) + .buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(cooledacidicaqueoustwoPyrrolidone.getFluid(100)) + .fluidOutputs(fouraminobutyric.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(fouraminobutyric.getFluid(100)) + .fluidInputs(SulfuricAcid.getFluid(1000)) + .fluidOutputs(acidicfouraminobutyric.getFluid(100)) + .buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(acidicfouraminobutyric.getFluid(100)) + .fluidOutputs(fourpiperidone.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(fouraminobutyric.getFluid(100)) + .fluidInputs(SulfuricAcid.getFluid(1000)) + .fluidOutputs(acidicfouraminobutyric.getFluid(100)) + .buildAndRegister(); + MIXER_RECIPES.recipeBuilder().EUt(8).duration(1000) + .inputs(SodiumCyanide.getItemStack(5)) + .fluidInputs(Benzylchloride.getFluid(1000)) + .fluidOutputs(Phenylacetonitrile.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Benzene.getFluid(1000)) + .fluidInputs(Chlorine.getFluid(1000)) + .fluidOutputs(Benzylchloride.getFluid(2000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Phenylacetonitrile.getFluid(1000)) + .fluidInputs(DiethylEther.getFluid(1000)) + .fluidOutputs(dissolvedPhenylacetonitrile.getFluid(2000)) + .buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(dissolvedPhenylacetonitrile.getFluid(1000)) + .fluidOutputs(phenethylamine.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(phenethylamine.getFluid(1000)) + .fluidInputs(fourpiperidone.getFluid(1000)) + .fluidInputs(Ethanol.getFluid(1000)) + .fluidOutputs(crudeNphenethylfourpiperidone.getFluid(1000)) + .buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(crudeNphenethylfourpiperidone.getFluid(1000)) + .fluidOutputs(Nphenethylfourpiperidone.getFluid(100)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Nphenethylfourpiperidone.getFluid(1000)) + .fluidInputs(fourpiperidone.getFluid(1000)) + .fluidInputs(Ethanol.getFluid(1000)) + .fluidOutputs(crudeNphenethylfourpiperidone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Butene.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(1000)) + .output(dust, Maleicanhydride, 5) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(dust, Maleicanhydride) + .fluidInputs(Oxygen.getFluid(1000)) + .fluidOutputs(Succinicacid.getFluid(1000)) + .buildAndRegister(); + } +} \ No newline at end of file From 8caf2414a7703ed8fae3f8331a011ce05ee41c4d Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Fri, 6 Sep 2024 23:39:10 +0100 Subject: [PATCH 03/17] Fent Chain PT1 --- .../GTFOMaterialHandler.java | 102 +++++++++++++----- .../recipe/chain/FentChain.java | 88 +++++++++++++-- 2 files changed, 153 insertions(+), 37 deletions(-) diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 8df9034f..668e0378 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -512,87 +512,129 @@ public class GTFOMaterialHandler { public static final Material EnergizedCoffee = fluidBuilderFood(21991, "energized_coffee", 368) .color(0x695934) .build(); - public static final Material EthyleneOxide = fluidBuilderFood(21992, "Ethlylene_oxide") + public static final Material EthyleneOxide = fluidBuilder(21992, "Ethlylene_oxide") .color(0xFFFFFF) .build(); - public static final Material DiethylEther = fluidBuilderFood(21993, "Diethyl_Ether") + public static final Material DiethylEther = fluidBuilder(21993, "Diethyl_Ether") .color(0xFFFFFF) .build(); - public static final Material BromoBenzene = fluidBuilderFood(21994, "Bromo_Benzene") + public static final Material BromoBenzene = fluidBuilder(21994, "Bromo_Benzene") .color(0xFFFFE4) .build(); - public static final Material Acetylene = fluidBuilderFood(21995, "Acetylene") + public static final Material Acetylene = fluidBuilder(21995, "Acetylene") .color(0xFFFFFF) .build(); - public static final Material Formaldehyde = fluidBuilderFood(21996, "Formaldehyde") + public static final Material Formaldehyde = fluidBuilder(21996, "Formaldehyde") .color(0x00B140) .build(); - public static final Material onefourButynediol = fluidBuilderFood(21997, "onefourButynediol") + public static final Material onefourButynediol = fluidBuilder(21997, "onefourButynediol") .color(0xFFFFFF) .build(); - public static final Material onefourButanediol = fluidBuilderFood(21998, "onefourButanediol") + public static final Material onefourButanediol = fluidBuilder(21998, "onefourButanediol") .color(0xFFFFFF) .build(); - public static final Material gammabutyrolacetone = fluidBuilderFood(21999, "gammabutyrolacetone") + public static final Material gammabutyrolacetone = fluidBuilder(21999, "gammabutyrolacetone") .color(0xFFFFFF) .build(); - public static final Material Methylamine = fluidBuilderFood(22000, "Methylamine") + public static final Material Methylamine = fluidBuilder(22000, "Methylamine") .color(0xFFFFFF) .build(); - public static final Material NphenethylFourpiperidone = fluidBuilderFood(22001, "NphenethylFourpiperidone") + public static final Material NphenethylFourpiperidone = fluidBuilder(22001, "NphenethylFourpiperidone") .color(0xFFFFFF) .build(); - public static final Material γButyrolactone = fluidBuilderFood(22002, "γButyrolactone") + public static final Material yButyrolactone = fluidBuilder(22002, "γButyrolactone") .color(0xFFFFFF) .build(); - public static final Material γButyrolactoneammonia = fluidBuilderFood(22003, "γButyrolactoneammonia") + public static final Material yButyrolactoneammonia = fluidBuilder(22003, "γButyrolactoneammonia") .color(0xFFFFFF) .build(); - public static final Material cooledγButyrolactoneammonia = fluidBuilderFood(22004, "cooledγButyrolactoneammonia") + public static final Material cooledyButyrolactoneammonia = fluidBuilder(22004, "cooledγButyrolactoneammonia") .color(0xFFFFFF) .build(); - public static final Material twoPyrrolidone = fluidBuilderFood(22005, "twoPyrrolidone") + public static final Material twoPyrrolidone = fluidBuilder(22005, "twoPyrrolidone") .color(0xFFFFFF) .build(); - public static final Material aqueoustwoPyrrolidone = fluidBuilderFood(22006, "aqueoustwoPyrrolidone") + public static final Material aqueoustwoPyrrolidone = fluidBuilder(22006, "aqueoustwoPyrrolidone") .color(0xFFFFFF) .build(); - public static final Material acidicaqueoustwoPyrrolidone = fluidBuilderFood(22007, "acidicaqueoustwoPyrrolidone") + public static final Material acidicaqueoustwoPyrrolidone = fluidBuilder(22007, "acidicaqueoustwoPyrrolidone") .color(0xFFFFFF) .build(); - public static final Material cooledacidicaqueoustwoPyrrolidone = fluidBuilderFood(22008, "cooledacidicaqueoustwoPyrrolidone") + public static final Material cooledacidicaqueoustwoPyrrolidone = fluidBuilder(22008, "cooledacidicaqueoustwoPyrrolidone") .color(0xFFFFFF) .build(); - public static final Material fouraminobutyric = fluidBuilderFood(22009, "fouraminobutyric") + public static final Material fouraminobutyric = fluidBuilder(22009, "fouraminobutyric") .color(0xFFFFFF) .build(); - public static final Material acidicfouraminobutyric = fluidBuilderFood(22010, "acidicfouraminobutyric") + public static final Material acidicfouraminobutyric = fluidBuilder(22010, "acidicfouraminobutyric") .color(0xFFFFFF) .build(); - public static final Material fourpiperidone = fluidBuilderFood(22011, "fourpiperidone") + public static final Material fourpiperidone = fluidBuilder(22011, "fourpiperidone") .color(0xFFFFFF) .build(); - public static final Material Benzylchloride = fluidBuilderFood(22012, "Benzylchloride") + public static final Material Benzylchloride = fluidBuilder(22012, "Benzylchloride") .color(0xFFFFFF) .build(); - public static final Material Phenylacetonitrile = fluidBuilderFood(22013, "Phenylacetonitrile") + public static final Material Phenylacetonitrile = fluidBuilder(22013, "Phenylacetonitrile") .color(0xFFFFFF) .build(); - public static final Material dissolvedPhenylacetonitrile = fluidBuilderFood(22014, "dissolvedPhenylacetonitrile") + public static final Material dissolvedPhenylacetonitrile = fluidBuilder(22014, "dissolvedPhenylacetonitrile") .color(0xFFFFFF) .build(); - public static final Material phenethylamine = fluidBuilderFood(22015, "phenethylamine") + public static final Material phenethylamine = fluidBuilder(22015, "phenethylamine") .color(0xFFFFFF) .build(); - public static final Material crudeNphenethylfourpiperidone = fluidBuilderFood(22016, "crudeNphenethylfourpiperidone") + public static final Material crudeNphenethylfourpiperidone = fluidBuilder(22016, "crudeNphenethylfourpiperidone") .color(0xFFFFFF) .build(); - public static final Material Nphenethylfourpiperidone = fluidBuilderFood(22017, "Nphenethylfourpiperidone") + public static final Material Nphenethylfourpiperidone = fluidBuilder(22017, "Nphenethylfourpiperidone") .color(0xFFFFFF) .build(); - public static final Material Succinicacid = fluidBuilderFood(22018, "Succinicacid") + public static final Material Succinicacid = fluidBuilder(22018, "Succinicacid") .color(0xFFFFFF) .build(); + public static final Material Nchlorosuccinimide = fluidBuilder(22019, "Nchlorosuccinimide") + .color(0xFFFFFF) + .build(); + public static final Material threefourDichlorobenzophenone = fluidBuilder(22020, "threefourDichlorobenzophenone") + .color(0xFFFFFF) + .build(); + public static final Material AmmoniumSuccinate = fluidBuilder(22021, "AmmoniumSuccinate") + .color(0xFFFFFF) + .build(); + public static final Material Succinimide = fluidBuilder(22022, "Succinimide") + .color(0xFFFFFF) + .build(); +//22023 + public static final Material ChlorinatedSuccinimide = fluidBuilder(22024, "ChlorinatedSuccinimide") + .color(0xFFFFFF) + .build(); + public static final Material ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol = fluidBuilder(22025, "ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol") + .color(0xFFFFFF) + .build(); + public static final Material RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride = fluidBuilder(22026, "RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride") + .color(0xFFFFFF) + .build(); + public static final Material Nmethyltwopyrrolidinone = fluidBuilder(22027, "Nmethyltwopyrrolidinone") + .color(0xFFFFFF) + .build(); + public static final Material crudeNmethyltwopyrrolidinone = fluidBuilder(22028, "crudeNmethyltwopyrrolidinone") + .color(0xFFFFFF) + .build(); + public static final Material hotNmethyltwopyrrolidinone = fluidBuilder(22029, "hotNmethyltwopyrrolidinone") + .color(0xFFFFFF) + .build(); + public static final Material cooledNmethyltwopyrrolidinone = fluidBuilder(22030, "cooledNmethyltwopyrrolidinone") + .color(0xFFFFFF) + .build(); + public static final Material Crudefentanyl = fluidBuilder(22031, "Crudefentanyl") + .color(0xFFFFFF) + .build(); + public static final Material UnrefinedFentanyl = fluidBuilder(22032, "UnrefinedFentanyl") + .color(0xFFFFFF) + .build(); + + @@ -723,7 +765,11 @@ public class GTFOMaterialHandler { .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) .components(Carbon, 13, Hydrogen, 10, Oxygen, 1) .build(); - public static final Material Maleicanhydride = new Material.Builder(21902, gtfoId("Maleicanhydride")).dust() + public static final Material Maleicanhydride = new Material.Builder(21903, gtfoId("Maleicanhydride")).dust() + .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) + .build(); + public static final Material RecrystalizedFentanyl = new Material.Builder(21904, gtfoId("RecrystalizedFentanyl")).dust() .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) .build(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 09809a2a..9644edc4 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -20,7 +20,7 @@ public class FentChain { public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .notConsumable(OrePrefix.dust, Silver) - .fluidInputs(Oxygen.getFluid(144), Ethylene.getFluid(144)) + .fluidInputs(Oxygen.getFluid(1000), Ethylene.getFluid(1000)) .fluidOutputs(EthyleneOxide.getFluid(144)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) @@ -86,7 +86,7 @@ public static void init() { .fluidOutputs(Chlorine.getFluid(12000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(NphenethylFourpiperidone.getFluid(1000)) + .fluidInputs(SaltWater.getFluid(1000)) .fluidInputs(Chlorine.getFluid(12000)) .notConsumable(SulfuricAcid.getFluid(1000)) .fluidOutputs(Bromine.getFluid(1000)) @@ -95,22 +95,22 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(onefourButanediol.getFluid(1000)) .fluidInputs(Chlorine.getFluid(1000)) - .fluidOutputs(γButyrolactone.getFluid(1000)) + .fluidOutputs(yButyrolactone.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(γButyrolactone.getFluid(1000)) + .fluidInputs(yButyrolactone.getFluid(1000)) .fluidInputs(Ammonia.getFluid(1000)) - .fluidOutputs(γButyrolactoneammonia.getFluid(1000)) + .fluidOutputs(yButyrolactoneammonia.getFluid(1000)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(γButyrolactoneammonia.getFluid(1000)) - .fluidOutputs(cooledγButyrolactoneammonia.getFluid(1000)) + .fluidInputs(yButyrolactoneammonia.getFluid(1000)) + .fluidOutputs(cooledyButyrolactoneammonia.getFluid(1000)) .buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(cooledγButyrolactoneammonia.getFluid(1000)) + .fluidInputs(cooledyButyrolactoneammonia.getFluid(1000)) .fluidOutputs(twoPyrrolidone.getFluid(100)) .buildAndRegister(); - DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(twoPyrrolidone.getFluid(100)) .fluidInputs(Water.getFluid(1000)) .fluidOutputs(aqueoustwoPyrrolidone.getFluid(100)) @@ -187,5 +187,75 @@ public static void init() { .fluidInputs(Oxygen.getFluid(1000)) .fluidOutputs(Succinicacid.getFluid(1000)) .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(BenzoPhenone.getFluid(1000)) + .fluidInputs(Nchlorosuccinimide.getFluid(1000)) + .notConsumable(Chloroform.getFluid(1000)) + .fluidOutputs(threefourDichlorobenzophenone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Succinicacid.getFluid(1000)) + .fluidInputs(Ammonia.getFluid(1000)) + .fluidOutputs(AmmoniumSuccinate.getFluid(1000)) + .buildAndRegister(); + FLUID_HEATER_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(AmmoniumSuccinate.getFluid(1000)) + .fluidOutputs(Succinimide.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Succinimide.getFluid(1000)) + .fluidInputs(Chlorine.getFluid(1000)) + .fluidOutputs(ChlorinatedSuccinimide.getFluid(1000)) + .fluidOutputs(DilutedHydrochloricAcid.getFluid(1000)) + .buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(ChlorinatedSuccinimide.getFluid(1000)) + .fluidOutputs(Nchlorosuccinimide.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Nchlorosuccinimide.getFluid(1000)) + .fluidInputs(Nphenethylfourpiperidone.getFluid(1000)) + .notConsumable(dust, Aluminium) + .fluidOutputs(ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol.getFluid(1000)) + .fluidInputs(Nmethyltwopyrrolidinone.getFluid(1000)).notConsumable(dust, Aluminium) + .fluidOutputs(RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(gammabutyrolacetone.getFluid(1000)) + .fluidInputs(Methylamine.getFluid(1000)) + .fluidOutputs(crudeNmethyltwopyrrolidinone.getFluid(1000)) + .buildAndRegister(); + FLUID_HEATER_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(crudeNmethyltwopyrrolidinone.getFluid(1000)) + .fluidOutputs(hotNmethyltwopyrrolidinone.getFluid(1000)) + .buildAndRegister(); + VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(hotNmethyltwopyrrolidinone.getFluid(1000)) + .fluidOutputs(cooledNmethyltwopyrrolidinone.getFluid(100)) + .buildAndRegister(); + DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(cooledNmethyltwopyrrolidinone.getFluid(1000)) + .fluidOutputs(Nmethyltwopyrrolidinone.getFluid(100)) + .fluidOutputs(Methylamine.getFluid(400)) + .fluidOutputs(Ammonia.getFluid(400)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride.getFluid(1000)) + .fluidOutputs(Chloroform.getFluid(100)) + .fluidOutputs(Crudefentanyl.getFluid(1000)) + .buildAndRegister(); + VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Crudefentanyl.getFluid(1000)) + .fluidOutputs(UnrefinedFentanyl.getFluid(100)) + .buildAndRegister(); + AUTOCLAVE_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(UnrefinedFentanyl.getFluid(1000)) + .output(dust, RecrystalizedFentanyl, 10) + .buildAndRegister(); + + } } \ No newline at end of file From 468e5df769b337542849a9954ed88285994780bf Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Fri, 6 Sep 2024 23:49:29 +0100 Subject: [PATCH 04/17] Fent Chain PT1 --- src/main/java/gregtechfoodoption/recipe/chain/FentChain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 9644edc4..73468e7a 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -188,7 +188,7 @@ public static void init() { .fluidOutputs(Succinicacid.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(BenzoPhenone.getFluid(1000)) + .input(dust, BenzoPhenone, 5) .fluidInputs(Nchlorosuccinimide.getFluid(1000)) .notConsumable(Chloroform.getFluid(1000)) .fluidOutputs(threefourDichlorobenzophenone.getFluid(1000)) From e21f80af222ce391c4d96053715feeb4e89c59cf Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Fri, 6 Sep 2024 23:51:25 +0100 Subject: [PATCH 05/17] Fent Chain PT1 --- .../java/gregtechfoodoption/recipe/chain/FentChain.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 73468e7a..c387ec88 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -30,9 +30,9 @@ public static void init() { .fluidOutputs(Water.getFluid(144)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Benzene.getFluid(144)) - .fluidInputs(Bromine.getFluid(144)) - .fluidOutputs(BromoBenzene.getFluid(144)) + .fluidInputs(Benzene.getFluid(1000)) + .fluidInputs(Bromine.getFluid(1000)) + .fluidOutputs(BromoBenzene.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(OrePrefix.dust, Magnesium) From 4b306aca1e65c7e85eff529f45a9949def43c8f2 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Mon, 9 Sep 2024 19:08:10 +0100 Subject: [PATCH 06/17] Fent Chain PT2 --- src/main/java/gregtechfoodoption/GTFOMaterialHandler.java | 2 +- src/main/java/gregtechfoodoption/recipe/chain/FentChain.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 668e0378..7fc61815 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -771,7 +771,7 @@ public class GTFOMaterialHandler { .build(); public static final Material RecrystalizedFentanyl = new Material.Builder(21904, gtfoId("RecrystalizedFentanyl")).dust() .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) - .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) + .components(Carbon, 22, Hydrogen, 28, Oxygen, 1, Nitrogen, 2) .build(); public static void onMaterialsInit() { diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index c387ec88..91af738b 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -32,6 +32,7 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Benzene.getFluid(1000)) .fluidInputs(Bromine.getFluid(1000)) + .notConsumable(OrePrefix.dust, Aluminium) .fluidOutputs(BromoBenzene.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) From 0fd711f5220e35e3ca8d35d103d961a0fabc5d37 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Wed, 11 Sep 2024 15:31:55 +0100 Subject: [PATCH 07/17] Fent Chain PT3 --- .../java/gregtechfoodoption/CommonProxy.java | 8 ++- .../potion/GTFOPotions.java | 1 + .../potion/asphyxiationpotion.java | 59 +++++++++++++++++++ .../recipe/chain/CapletChain.java | 9 +++ .../recipe/chain/FentChain.java | 14 ++--- .../utils/GTFODamageSources.java | 1 + .../assets/gregtechfoodoption/lang/en_us.lang | 6 ++ 7 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 src/main/java/gregtechfoodoption/potion/asphyxiationpotion.java diff --git a/src/main/java/gregtechfoodoption/CommonProxy.java b/src/main/java/gregtechfoodoption/CommonProxy.java index 5acc869e..884e6681 100644 --- a/src/main/java/gregtechfoodoption/CommonProxy.java +++ b/src/main/java/gregtechfoodoption/CommonProxy.java @@ -47,6 +47,8 @@ import java.util.Objects; import java.util.function.Function; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtechfoodoption.GTFOMaterialHandler.RecrystalizedFentanyl; import static gregtechfoodoption.block.GTFOCrop.CROP_BLOCKS; @Mod.EventBusSubscriber(modid = GregTechFoodOption.MODID) @@ -77,10 +79,12 @@ public void onPostLoad() { LacingEntry.LACING_REGISTRY.register(1, "antischizo", new LacingEntry(GTFOMaterialHandler.LithiumCarbonate.getItemStack(), new PotionEffect(AntiSchizoPotion.INSTANCE, 1000, 0), "14hez98zk7/2/3/5/9/10/")); - LacingEntry.LACING_REGISTRY.register(2, "lungcancer", new LacingEntry(OreDictUnifier.get(OrePrefix.dust, Materials.Asbestos), + LacingEntry.LACING_REGISTRY.register(2, "lungcancer", new LacingEntry(OreDictUnifier.get(dust, Materials.Asbestos), new PotionEffect(LungCancerPotion.INSTANCE, 99999999, 0), "17aaqe0i1q/1/2/3/7/10/")); - + LacingEntry.LACING_REGISTRY.register(3, "asphyxiation", new LacingEntry(OreDictUnifier.get(dust, RecrystalizedFentanyl), + new PotionEffect(asphyxiationpotion.INSTANCE, 100, 0), + "fsdfdss/1/")); if (Loader.isModLoaded(GTFOValues.MODID_NUGT) && GTFOConfig.gtfoOtherFoodModConfig.enableGTFONutrition) { diff --git a/src/main/java/gregtechfoodoption/potion/GTFOPotions.java b/src/main/java/gregtechfoodoption/potion/GTFOPotions.java index f0b3cd95..6adb9c83 100644 --- a/src/main/java/gregtechfoodoption/potion/GTFOPotions.java +++ b/src/main/java/gregtechfoodoption/potion/GTFOPotions.java @@ -26,6 +26,7 @@ public static void initPotionInstances() new PotionLengthenerPotion(); new AntiSchizoPotion(); new LungCancerPotion(); + new asphyxiationpotion(); new EnhancedChorusPotion(); } diff --git a/src/main/java/gregtechfoodoption/potion/asphyxiationpotion.java b/src/main/java/gregtechfoodoption/potion/asphyxiationpotion.java new file mode 100644 index 00000000..7e3ceda7 --- /dev/null +++ b/src/main/java/gregtechfoodoption/potion/asphyxiationpotion.java @@ -0,0 +1,59 @@ +package gregtechfoodoption.potion; + +import gregtechfoodoption.utils.GTFODamageSources; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.text.TextComponentTranslation; + +import java.util.Collections; +import java.util.List; + +public class asphyxiationpotion extends GTFOPotion { + public static final String TAG_NAME = "gregtechfoodoption - asphyxiation"; + public static asphyxiationpotion INSTANCE = null; + public asphyxiationpotion() { + super("asphyxiation", true, 0xffffff, 0); + INSTANCE = this; + } + + @Override + public boolean isReady(int duration, int amplifier) { + return true; + } + + @Override + public void performEffect(EntityLivingBase entity, int amplifier) { + int phase = entity.getActivePotionEffect(this).getDuration(); + + if (phase == 80) { + if (entity.world.isRemote) + entity.sendMessage(new TextComponentTranslation("gregtechfoodoption.asphyxiation.1")); + entity.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 9)); + entity.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 1000, 9)); + entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 1000, 9)); + } else if (phase == 20) { + entity.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 1000, 0)); + } else if (phase < 80 && phase % 5 == 0) { + entity.attackEntityFrom(GTFODamageSources.ASPHYXIATION, (float) Math.pow((double) (200 - phase) / 80, 2)); + entity.hurtResistantTime = 0; + //the dmg calc is subject to change + } + } + + @Override + protected boolean canRender() { + return false; + } + + @Override + public boolean shouldRender(PotionEffect effect) { + return false; + } + + @Override + public List getCurativeItems() { + return Collections.emptyList(); // Nothing :) + } +} diff --git a/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java b/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java index b866de1f..b7d3cefd 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java @@ -101,5 +101,14 @@ public static void init() { .inputs(CAPLET_CAP.getStackForm()) .outputs(VIBRANT_CAPLET.getStackForm()) .buildAndRegister(); + /* + // Fent + CANNER_RECIPES.recipeBuilder().EUt(30).duration(200) + .inputs(CAPLET_BODY.getStackForm()) + .input(dust, RecrystalizedFentanyl, 1) + .inputs(CAPLET_CAP.getStackForm()) + .outputs(FENT_CAPLET.getStackForm()) + .buildAndRegister(); + */ } } \ No newline at end of file diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 91af738b..209ddf80 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -25,9 +25,9 @@ public static void init() { .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(OrePrefix.dust, Aluminium) - .fluidInputs(Ethylene.getFluid(288)) - .fluidOutputs(DiethylEther.getFluid(144)) - .fluidOutputs(Water.getFluid(144)) + .fluidInputs(Ethanol.getFluid(2000)) + .fluidOutputs(DiethylEther.getFluid(1000)) + .fluidOutputs(Water.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Benzene.getFluid(1000)) @@ -58,10 +58,10 @@ public static void init() { .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .notConsumable(OrePrefix.dust, Silver) - .fluidInputs(Methanol.getFluid(288)) - .fluidInputs(Oxygen.getFluid(288)) - .fluidOutputs(Formaldehyde.getFluid(288)) - .fluidOutputs(Water.getFluid(288)) + .fluidInputs(Methanol.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(1000)) + .fluidOutputs(Formaldehyde.getFluid(1000)) + .fluidOutputs(Water.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(onefourButynediol.getFluid(144)) diff --git a/src/main/java/gregtechfoodoption/utils/GTFODamageSources.java b/src/main/java/gregtechfoodoption/utils/GTFODamageSources.java index 312e357b..d9bdf49b 100644 --- a/src/main/java/gregtechfoodoption/utils/GTFODamageSources.java +++ b/src/main/java/gregtechfoodoption/utils/GTFODamageSources.java @@ -6,6 +6,7 @@ import net.minecraftforge.common.util.FakePlayer; public class GTFODamageSources { + public static final DamageSource ASPHYXIATION = new DamageSource("asphyxiation").setDamageBypassesArmor();; public static FakePlayer EXTERMINATOR; public static final DamageSource EXTRACTION = new DamageSource("extraction").setDamageBypassesArmor(); public static final DamageSource CYANIDE = new DamageSource("cyanide").setDamageBypassesArmor(); diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index c62bc7cd..12f7d5a6 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -689,6 +689,7 @@ death.attack.extermination=%s was exterminated death.attack.extraction=%s's internal organs were harvested death.attack.cyanide=%s smelled some almonds death.attack.lung_cancer=%s died of lung cancer +death.attack.asphyxiation=%s Was a victim of the opioid epidemic... gregtechfoodoption.machine.mob_exterminator.tooltip.warning=§cThis can easily kill You as well! # Farmer @@ -882,6 +883,7 @@ gregtechfoodoption.fluid.lacing=§2Can be used to lace items with 100 mB in the gregtechfoodoption.cyanide.1=§cYou feel really nauseous... gregtechfoodoption.cyanide.2=§cYou can't breathe anymore... gregtechfoodoption.cyanide.3=§cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +gregtechfoodoption.asphyxiation.1=§l§4Officer I can't breathe metaitem.food.gel_caplet.name=Gel Caplet metaitem.food.gel_caplet.tooltip=For performing Placebo-controlled Tests on Cyanide Poisoning metaitem.component.caplet_cap.name=Caplet Cap @@ -1109,6 +1111,7 @@ gregtechfoodoption.lacing.info.2=Lasts %s ticks gregtechfoodoption.potion.cyanidepoisoning=Cyanide Poisoning gregtechfoodoption.potion.antischizo=Schizophrenia Meds gregtechfoodoption.potion.lungcancer=Lung Cancer +gregtechfoodoption.potion.asphyxiation=Asphyxiation eating.output.name=Eating Recipe metaitem.component.pelmeni_uncooked.name=Uncooked Pelmeni @@ -1230,3 +1233,6 @@ gregtech.material.gtfo_antaf=Antaf gregtech.material.gtfo_vibrant_extract=Vibrant Extract gregtech.material.gtfo_apricot_extract=Apricot Extract gregtech.material.gtfo_grape_extract=Grape Extract + +//Fent shit +gregtech.material.recrystalizedfentanyl=Fentanyl \ No newline at end of file From 778ab50b9207c15a0cb47d3913f75e63ce5a060e Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Wed, 11 Sep 2024 15:34:41 +0100 Subject: [PATCH 08/17] remove the joke to edgy for mc --- src/main/resources/assets/gregtechfoodoption/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index 12f7d5a6..9a6deab7 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -883,7 +883,7 @@ gregtechfoodoption.fluid.lacing=§2Can be used to lace items with 100 mB in the gregtechfoodoption.cyanide.1=§cYou feel really nauseous... gregtechfoodoption.cyanide.2=§cYou can't breathe anymore... gregtechfoodoption.cyanide.3=§cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -gregtechfoodoption.asphyxiation.1=§l§4Officer I can't breathe +gregtechfoodoption.asphyxiation.1=§4You feel a shortage of Oxygen metaitem.food.gel_caplet.name=Gel Caplet metaitem.food.gel_caplet.tooltip=For performing Placebo-controlled Tests on Cyanide Poisoning metaitem.component.caplet_cap.name=Caplet Cap From a49d70531de6d97e311c952edfa20556a0c0f3f0 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Wed, 11 Sep 2024 19:10:43 +0100 Subject: [PATCH 09/17] Fixed bugs + Finished fent lang --- .../GTFOMaterialHandler.java | 16 +++--- .../recipe/chain/FentChain.java | 27 ++++++---- .../assets/gregtechfoodoption/lang/en_us.lang | 51 ++++++++++++++++++- 3 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 7fc61815..9dc96ff7 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -512,9 +512,6 @@ public class GTFOMaterialHandler { public static final Material EnergizedCoffee = fluidBuilderFood(21991, "energized_coffee", 368) .color(0x695934) .build(); - public static final Material EthyleneOxide = fluidBuilder(21992, "Ethlylene_oxide") - .color(0xFFFFFF) - .build(); public static final Material DiethylEther = fluidBuilder(21993, "Diethyl_Ether") .color(0xFFFFFF) .build(); @@ -533,15 +530,9 @@ public class GTFOMaterialHandler { public static final Material onefourButanediol = fluidBuilder(21998, "onefourButanediol") .color(0xFFFFFF) .build(); - public static final Material gammabutyrolacetone = fluidBuilder(21999, "gammabutyrolacetone") - .color(0xFFFFFF) - .build(); public static final Material Methylamine = fluidBuilder(22000, "Methylamine") .color(0xFFFFFF) .build(); - public static final Material NphenethylFourpiperidone = fluidBuilder(22001, "NphenethylFourpiperidone") - .color(0xFFFFFF) - .build(); public static final Material yButyrolactone = fluidBuilder(22002, "γButyrolactone") .color(0xFFFFFF) .build(); @@ -633,6 +624,9 @@ public class GTFOMaterialHandler { public static final Material UnrefinedFentanyl = fluidBuilder(22032, "UnrefinedFentanyl") .color(0xFFFFFF) .build(); + public static final Material Nphenethylfourpiperidoneintermediate = fluidBuilder(22033, "Nphenethylfourpiperidoneintermediate") + .color(0xFFFFFF) + .build(); @@ -773,6 +767,10 @@ public class GTFOMaterialHandler { .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) .components(Carbon, 22, Hydrogen, 28, Oxygen, 1, Nitrogen, 2) .build(); + public static final Material sodiumborohydride = new Material.Builder(21905, gtfoId("sodiumborohydride")).dust() + .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + .components(Sodium, 1, Hydrogen, 4, Boron, 1) + .build(); public static void onMaterialsInit() { Materials.Iron.addFlags(GENERATE_FRAME); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java index 209ddf80..936cdd8b 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java @@ -18,11 +18,6 @@ public class FentChain { public static void init() { - CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .notConsumable(OrePrefix.dust, Silver) - .fluidInputs(Oxygen.getFluid(1000), Ethylene.getFluid(1000)) - .fluidOutputs(EthyleneOxide.getFluid(144)) - .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(OrePrefix.dust, Aluminium) .fluidInputs(Ethanol.getFluid(2000)) @@ -71,7 +66,7 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(onefourButanediol.getFluid(144)) .notConsumable(OrePrefix.wireGtSingle, Copper) - .fluidOutputs(gammabutyrolacetone.getFluid(144)) + .fluidOutputs(yButyrolactone.getFluid(144)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Ammonia.getFluid(144)) @@ -173,10 +168,22 @@ public static void init() { .fluidOutputs(Nphenethylfourpiperidone.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Nphenethylfourpiperidone.getFluid(1000)) + .fluidInputs(phenethylamine.getFluid(1000)) .fluidInputs(fourpiperidone.getFluid(1000)) .fluidInputs(Ethanol.getFluid(1000)) - .fluidOutputs(crudeNphenethylfourpiperidone.getFluid(1000)) + .fluidOutputs(Nphenethylfourpiperidoneintermediate.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .fluidInputs(Nphenethylfourpiperidoneintermediate.getFluid(1000)) + .input(dust, sodiumborohydride) + .fluidInputs(Ethanol.getFluid(1000)) + .fluidOutputs(Nphenethylfourpiperidone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) + .input(dust, Sodium, 16) + .input(dust, Borax) + .fluidInputs(Hydrogen.getFluid(16000)) + .output(dust, sodiumborohydride, 4) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Butene.getFluid(1000)) @@ -214,7 +221,7 @@ public static void init() { .fluidOutputs(Nchlorosuccinimide.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Nchlorosuccinimide.getFluid(1000)) + .fluidInputs(threefourDichlorobenzophenone.getFluid(1000)) .fluidInputs(Nphenethylfourpiperidone.getFluid(1000)) .notConsumable(dust, Aluminium) .fluidOutputs(ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol.getFluid(1000)) @@ -225,7 +232,7 @@ public static void init() { .fluidOutputs(RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(gammabutyrolacetone.getFluid(1000)) + .fluidInputs(yButyrolactone.getFluid(1000)) .fluidInputs(Methylamine.getFluid(1000)) .fluidOutputs(crudeNmethyltwopyrrolidinone.getFluid(1000)) .buildAndRegister(); diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index 9a6deab7..dbef52e7 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -1235,4 +1235,53 @@ gregtech.material.gtfo_apricot_extract=Apricot Extract gregtech.material.gtfo_grape_extract=Grape Extract //Fent shit -gregtech.material.recrystalizedfentanyl=Fentanyl \ No newline at end of file +gregtech.material.recrystalizedfentanyl=Fentanyl +gregtech.material.maleicanhydride=Maleic Anhydride +gregtech.material.benzo_phenone=BenzoPhenone +gregtech.material.phenylmagnesium_bromide=PhenylMagnesium Bromide +gregtech.material.sodiumborohydride=Sodium Borohydride +gregtech.material.gtfo_formaldehyde=Formaldehyde +gregtech.material.gtfo_ethylene_oxide=Ethylene Oxide +gregtech.material.gtfo_diethyl_ether=Diethyl Ether +gregtech.material.gtfo_bromo_benzene=Bromo Benzene +gregtech.material.gtfo_acetylene=Acetylene +gregtech.material.gtfo_crudefentanyl=Crude Fentanyl +gregtech.material.gtfo_unrefinedfentanyl=Unrefined Fentanyl +gregtech.material.gtfo_threefourchlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol=3-(4-Chlorobenzoyl)-4-(4-chlorophenyl)-1-phenethylpiperidin-4-ol +gregtech.material.gtfo_rnthreeaminopropylnonethreebenzylsevenchlorofouroxofourhchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride=(R)-N-(3-aminopropyl)-N-(1-(3-benzyl-7-chloro-4-oxo-4H-chromen-2-yl)-2-methylpropyl)-4-methylbenzamide hydrochloride +gregtech.material.gtfo_onefourbutynediol=1-4 Butynediol +gregtech.material.gtfo_onefourbutanediol=1-4 Butanediol +gregtech.material.gtfo_gammabutyrolacetone=Gamma-ButyrolAcetone +gregtech.material.gtfo_methylamine=Methylamine +gregtech.material.gtfo_nphenethylfourpiperidone=N-Phenethyl-4-Piperidone +gregtech.material.gtfo_γbutyrolactone=γ-Butyrolactone +gregtech.material.gtfo_γbutyrolactoneammonia=γ=Butyrolactone Ammonia +gregtech.material.gtfo_cooledγbutyrolactoneammonia=Cooled γ-Butyrolactone Ammonia +gregtech.material.gtfo_twopyrrolidone=2-Pyrrolidone +gregtech.material.gtfo_aqueoustwopyrrolidone=Aqueous 2-Pyrrolidone +gregtech.material.gtfo_acidicaqueoustwopyrrolidone=Acidic Aqueous 2-Pyrrolidone +gregtech.material.gtfo_cooledacidicaqueoustwopyrrolidone=Cooled Acidic Aqueous 2-Pyrrolidone +gregtech.material.gtfo_fouraminobutyric=4-Aminobutyric +gregtech.material.gtfo_acidicfouraminobutyric=Acidic 4-Aminobutyric +gregtech.material.gtfo_fourpiperidone=4-Piperidone +gregtech.material.gtfo_benzylchloride=Benzylchloride +gregtech.material.gtfo_phenylacetonitrile=Phenylacetonitrile +gregtech.material.gtfo_dissolvedphenylacetonitrile=Dissolved Phenylacetonitrile +gregtech.material.gtfo_phenethylamine=Phenethylamine +gregtech.material.gtfo_crudenphenethylfourpiperidone=Crude N-Phenethyl-4-piperidone +gregtech.material.gtfo_succinicacid=Succinic Acid +gregtech.material.gtfo_nchlorosuccinimide=N-Chlorosuccinimide +gregtech.material.gtfo_threefourdichlorobenzophenone=3-4-Dichlorobenzophenone +gregtech.material.gtfo_ammoniumsuccinate=Ammonium Succinate +gregtech.material.gtfo_succinimide=Succinimide +gregtech.material.gtfo_chlorinatedsuccinimide=Chlorinated Succinimide +gregtech.material.gtfo_nmethyltwopyrrolidinone=N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_crudenmethyltwopyrrolidinone=Crude N-Methyl-2-pyrrolidinone +gregtech.material.gtfo_hotnmethyltwopyrrolidinone=Hot N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_coolednmethyltwopyrrolidinone=Cooled N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_nphenethylfourpiperidoneintermediate=N-Phenethyl-4-piperidone Intermediate + + + + + From 5329af017c963ea0c6a181b9a1fb8653fc9673c0 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:44:33 -0500 Subject: [PATCH 10/17] fix: name and formatting --- gradle.properties | 2 +- .../java/gregtechfoodoption/CommonProxy.java | 4 +- .../GTFOMaterialHandler.java | 177 +++++++++--------- .../recipe/GTFORecipeAddition.java | 2 +- .../recipe/chain/CapletChain.java | 2 +- .../{FentChain.java => LurdmanineChain.java} | 161 ++++++++-------- .../assets/gregtechfoodoption/lang/en_us.lang | 73 ++++---- 7 files changed, 209 insertions(+), 212 deletions(-) rename src/main/java/gregtechfoodoption/recipe/chain/{FentChain.java => LurdmanineChain.java} (63%) diff --git a/gradle.properties b/gradle.properties index 3f874bc4..aa67fcb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ modId = gregtechfoodoption modGroup = gregtechfoodoption -modVersion = 1.11.3 +modVersion = 1.11.4 # The name of your jar when you produce builds, not including any versioning info modArchivesBaseName = gregtechfoodoption diff --git a/src/main/java/gregtechfoodoption/CommonProxy.java b/src/main/java/gregtechfoodoption/CommonProxy.java index 884e6681..c823f173 100644 --- a/src/main/java/gregtechfoodoption/CommonProxy.java +++ b/src/main/java/gregtechfoodoption/CommonProxy.java @@ -48,7 +48,7 @@ import java.util.function.Function; import static gregtech.api.unification.ore.OrePrefix.dust; -import static gregtechfoodoption.GTFOMaterialHandler.RecrystalizedFentanyl; +import static gregtechfoodoption.GTFOMaterialHandler.RecrystalizedLurdmanine; import static gregtechfoodoption.block.GTFOCrop.CROP_BLOCKS; @Mod.EventBusSubscriber(modid = GregTechFoodOption.MODID) @@ -82,7 +82,7 @@ public void onPostLoad() { LacingEntry.LACING_REGISTRY.register(2, "lungcancer", new LacingEntry(OreDictUnifier.get(dust, Materials.Asbestos), new PotionEffect(LungCancerPotion.INSTANCE, 99999999, 0), "17aaqe0i1q/1/2/3/7/10/")); - LacingEntry.LACING_REGISTRY.register(3, "asphyxiation", new LacingEntry(OreDictUnifier.get(dust, RecrystalizedFentanyl), + LacingEntry.LACING_REGISTRY.register(3, "asphyxiation", new LacingEntry(OreDictUnifier.get(dust, RecrystalizedLurdmanine), new PotionEffect(asphyxiationpotion.INSTANCE, 100, 0), "fsdfdss/1/")); diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 9dc96ff7..302ba2cd 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -23,8 +23,6 @@ import gregtechfoodoption.materials.LacingProperty; import it.unimi.dsi.fastutil.ints.Int2BooleanArrayMap; import it.unimi.dsi.fastutil.ints.Int2BooleanMap; -import it.unimi.dsi.fastutil.objects.Object2BooleanMap; -import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; import net.minecraft.util.ResourceLocation; import java.util.Collections; @@ -512,120 +510,127 @@ public class GTFOMaterialHandler { public static final Material EnergizedCoffee = fluidBuilderFood(21991, "energized_coffee", 368) .color(0x695934) .build(); - public static final Material DiethylEther = fluidBuilder(21993, "Diethyl_Ether") - .color(0xFFFFFF) + public static final Material DiethylEther = fluidBuilder(21993, "diethyl_ether") + .color(0xF1F2A2) .build(); - public static final Material BromoBenzene = fluidBuilder(21994, "Bromo_Benzene") - .color(0xFFFFE4) + public static final Material Bromobenzene = fluidBuilder(21994, "bromobenzene") + .color(0xF1F0F3) .build(); - public static final Material Acetylene = fluidBuilder(21995, "Acetylene") - .color(0xFFFFFF) + public static final Material Acetylene = fluidBuilder(21995, "acetylene") + .components(Carbon, 2, Hydrogen, 2) + .color(0xF1F7DD) .build(); - public static final Material Formaldehyde = fluidBuilder(21996, "Formaldehyde") + public static final Material Formaldehyde = fluidBuilder(21996, "formaldehyde") + .components(Carbon, 1, Hydrogen, 2, Oxygen, 1) .color(0x00B140) .build(); - public static final Material onefourButynediol = fluidBuilder(21997, "onefourButynediol") - .color(0xFFFFFF) + public static final Material I_IVButynediol = fluidBuilder(21997, "i_iv_butynediol") + .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + .color(0xF0FE8A) .build(); - public static final Material onefourButanediol = fluidBuilder(21998, "onefourButanediol") - .color(0xFFFFFF) + public static final Material I_IVButanediol = fluidBuilder(21998, "i_iv_butanediol") + .components(Carbon, 4, Hydrogen, 10, Oxygen, 2) + .color(0xF4FCFC) .build(); - public static final Material Methylamine = fluidBuilder(22000, "Methylamine") - .color(0xFFFFFF) + public static final Material Methylamine = fluidBuilder(22000, "methylamine") + .components(Carbon, 1, Nitrogen, 1, Hydrogen, 5) + .color(0xF0F5C2) .build(); - public static final Material yButyrolactone = fluidBuilder(22002, "γButyrolactone") - .color(0xFFFFFF) + public static final Material GammaButyrolactone = fluidBuilder(22002, "gamma_butyrolactone") + .color(0xF4FB91) .build(); - public static final Material yButyrolactoneammonia = fluidBuilder(22003, "γButyrolactoneammonia") - .color(0xFFFFFF) + public static final Material AmmoniumGammaButyrolactone = fluidBuilder(22003, "ammonium_gamma_butyrolactone") + .color(0xFAF29C) .build(); - public static final Material cooledyButyrolactoneammonia = fluidBuilder(22004, "cooledγButyrolactoneammonia") - .color(0xFFFFFF) + public static final Material CooledAmmoniumGammaButyrolactone = fluidBuilder(22004, "cooled_ammonium_gamma_butyrolactone") + .color(0xF9FCC2) .build(); - public static final Material twoPyrrolidone = fluidBuilder(22005, "twoPyrrolidone") - .color(0xFFFFFF) + public static final Material IIPyrrolidone = fluidBuilder(22005, "ii_pyrrolidone") + .color(0xF9F1B3) .build(); - public static final Material aqueoustwoPyrrolidone = fluidBuilder(22006, "aqueoustwoPyrrolidone") - .color(0xFFFFFF) + public static final Material AqueousIIPyrrolidone = fluidBuilder(22006, "aqueous_ii_pyrrolidone") + .color(0xF2F98E) .build(); - public static final Material acidicaqueoustwoPyrrolidone = fluidBuilder(22007, "acidicaqueoustwoPyrrolidone") - .color(0xFFFFFF) + public static final Material AcidicAqueousIIPyrrolidone = fluidBuilder(22007, "acidic_aqueous_ii_pyrrolidone") + .color(0xF6FDE2) .build(); - public static final Material cooledacidicaqueoustwoPyrrolidone = fluidBuilder(22008, "cooledacidicaqueoustwoPyrrolidone") - .color(0xFFFFFF) + public static final Material CooledAcidicAqueousIIPyrrolidone = fluidBuilder(22008, "cooled_acidic_aqueous_ii_pyrrolidone") + .color(0xF7FAF9) .build(); - public static final Material fouraminobutyric = fluidBuilder(22009, "fouraminobutyric") - .color(0xFFFFFF) + public static final Material IVAminoButyricAcid = fluidBuilder(22009, "iv_aminobutyric_acid") + .color(0xF4FAAA) .build(); - public static final Material acidicfouraminobutyric = fluidBuilder(22010, "acidicfouraminobutyric") - .color(0xFFFFFF) + public static final Material AcidicIVAminoButyricAcidSolution = fluidBuilder(22010, "acidic_iv_amino_butyric_acid_solution") + .color(0xFCFB8F) .build(); - public static final Material fourpiperidone = fluidBuilder(22011, "fourpiperidone") - .color(0xFFFFFF) + public static final Material IVPiperidone = fluidBuilder(22011, "iv_piperidone") + .color(0xFEFDCA) .build(); - public static final Material Benzylchloride = fluidBuilder(22012, "Benzylchloride") - .color(0xFFFFFF) + public static final Material BenzylChloride = fluidBuilder(22012, "benzyl_chloride") + .components(Carbon, 7, Hydrogen, 7, Chlorine, 1) + .color(0xF3F9BE) .build(); - public static final Material Phenylacetonitrile = fluidBuilder(22013, "Phenylacetonitrile") - .color(0xFFFFFF) + public static final Material Phenylacetonitrile = fluidBuilder(22013, "phenylacetonitrile") + .color(0xF0F0CC) .build(); - public static final Material dissolvedPhenylacetonitrile = fluidBuilder(22014, "dissolvedPhenylacetonitrile") - .color(0xFFFFFF) + public static final Material DissolvedPhenylacetonitrile = fluidBuilder(22014, "dissolved_phenylacetonitrile") + .color(0xF0F9E3) .build(); - public static final Material phenethylamine = fluidBuilder(22015, "phenethylamine") - .color(0xFFFFFF) + public static final Material Phenethylamine = fluidBuilder(22015, "phenethylamine") + .color(0xF3FEF1) .build(); - public static final Material crudeNphenethylfourpiperidone = fluidBuilder(22016, "crudeNphenethylfourpiperidone") - .color(0xFFFFFF) + public static final Material CrudeNPhenethylIVPiperidone = fluidBuilder(22016, "crude_n_phenethyl_iv_piperidone") + .color(0xF7F58B) .build(); - public static final Material Nphenethylfourpiperidone = fluidBuilder(22017, "Nphenethylfourpiperidone") - .color(0xFFFFFF) + public static final Material NPhenethylIVPiperidone = fluidBuilder(22017, "n_phenethyl_iv_piperidone") + .color(0xFDF283) .build(); - public static final Material Succinicacid = fluidBuilder(22018, "Succinicacid") - .color(0xFFFFFF) + public static final Material SuccinicAcid = fluidBuilder(22018, "succinic_acid") + .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + .color(0xFFF7A9) .build(); - public static final Material Nchlorosuccinimide = fluidBuilder(22019, "Nchlorosuccinimide") - .color(0xFFFFFF) + public static final Material NChlorosuccinimide = fluidBuilder(22019, "n_chlorosuccinimide") + .color(0xF9F7F2) .build(); - public static final Material threefourDichlorobenzophenone = fluidBuilder(22020, "threefourDichlorobenzophenone") - .color(0xFFFFFF) + public static final Material III_IVDichlorobenzophenone = fluidBuilder(22020, "iii_iv_dichlorobenzophenone") + .color(0xFAFED0) .build(); - public static final Material AmmoniumSuccinate = fluidBuilder(22021, "AmmoniumSuccinate") - .color(0xFFFFFF) + public static final Material AmmoniumSuccinate = fluidBuilder(22021, "ammonium_succinate") + .color(0xD3DAAC) .build(); - public static final Material Succinimide = fluidBuilder(22022, "Succinimide") - .color(0xFFFFFF) + public static final Material Succinimide = fluidBuilder(22022, "succinimide") + .color(0xC9D39C) .build(); //22023 - public static final Material ChlorinatedSuccinimide = fluidBuilder(22024, "ChlorinatedSuccinimide") - .color(0xFFFFFF) + public static final Material ChlorinatedSuccinimide = fluidBuilder(22024, "chlorinated_succinimide") + .color(0xE3CDDE) .build(); - public static final Material ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol = fluidBuilder(22025, "ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol") - .color(0xFFFFFF) + public static final Material LurdmaninePrecursorBase = fluidBuilder(22025, "lurdmanine_precursor_base") + .color(0xFBEE9C) .build(); - public static final Material RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride = fluidBuilder(22026, "RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride") - .color(0xFFFFFF) + public static final Material LurdmaninePrecursorDimer = fluidBuilder(22026, "lurdmanine_precursor_dimer") + .color(0xFBEE9C) .build(); - public static final Material Nmethyltwopyrrolidinone = fluidBuilder(22027, "Nmethyltwopyrrolidinone") - .color(0xFFFFFF) + public static final Material NMethylIIPyrrolidinone = fluidBuilder(22027, "n_methyl_ii_pyrrolidinone") + .color(0xF9DAF9) .build(); - public static final Material crudeNmethyltwopyrrolidinone = fluidBuilder(22028, "crudeNmethyltwopyrrolidinone") - .color(0xFFFFFF) + public static final Material CrudeNMethylIIPyrrolidinone = fluidBuilder(22028, "crude_n_methyl_ii_pyrrolidinone") + .color(0xDEDDF1) .build(); - public static final Material hotNmethyltwopyrrolidinone = fluidBuilder(22029, "hotNmethyltwopyrrolidinone") - .color(0xFFFFFF) + public static final Material HotNMethylIIPyrrolidinone = fluidBuilder(22029, "hot_n_methyl_ii_pyrrolidinone") + .color(0xFDDBDF) .build(); - public static final Material cooledNmethyltwopyrrolidinone = fluidBuilder(22030, "cooledNmethyltwopyrrolidinone") - .color(0xFFFFFF) + public static final Material CooledNMethylIIPyrrolidinone = fluidBuilder(22030, "cooled_n_methyl_ii_pyrrolidinone") + .color(0xFDDBDF) .build(); - public static final Material Crudefentanyl = fluidBuilder(22031, "Crudefentanyl") - .color(0xFFFFFF) + public static final Material CrudeLurdmanine = fluidBuilder(22031, "crude_lurdmanine") + .color(0xFBEE9C) .build(); - public static final Material UnrefinedFentanyl = fluidBuilder(22032, "UnrefinedFentanyl") - .color(0xFFFFFF) + public static final Material UnrefinedLurdmanine = fluidBuilder(22032, "unrefined_lurdmanine") + .color(0xFBEE9C) .build(); - public static final Material Nphenethylfourpiperidoneintermediate = fluidBuilder(22033, "Nphenethylfourpiperidoneintermediate") - .color(0xFFFFFF) + public static final Material NPhenethylIVPiperidoneIntermediate = fluidBuilder(22033, "n_phenethyl_iv_piperidone_intermediate") + .color(0xE4EEDA) .build(); @@ -751,24 +756,24 @@ public class GTFOMaterialHandler { .color(0x0045A0).iconSet(MaterialIconSet.SHINY) .components(Carbon, 8, Hydrogen, 9, Nitrogen, 1, Oxygen, 2) .build(); - public static final Material PhenylmagnesiumBromide = new Material.Builder(21901, gtfoId("Phenylmagnesium_Bromide")).dust() + public static final Material PhenylmagnesiumBromide = new Material.Builder(21901, gtfoId("phenylmagnesium_bromide")).dust() .color(0x964B00).iconSet(MaterialIconSet.SHINY) .components(Carbon, 6, Hydrogen, 5, Magnesium, 1, Bromine, 1) .build(); - public static final Material BenzoPhenone = new Material.Builder(21902, gtfoId("Benzo_Phenone")).dust() - .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + public static final Material Benzophenone = new Material.Builder(21902, gtfoId("benzophenone")).dust() + .color(0xFFFED0).iconSet(MaterialIconSet.SHINY) .components(Carbon, 13, Hydrogen, 10, Oxygen, 1) .build(); - public static final Material Maleicanhydride = new Material.Builder(21903, gtfoId("Maleicanhydride")).dust() - .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + public static final Material MaleicAnhydride = new Material.Builder(21903, gtfoId("maleic_anhydride")).dust() + .color(0xF2F2BB).iconSet(MaterialIconSet.SHINY) .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) .build(); - public static final Material RecrystalizedFentanyl = new Material.Builder(21904, gtfoId("RecrystalizedFentanyl")).dust() - .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + public static final Material RecrystalizedLurdmanine = new Material.Builder(21904, gtfoId("recrystalized_lurdmanine")).dust() + .color(0xF4F5B2).iconSet(MaterialIconSet.SHINY) .components(Carbon, 22, Hydrogen, 28, Oxygen, 1, Nitrogen, 2) .build(); - public static final Material sodiumborohydride = new Material.Builder(21905, gtfoId("sodiumborohydride")).dust() - .color(0xFFFFFF).iconSet(MaterialIconSet.SHINY) + public static final Material SodiumBorohydride = new Material.Builder(21905, gtfoId("sodium_borohydride")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) .components(Sodium, 1, Hydrogen, 4, Boron, 1) .build(); diff --git a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java index c39c1e1e..da38e595 100644 --- a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java +++ b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java @@ -39,7 +39,7 @@ public static void init() { RussianChain.init(); ChorusChain.init(); SorbetChain.init(); - FentChain.init(); + LurdmanineChain.init(); if (Loader.isModLoaded(GTFOValues.MODID_GCYS)) { PopcornChain.init(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java b/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java index b7d3cefd..2b2ae613 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/CapletChain.java @@ -105,7 +105,7 @@ public static void init() { // Fent CANNER_RECIPES.recipeBuilder().EUt(30).duration(200) .inputs(CAPLET_BODY.getStackForm()) - .input(dust, RecrystalizedFentanyl, 1) + .input(dust, RecrystalizedLurdmanine, 1) .inputs(CAPLET_CAP.getStackForm()) .outputs(FENT_CAPLET.getStackForm()) .buildAndRegister(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java b/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java similarity index 63% rename from src/main/java/gregtechfoodoption/recipe/chain/FentChain.java rename to src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java index 936cdd8b..052b5615 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/FentChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java @@ -1,22 +1,14 @@ package gregtechfoodoption.recipe.chain; -import com.cleanroommc.groovyscript.api.IIngredient; -import gregtech.api.recipes.ingredients.GTRecipeInput; -import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import gregtech.common.items.MetaItems; -import gregtechfoodoption.GTFOConfig; -import gregtechfoodoption.item.GTFOMetaItem; -import net.minecraft.init.Items; import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.dust; import static gregtech.api.unification.ore.OrePrefix.dustSmall; import static gregtechfoodoption.GTFOMaterialHandler.*; -import static gregtechfoodoption.item.GTFOMetaItem.*; -public class FentChain { +public class LurdmanineChain { public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(OrePrefix.dust, Aluminium) @@ -28,18 +20,18 @@ public static void init() { .fluidInputs(Benzene.getFluid(1000)) .fluidInputs(Bromine.getFluid(1000)) .notConsumable(OrePrefix.dust, Aluminium) - .fluidOutputs(BromoBenzene.getFluid(1000)) + .fluidOutputs(Bromobenzene.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(OrePrefix.dust, Magnesium) - .fluidInputs(BromoBenzene.getFluid(144)) + .fluidInputs(Bromobenzene.getFluid(144)) .fluidInputs(DiethylEther.getFluid(144)) .output(dust, PhenylmagnesiumBromide, 5) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(dustSmall, PhenylmagnesiumBromide) .fluidInputs(CarbonDioxide.getFluid(144)) - .output(dust, BenzoPhenone, 5) + .output(dust, Benzophenone, 5) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(dust, Calcite, 5) @@ -49,7 +41,7 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Acetylene.getFluid(144)) .fluidInputs(Formaldehyde.getFluid(144)) - .fluidOutputs(onefourButynediol.getFluid(288)) + .fluidOutputs(I_IVButynediol.getFluid(288)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .notConsumable(OrePrefix.dust, Silver) @@ -59,14 +51,14 @@ public static void init() { .fluidOutputs(Water.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(onefourButynediol.getFluid(144)) + .fluidInputs(I_IVButynediol.getFluid(144)) .fluidInputs(Water.getFluid(144)) - .fluidOutputs(onefourButanediol.getFluid(288)) + .fluidOutputs(I_IVButanediol.getFluid(288)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(onefourButanediol.getFluid(144)) + .fluidInputs(I_IVButanediol.getFluid(144)) .notConsumable(OrePrefix.wireGtSingle, Copper) - .fluidOutputs(yButyrolactone.getFluid(144)) + .fluidOutputs(GammaButyrolactone.getFluid(144)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Ammonia.getFluid(144)) @@ -89,120 +81,120 @@ public static void init() { .fluidOutputs(Chlorine.getFluid(12000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(onefourButanediol.getFluid(1000)) + .fluidInputs(I_IVButanediol.getFluid(1000)) .fluidInputs(Chlorine.getFluid(1000)) - .fluidOutputs(yButyrolactone.getFluid(1000)) + .fluidOutputs(GammaButyrolactone.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(yButyrolactone.getFluid(1000)) + .fluidInputs(GammaButyrolactone.getFluid(1000)) .fluidInputs(Ammonia.getFluid(1000)) - .fluidOutputs(yButyrolactoneammonia.getFluid(1000)) + .fluidOutputs(AmmoniumGammaButyrolactone.getFluid(1000)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(yButyrolactoneammonia.getFluid(1000)) - .fluidOutputs(cooledyButyrolactoneammonia.getFluid(1000)) + .fluidInputs(AmmoniumGammaButyrolactone.getFluid(1000)) + .fluidOutputs(CooledAmmoniumGammaButyrolactone.getFluid(1000)) .buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(cooledyButyrolactoneammonia.getFluid(1000)) - .fluidOutputs(twoPyrrolidone.getFluid(100)) + .fluidInputs(CooledAmmoniumGammaButyrolactone.getFluid(1000)) + .fluidOutputs(IIPyrrolidone.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(twoPyrrolidone.getFluid(100)) + .fluidInputs(IIPyrrolidone.getFluid(100)) .fluidInputs(Water.getFluid(1000)) - .fluidOutputs(aqueoustwoPyrrolidone.getFluid(100)) + .fluidOutputs(AqueousIIPyrrolidone.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(aqueoustwoPyrrolidone.getFluid(100)) + .fluidInputs(AqueousIIPyrrolidone.getFluid(100)) .fluidInputs(HydrochloricAcid.getFluid(1000)) - .fluidOutputs(acidicaqueoustwoPyrrolidone.getFluid(100)) + .fluidOutputs(AcidicAqueousIIPyrrolidone.getFluid(100)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(acidicaqueoustwoPyrrolidone.getFluid(1000)) - .fluidOutputs(cooledacidicaqueoustwoPyrrolidone.getFluid(1000)) + .fluidInputs(AcidicAqueousIIPyrrolidone.getFluid(1000)) + .fluidOutputs(CooledAcidicAqueousIIPyrrolidone.getFluid(1000)) .buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(cooledacidicaqueoustwoPyrrolidone.getFluid(100)) - .fluidOutputs(fouraminobutyric.getFluid(100)) + .fluidInputs(CooledAcidicAqueousIIPyrrolidone.getFluid(100)) + .fluidOutputs(IVAminoButyricAcid.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(fouraminobutyric.getFluid(100)) + .fluidInputs(IVAminoButyricAcid.getFluid(100)) .fluidInputs(SulfuricAcid.getFluid(1000)) - .fluidOutputs(acidicfouraminobutyric.getFluid(100)) + .fluidOutputs(AcidicIVAminoButyricAcidSolution.getFluid(100)) .buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(acidicfouraminobutyric.getFluid(100)) - .fluidOutputs(fourpiperidone.getFluid(100)) + .fluidInputs(AcidicIVAminoButyricAcidSolution.getFluid(100)) + .fluidOutputs(IVPiperidone.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(fouraminobutyric.getFluid(100)) + .fluidInputs(IVAminoButyricAcid.getFluid(100)) .fluidInputs(SulfuricAcid.getFluid(1000)) - .fluidOutputs(acidicfouraminobutyric.getFluid(100)) + .fluidOutputs(AcidicIVAminoButyricAcidSolution.getFluid(100)) .buildAndRegister(); MIXER_RECIPES.recipeBuilder().EUt(8).duration(1000) .inputs(SodiumCyanide.getItemStack(5)) - .fluidInputs(Benzylchloride.getFluid(1000)) + .fluidInputs(BenzylChloride.getFluid(1000)) .fluidOutputs(Phenylacetonitrile.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Benzene.getFluid(1000)) .fluidInputs(Chlorine.getFluid(1000)) - .fluidOutputs(Benzylchloride.getFluid(2000)) + .fluidOutputs(BenzylChloride.getFluid(2000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Phenylacetonitrile.getFluid(1000)) .fluidInputs(DiethylEther.getFluid(1000)) - .fluidOutputs(dissolvedPhenylacetonitrile.getFluid(2000)) + .fluidOutputs(DissolvedPhenylacetonitrile.getFluid(2000)) .buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(dissolvedPhenylacetonitrile.getFluid(1000)) - .fluidOutputs(phenethylamine.getFluid(100)) + .fluidInputs(DissolvedPhenylacetonitrile.getFluid(1000)) + .fluidOutputs(Phenethylamine.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(phenethylamine.getFluid(1000)) - .fluidInputs(fourpiperidone.getFluid(1000)) + .fluidInputs(Phenethylamine.getFluid(1000)) + .fluidInputs(IVPiperidone.getFluid(1000)) .fluidInputs(Ethanol.getFluid(1000)) - .fluidOutputs(crudeNphenethylfourpiperidone.getFluid(1000)) + .fluidOutputs(CrudeNPhenethylIVPiperidone.getFluid(1000)) .buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(crudeNphenethylfourpiperidone.getFluid(1000)) - .fluidOutputs(Nphenethylfourpiperidone.getFluid(100)) + .fluidInputs(CrudeNPhenethylIVPiperidone.getFluid(1000)) + .fluidOutputs(NPhenethylIVPiperidone.getFluid(100)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(phenethylamine.getFluid(1000)) - .fluidInputs(fourpiperidone.getFluid(1000)) + .fluidInputs(Phenethylamine.getFluid(1000)) + .fluidInputs(IVPiperidone.getFluid(1000)) .fluidInputs(Ethanol.getFluid(1000)) - .fluidOutputs(Nphenethylfourpiperidoneintermediate.getFluid(1000)) + .fluidOutputs(NPhenethylIVPiperidoneIntermediate.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Nphenethylfourpiperidoneintermediate.getFluid(1000)) - .input(dust, sodiumborohydride) + .fluidInputs(NPhenethylIVPiperidoneIntermediate.getFluid(1000)) + .input(dust, SodiumBorohydride) .fluidInputs(Ethanol.getFluid(1000)) - .fluidOutputs(Nphenethylfourpiperidone.getFluid(1000)) + .fluidOutputs(NPhenethylIVPiperidone.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .input(dust, Sodium, 16) .input(dust, Borax) .fluidInputs(Hydrogen.getFluid(16000)) - .output(dust, sodiumborohydride, 4) + .output(dust, SodiumBorohydride, 4) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(Butene.getFluid(1000)) .fluidInputs(Oxygen.getFluid(1000)) - .output(dust, Maleicanhydride, 5) + .output(dust, MaleicAnhydride, 5) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .input(dust, Maleicanhydride) + .input(dust, MaleicAnhydride) .fluidInputs(Oxygen.getFluid(1000)) - .fluidOutputs(Succinicacid.getFluid(1000)) + .fluidOutputs(SuccinicAcid.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .input(dust, BenzoPhenone, 5) - .fluidInputs(Nchlorosuccinimide.getFluid(1000)) + .input(dust, Benzophenone, 5) + .fluidInputs(NChlorosuccinimide.getFluid(1000)) .notConsumable(Chloroform.getFluid(1000)) - .fluidOutputs(threefourDichlorobenzophenone.getFluid(1000)) + .fluidOutputs(III_IVDichlorobenzophenone.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Succinicacid.getFluid(1000)) + .fluidInputs(SuccinicAcid.getFluid(1000)) .fluidInputs(Ammonia.getFluid(1000)) .fluidOutputs(AmmoniumSuccinate.getFluid(1000)) .buildAndRegister(); @@ -218,50 +210,51 @@ public static void init() { .buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(ChlorinatedSuccinimide.getFluid(1000)) - .fluidOutputs(Nchlorosuccinimide.getFluid(1000)) + .fluidOutputs(NChlorosuccinimide.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(threefourDichlorobenzophenone.getFluid(1000)) - .fluidInputs(Nphenethylfourpiperidone.getFluid(1000)) + .fluidInputs(III_IVDichlorobenzophenone.getFluid(1000)) + .fluidInputs(NPhenethylIVPiperidone.getFluid(1000)) .notConsumable(dust, Aluminium) - .fluidOutputs(ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol.getFluid(1000)) + .fluidOutputs(LurdmaninePrecursorBase.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(ThreefourChlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol.getFluid(1000)) - .fluidInputs(Nmethyltwopyrrolidinone.getFluid(1000)).notConsumable(dust, Aluminium) - .fluidOutputs(RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride.getFluid(1000)) + .fluidInputs(LurdmaninePrecursorBase.getFluid(1000)) + .fluidInputs(NMethylIIPyrrolidinone.getFluid(1000)) + .notConsumable(dust, Aluminium) + .fluidOutputs(LurdmaninePrecursorDimer.getFluid(1000)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(yButyrolactone.getFluid(1000)) + .fluidInputs(GammaButyrolactone.getFluid(1000)) .fluidInputs(Methylamine.getFluid(1000)) - .fluidOutputs(crudeNmethyltwopyrrolidinone.getFluid(1000)) + .fluidOutputs(CrudeNMethylIIPyrrolidinone.getFluid(1000)) .buildAndRegister(); FLUID_HEATER_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(crudeNmethyltwopyrrolidinone.getFluid(1000)) - .fluidOutputs(hotNmethyltwopyrrolidinone.getFluid(1000)) + .fluidInputs(CrudeNMethylIIPyrrolidinone.getFluid(1000)) + .fluidOutputs(HotNMethylIIPyrrolidinone.getFluid(1000)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(hotNmethyltwopyrrolidinone.getFluid(1000)) - .fluidOutputs(cooledNmethyltwopyrrolidinone.getFluid(100)) + .fluidInputs(HotNMethylIIPyrrolidinone.getFluid(1000)) + .fluidOutputs(CooledNMethylIIPyrrolidinone.getFluid(100)) .buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(cooledNmethyltwopyrrolidinone.getFluid(1000)) - .fluidOutputs(Nmethyltwopyrrolidinone.getFluid(100)) + .fluidInputs(CooledNMethylIIPyrrolidinone.getFluid(1000)) + .fluidOutputs(NMethylIIPyrrolidinone.getFluid(100)) .fluidOutputs(Methylamine.getFluid(400)) .fluidOutputs(Ammonia.getFluid(400)) .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(RNthreeaminopropylNonethreebenzylsevenchlorofouroxofourHchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride.getFluid(1000)) + .fluidInputs(LurdmaninePrecursorDimer.getFluid(1000)) .fluidOutputs(Chloroform.getFluid(100)) - .fluidOutputs(Crudefentanyl.getFluid(1000)) + .fluidOutputs(CrudeLurdmanine.getFluid(1000)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(Crudefentanyl.getFluid(1000)) - .fluidOutputs(UnrefinedFentanyl.getFluid(100)) + .fluidInputs(CrudeLurdmanine.getFluid(1000)) + .fluidOutputs(UnrefinedLurdmanine.getFluid(100)) .buildAndRegister(); AUTOCLAVE_RECIPES.recipeBuilder().EUt(8).duration(1000) - .fluidInputs(UnrefinedFentanyl.getFluid(1000)) - .output(dust, RecrystalizedFentanyl, 10) + .fluidInputs(UnrefinedLurdmanine.getFluid(1000)) + .output(dust, RecrystalizedLurdmanine, 10) .buildAndRegister(); diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index dbef52e7..baeb74a8 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -1234,52 +1234,51 @@ gregtech.material.gtfo_vibrant_extract=Vibrant Extract gregtech.material.gtfo_apricot_extract=Apricot Extract gregtech.material.gtfo_grape_extract=Grape Extract -//Fent shit -gregtech.material.recrystalizedfentanyl=Fentanyl -gregtech.material.maleicanhydride=Maleic Anhydride -gregtech.material.benzo_phenone=BenzoPhenone +// Lurdmanine materials :D +gregtech.material.recrystalized_lurdmanine=Lurdmanine +gregtech.material.maleic_anhydride=Maleic Anhydride +gregtech.material.benzophenone=BenzoPhenone gregtech.material.phenylmagnesium_bromide=PhenylMagnesium Bromide -gregtech.material.sodiumborohydride=Sodium Borohydride +gregtech.material.sodium_borohydride=Sodium Borohydride gregtech.material.gtfo_formaldehyde=Formaldehyde gregtech.material.gtfo_ethylene_oxide=Ethylene Oxide gregtech.material.gtfo_diethyl_ether=Diethyl Ether -gregtech.material.gtfo_bromo_benzene=Bromo Benzene +gregtech.material.gtfo_bromobenzene=Bromobenzene gregtech.material.gtfo_acetylene=Acetylene -gregtech.material.gtfo_crudefentanyl=Crude Fentanyl -gregtech.material.gtfo_unrefinedfentanyl=Unrefined Fentanyl -gregtech.material.gtfo_threefourchlorobenzoylfourfourchlorophenylonephenethylpiperidinfourol=3-(4-Chlorobenzoyl)-4-(4-chlorophenyl)-1-phenethylpiperidin-4-ol -gregtech.material.gtfo_rnthreeaminopropylnonethreebenzylsevenchlorofouroxofourhchromentwoyltwomethylpropylfourmethylbenzamidehydrochloride=(R)-N-(3-aminopropyl)-N-(1-(3-benzyl-7-chloro-4-oxo-4H-chromen-2-yl)-2-methylpropyl)-4-methylbenzamide hydrochloride -gregtech.material.gtfo_onefourbutynediol=1-4 Butynediol -gregtech.material.gtfo_onefourbutanediol=1-4 Butanediol -gregtech.material.gtfo_gammabutyrolacetone=Gamma-ButyrolAcetone +gregtech.material.gtfo_crude_lurdmanine=Crude Lurdmanine +gregtech.material.gtfo_unrefined_lurdmanine=Unrefined Lurdmanine +gregtech.material.gtfo_lurdmanine_precursor_base=3-(4-Chlorobenzoyl)-4-(4-chlorophenyl)-1-phenethylpiperidin-4-ol +gregtech.material.gtfo_lurdmanine_precursor_dimer=(R)-N-(3-aminopropyl)-N-(1-(3-benzyl-7-chloro-4-oxo-4H-chromen-2-yl)-2-methylpropyl)-4-methylbenzamide hydrochloride +gregtech.material.gtfo_i_iv_butynediol=1,4-Butynediol +gregtech.material.gtfo_i_iv_butanediol=1,4-Butanediol gregtech.material.gtfo_methylamine=Methylamine -gregtech.material.gtfo_nphenethylfourpiperidone=N-Phenethyl-4-Piperidone -gregtech.material.gtfo_γbutyrolactone=γ-Butyrolactone -gregtech.material.gtfo_γbutyrolactoneammonia=γ=Butyrolactone Ammonia -gregtech.material.gtfo_cooledγbutyrolactoneammonia=Cooled γ-Butyrolactone Ammonia -gregtech.material.gtfo_twopyrrolidone=2-Pyrrolidone -gregtech.material.gtfo_aqueoustwopyrrolidone=Aqueous 2-Pyrrolidone -gregtech.material.gtfo_acidicaqueoustwopyrrolidone=Acidic Aqueous 2-Pyrrolidone -gregtech.material.gtfo_cooledacidicaqueoustwopyrrolidone=Cooled Acidic Aqueous 2-Pyrrolidone -gregtech.material.gtfo_fouraminobutyric=4-Aminobutyric -gregtech.material.gtfo_acidicfouraminobutyric=Acidic 4-Aminobutyric -gregtech.material.gtfo_fourpiperidone=4-Piperidone -gregtech.material.gtfo_benzylchloride=Benzylchloride +gregtech.material.gtfo_n_phenethyl_iv_piperidone=N-Phenethyl-4-Piperidone +gregtech.material.gtfo_gamma_butyrolactone=γ-Butyrolactone +gregtech.material.gtfo_ammonium_gamma_butyrolactone=Ammonium γ=Butyrolactone +gregtech.material.gtfo_cooled_ammonium_gamma_butyrolactone=Cooled Ammonium γ-Butyrolactone +gregtech.material.gtfo_ii_pyrrolidone=2-Pyrrolidone +gregtech.material.gtfo_aqueous_ii_pyrrolidone=Aqueous 2-Pyrrolidone +gregtech.material.gtfo_acidic_aqueous_ii_pyrrolidone=Acidic Aqueous 2-Pyrrolidone +gregtech.material.gtfo_cooled_acidic_aqueous_ii_pyrrolidone=Cooled Acidic Aqueous 2-Pyrrolidone +gregtech.material.gtfo_iv_aminobutyric_acid=4-Aminobutyric Acid +gregtech.material.gtfo_acidic_iv_amino_butyric_acid_solution=Acidic 4-Aminobutyric Acid Solution +gregtech.material.gtfo_iv_piperidone=4-Piperidone +gregtech.material.gtfo_benzyl_chloride=Benzyl Chloride gregtech.material.gtfo_phenylacetonitrile=Phenylacetonitrile -gregtech.material.gtfo_dissolvedphenylacetonitrile=Dissolved Phenylacetonitrile +gregtech.material.gtfo_dissolved_phenylacetonitrile=Dissolved Phenylacetonitrile gregtech.material.gtfo_phenethylamine=Phenethylamine -gregtech.material.gtfo_crudenphenethylfourpiperidone=Crude N-Phenethyl-4-piperidone -gregtech.material.gtfo_succinicacid=Succinic Acid -gregtech.material.gtfo_nchlorosuccinimide=N-Chlorosuccinimide -gregtech.material.gtfo_threefourdichlorobenzophenone=3-4-Dichlorobenzophenone -gregtech.material.gtfo_ammoniumsuccinate=Ammonium Succinate +gregtech.material.gtfo_crude_n_phenethyl_iv_piperidone=Crude N-Phenethyl-4-piperidone +gregtech.material.gtfo_succinic_acid=Succinic Acid +gregtech.material.gtfo_n_chlorosuccinimide=N-Chlorosuccinimide +gregtech.material.gtfo_iii_iv_dichlorobenzophenone=3-4-Dichlorobenzophenone +gregtech.material.gtfo_ammonium_succinate=Ammonium Succinate gregtech.material.gtfo_succinimide=Succinimide -gregtech.material.gtfo_chlorinatedsuccinimide=Chlorinated Succinimide -gregtech.material.gtfo_nmethyltwopyrrolidinone=N-Methyl-2-Pyrrolidinone -gregtech.material.gtfo_crudenmethyltwopyrrolidinone=Crude N-Methyl-2-pyrrolidinone -gregtech.material.gtfo_hotnmethyltwopyrrolidinone=Hot N-Methyl-2-Pyrrolidinone -gregtech.material.gtfo_coolednmethyltwopyrrolidinone=Cooled N-Methyl-2-Pyrrolidinone -gregtech.material.gtfo_nphenethylfourpiperidoneintermediate=N-Phenethyl-4-piperidone Intermediate +gregtech.material.gtfo_chlorinated_succinimide=Chlorinated Succinimide +gregtech.material.gtfo_n_methyl_ii_pyrrolidinone=N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_crude_n_methyl_ii_pyrrolidinone=Crude N-Methyl-2-pyrrolidinone +gregtech.material.gtfo_hot_n_methyl_ii_pyrrolidinone=Hot N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_cooled_n_methyl_ii_pyrrolidinone=Cooled N-Methyl-2-Pyrrolidinone +gregtech.material.gtfo_n_phenethyl_iv_piperidone_intermediate=N-Phenethyl-4-piperidone Intermediate From 362914772102ac83eec4cc552477ce5a5bf3c7d0 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sat, 14 Sep 2024 08:37:03 -0500 Subject: [PATCH 11/17] fix: crop model --- .../assets/gregtechfoodoption/blockstates/crop_artichoke.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_aubergine.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_basil.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_bean.json | 2 +- .../gregtechfoodoption/blockstates/crop_black_pepper.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_coffee.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_corn.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_cucumber.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_garlic.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_hops.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_horseradish.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_onion.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_oregano.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_pea.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_popcorn.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_rice.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_soy.json | 2 +- .../assets/gregtechfoodoption/blockstates/crop_tomato.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_artichoke.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_artichoke.json index d34708f1..f32f51cd 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_artichoke.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_artichoke.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_aubergine.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_aubergine.json index 82ac70fa..7a083f33 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_aubergine.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_aubergine.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_basil.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_basil.json index 2de3c5ae..225afdda 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_basil.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_basil.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_bean.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_bean.json index 95ed2d12..9e2a7656 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_bean.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_bean.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_black_pepper.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_black_pepper.json index 3b9f2764..72c14c70 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_black_pepper.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_black_pepper.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_coffee.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_coffee.json index 61437412..4626f764 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_coffee.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_coffee.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_corn.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_corn.json index 63f31196..4c3ed2e2 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_corn.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_corn.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cucumber.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cucumber.json index 73d92f82..217f96e8 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cucumber.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cucumber.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_garlic.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_garlic.json index 9eeae2f7..d945fbe3 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_garlic.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_garlic.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_hops.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_hops.json index f41df81b..2c12decc 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_hops.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_hops.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_horseradish.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_horseradish.json index a2e8a110..325ea04e 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_horseradish.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_horseradish.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_onion.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_onion.json index 88fe6c22..cb076f0d 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_onion.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_onion.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_oregano.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_oregano.json index d0e8a04e..2d870e2c 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_oregano.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_oregano.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_pea.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_pea.json index 7395c687..60791fe4 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_pea.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_pea.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_popcorn.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_popcorn.json index 84dc287b..b31c59d8 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_popcorn.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_popcorn.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_rice.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_rice.json index 412e573c..3824819b 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_rice.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_rice.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_soy.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_soy.json index 1bb9f358..464ca470 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_soy.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_soy.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_tomato.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_tomato.json index fa753d82..28e9c87e 100644 --- a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_tomato.json +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_tomato.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "cross" + "model": "gregtechfoodoption:crop_cross" }, "variants": { "age": { From 6e2afb060ec72d9c59625be3b44b2804f6779f8c Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sat, 14 Sep 2024 08:37:25 -0500 Subject: [PATCH 12/17] fix: oh right I have to include this too --- .../models/block/crop_cross.json | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/main/resources/assets/gregtechfoodoption/models/block/crop_cross.json diff --git a/src/main/resources/assets/gregtechfoodoption/models/block/crop_cross.json b/src/main/resources/assets/gregtechfoodoption/models/block/crop_cross.json new file mode 100644 index 00000000..11de4aae --- /dev/null +++ b/src/main/resources/assets/gregtechfoodoption/models/block/crop_cross.json @@ -0,0 +1,26 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { "from": [ 0.8, -1, 8 ], + "to": [ 15.2, 15, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { "from": [ 8, -1, 0.8 ], + "to": [ 8, 15, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} From 79fa25135ddf5ec299d4def7d5468598a640d4ef Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Sat, 14 Sep 2024 21:07:15 +0100 Subject: [PATCH 13/17] Freeze Dryer --- .../client/GTFOClientHandler.java | 1 + .../machines/GTFOTileEntities.java | 9 +++ .../machines/MetaTileEntityFreezedryer.java | 61 ++++++++++++++++++ .../machines/freezedryer/overlay_front.png | Bin 0 -> 259 bytes .../freezedryer/overlay_front_active.png | Bin 0 -> 162 bytes .../overlay_front_active_emissive.png | Bin 0 -> 136 bytes .../assets/gregtechfoodoption/lang/en_us.lang | 6 +- 7 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gregtechfoodoption/machines/MetaTileEntityFreezedryer.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front_active_emissive.png diff --git a/src/main/java/gregtechfoodoption/client/GTFOClientHandler.java b/src/main/java/gregtechfoodoption/client/GTFOClientHandler.java index fbcaad2a..a2ab29bb 100644 --- a/src/main/java/gregtechfoodoption/client/GTFOClientHandler.java +++ b/src/main/java/gregtechfoodoption/client/GTFOClientHandler.java @@ -12,6 +12,7 @@ public class GTFOClientHandler { public static OrientedOverlayRenderer BAKING_OVEN_OVERLAY = new OrientedOverlayRenderer("machines/baking_oven"); public static OrientedOverlayRenderer CUISINE_ASSEMBLER_OVERLAY = new OrientedOverlayRenderer("machines/cuisine_assembler"); public static OrientedOverlayRenderer MICROWAVE_OVERLAY = new OrientedOverlayRenderer("machines/microwave"); + public static OrientedOverlayRenderer FREEZEDRYER_OVERLAY = new OrientedOverlayRenderer("machines/freezedryer"); public static OrientedOverlayRenderer MULTICOOKER_OVERLAY = new OrientedOverlayRenderer("machines/multicooker"); public static final OrientedOverlayRenderer MOB_AGE_SORTER_OVERLAY = new OrientedOverlayRenderer("machines/mob_age_sorter"); public static final OrientedOverlayRenderer MOB_EXTERMINATOR_OVERLAY = new OrientedOverlayRenderer("machines/mob_exterminator"); diff --git a/src/main/java/gregtechfoodoption/machines/GTFOTileEntities.java b/src/main/java/gregtechfoodoption/machines/GTFOTileEntities.java index 481f2aec..aa9c754a 100644 --- a/src/main/java/gregtechfoodoption/machines/GTFOTileEntities.java +++ b/src/main/java/gregtechfoodoption/machines/GTFOTileEntities.java @@ -27,6 +27,8 @@ public class GTFOTileEntities { public static GTFOSimpleMachineMetaTileEntity[] CUISINE_ASSEMBLER = new GTFOSimpleMachineMetaTileEntity[GTValues.V.length - 1]; public static MetaTileEntityMicrowave[] MICROWAVE = new MetaTileEntityMicrowave[GTValues.V.length - 1]; public static GTFOSimpleMachineMetaTileEntity[] MULTICOOKER = new GTFOSimpleMachineMetaTileEntity[GTValues.V.length - 1]; + public static MetaTileEntityFreezedryer[] FREEZEDRYER = new MetaTileEntityFreezedryer[GTValues.V.length - 1]; + public static final MetaTileEntityMobAgeSorter[] MOB_AGE_SORTER = new MetaTileEntityMobAgeSorter[4]; public static final MetaTileEntityMobExterminator[] MOB_EXTERMINATOR = new MetaTileEntityMobExterminator[4]; @@ -101,6 +103,13 @@ public static void init() { registerGTFOSimpleMetaTileEntity(MULTICOOKER, 8566, "multicooker", GTFORecipeMaps.MULTICOOKER_RECIPES, GTFOClientHandler.MULTICOOKER_OVERLAY, true, GTFOTileEntities::location, GTUtility.hvCappedTankSizeFunction); KITCHEN = registerMetaTileEntity(8581, new MetaTileEntityKitchen(location("kitchen"))); + + //Freeze Dryer, IDS 8582-8585 + FREEZEDRYER[1] = registerMetaTileEntity(8582, new MetaTileEntityFreezedryer(location("freezedryer.lv"), GTFORecipeMaps.MICROWAVE_RECIPES, GTFOClientHandler.FREEZEDRYER_OVERLAY, 1)); + FREEZEDRYER[2] = registerMetaTileEntity(8583, new MetaTileEntityFreezedryer(location("freezedryer.mv"), GTFORecipeMaps.MICROWAVE_RECIPES, GTFOClientHandler.FREEZEDRYER_OVERLAY, 2)); + FREEZEDRYER[3] = registerMetaTileEntity(8584, new MetaTileEntityFreezedryer(location("freezedryer.hv"), GTFORecipeMaps.MICROWAVE_RECIPES, GTFOClientHandler.FREEZEDRYER_OVERLAY, 3)); + FREEZEDRYER[4] = registerMetaTileEntity(8585, new MetaTileEntityFreezedryer(location("freezedryer.ev"), GTFORecipeMaps.MICROWAVE_RECIPES, GTFOClientHandler.FREEZEDRYER_OVERLAY, 4)); + } private static ResourceLocation location(String name) { diff --git a/src/main/java/gregtechfoodoption/machines/MetaTileEntityFreezedryer.java b/src/main/java/gregtechfoodoption/machines/MetaTileEntityFreezedryer.java new file mode 100644 index 00000000..1b82f192 --- /dev/null +++ b/src/main/java/gregtechfoodoption/machines/MetaTileEntityFreezedryer.java @@ -0,0 +1,61 @@ +package gregtechfoodoption.machines; + +import gregtech.api.GTValues; +import gregtech.api.capability.IEnergyContainer; +import gregtech.api.capability.impl.RecipeLogicEnergy; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.recipes.RecipeMap; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.info.MaterialFlags; +import gregtech.api.unification.material.properties.PropertyKey; +import gregtech.api.unification.stack.MaterialStack; +import gregtech.client.renderer.ICubeRenderer; +import gregtechfoodoption.client.GTFOClientHandler; +import gregtechfoodoption.item.GTFOSimpleMachineMetaTileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; + +import java.util.function.Supplier; + +public class MetaTileEntityFreezedryer extends GTFOSimpleMachineMetaTileEntity { + public MetaTileEntityFreezedryer(ResourceLocation metaTileEntityId, RecipeMap recipeMap, ICubeRenderer renderer, int tier) { + super(metaTileEntityId, recipeMap, renderer, tier, true); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityFreezedryer(this.metaTileEntityId, this.workable.getRecipeMap(), this.renderer, this.getTier()); + } + + @Override + public void update() { + if (this.energyContainer.getEnergyStored() > GTValues.V[this.getTier()]) { + MaterialStack materialIn = OreDictUnifier.getMaterial(importItems.getStackInSlot(0)); + if (materialIn != null) { + if (materialIn.material.hasProperty(PropertyKey.INGOT) || materialIn.material.hasFlag(MaterialFlags.FLAMMABLE) || materialIn.material.hasFlag(MaterialFlags.EXPLOSIVE)) { + this.doExplosion(this.getTier() * 4); + return; + } + } + if (TileEntityFurnace.getItemBurnTime(importItems.getStackInSlot(0)) > 0) { + this.doExplosion(this.getTier() * 4); + return; + } + } + super.update(); + } + + protected RecipeLogicEnergy createWorkable(RecipeMap recipeMap) { + return new RecipeLogicMicrowave(this, recipeMap, () -> this.energyContainer); + } + + public class RecipeLogicMicrowave extends RecipeLogicEnergy { + public RecipeLogicMicrowave(MetaTileEntity tileEntity, RecipeMap recipeMap, Supplier energyContainer) { + super(tileEntity, recipeMap, energyContainer); + } + + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..2c6bf11b980c2db4d624bb3e3f9b4b37356f0653 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKR%TvVDU;-nAwZ!Co-U3d7N@UHHsm^Nz~egKSAW*o z=oc57ypKI<;L^LhJ`vGcO9yJNH7&Lbv_r$DB_>`swTq zGZWKPPO{aUHS`QrKe??yo7;I#SC!A9*JZY5&5C||o>yPoz`mX(OTrelk_(F`~o{aI6tQ^7Oup3C?D^ItND__^P8{cd*)=r#sVS3j3^P6)5JIN^WdGASUAI8@i_J|L-3L26;D`o^Oxc&zo+X7~JD;Y?Yw2L}Gp#5Az01w{pQa z<_(!{<|20;=CD1u)T7sSl_AOWu?fR$r(^b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/freezedryer/overlay_front_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..557039b35997eb86d2653ef02d412b1409adf9b6 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`{+=$5Ar`%FC!XeIP~dPr_;z>% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index dbef52e7..1028c70e 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -434,7 +434,7 @@ gregtechfoodoption.machine.cuisine_assembler.uxv.name=High-Tech Cuisine Assemble gregtechfoodoption.machine.cuisine_assembler.opv.name=Legendary Cuisine Assembler gregtechfoodoption.machine.cuisine_assembler.lv.tooltip=Industrial Sandwich Maker gregtechfoodoption.machine.cuisine_assembler.mv.tooltip=Industrial Sandwich Maker -gregtechfoodoption.machine.cuisine_assembler.hv.tooltip=Industrial Sandwich Maker +gregtechfoodoption.machine.cuisine_assembler.hv.tooltip=Planetme weeps gregtechfoodoption.machine.cuisine_assembler.ev.tooltip=Industrial Sandwich Maker gregtechfoodoption.machine.cuisine_assembler.iv.tooltip=Chef-Bot 3000 gregtechfoodoption.machine.cuisine_assembler.luv.tooltip=Chef-Bot 5000 @@ -528,6 +528,10 @@ gregtechfoodoption.machine.microwave.uiv.tooltip=Insert Ingot for free Doge Coin gregtechfoodoption.machine.microwave.uxv.tooltip=Insert Ingot for free Doge Coin gregtechfoodoption.machine.microwave.opv.tooltip=Insert Ingot for free Doge Coin +gregtechfoodoption.machine.freezedryer.lv.name=Basic Freeze Dryer +gregtechfoodoption.machine.freezedryer.mv.name=Advanced Freeze Dryer +gregtechfoodoption.machine.freezedryer.hv.name=Advanced Freeze Dryer II +gregtechfoodoption.machine.freezedryer.ev.name=Advanced Freeze Dryer III recipemap.microwave.name=Microwave metaitem.food.mushroom_stew.hot.name=Hot Mushroom Stew From 5b6245a16afce57ac90f0c202f19f0de7c95a4db Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Sat, 14 Sep 2024 23:56:31 +0100 Subject: [PATCH 14/17] idk wtf i actually did bro and im too tired to figure that shit out if theres something wrong text me on discord --- .../GTFOMaterialHandler.java | 16 ++++++ .../recipe/GTFORecipeAddition.java | 1 + .../recipe/chain/Cholesterolchain.java | 56 +++++++++++++++++++ .../recipe/chain/LurdmanineChain.java | 2 +- .../assets/gregtechfoodoption/lang/en_us.lang | 8 +++ 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/Cholesterolchain.java diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 302ba2cd..7eef3268 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -632,6 +632,22 @@ public class GTFOMaterialHandler { public static final Material NPhenethylIVPiperidoneIntermediate = fluidBuilder(22033, "n_phenethyl_iv_piperidone_intermediate") .color(0xE4EEDA) .build(); + public static final Material EmulsifiedYolk = fluidBuilder(22034, "emulsified_yolk") + .color(0xFFD700) + .build(); + public static final Material yolkethanol = fluidBuilder(22035, "yolk_ethanol_solution") + .color(0xE4EEDA) + .build(); + public static final Material lipidsolvent = fluidBuilder(22036, "lipid_solvent_solution") + .color(0xE4EEDA) + .build(); + public static final Material lipidsolution = fluidBuilder(22037, "lipid_solution") + .color(0xE4EEDA) + .build(); + public static final Material Cholesterol = fluidBuilder(22038, "cholesterol") + .color(0xE4EEDA) + .build(); + diff --git a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java index da38e595..45bb9c82 100644 --- a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java +++ b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java @@ -40,6 +40,7 @@ public static void init() { ChorusChain.init(); SorbetChain.init(); LurdmanineChain.init(); + Cholesterolchain.init(); if (Loader.isModLoaded(GTFOValues.MODID_GCYS)) { PopcornChain.init(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Cholesterolchain.java b/src/main/java/gregtechfoodoption/recipe/chain/Cholesterolchain.java new file mode 100644 index 00000000..0430759f --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/Cholesterolchain.java @@ -0,0 +1,56 @@ +package gregtechfoodoption.recipe.chain; + +import com.cleanroommc.groovyscript.compat.vanilla.OreDict; +import crafttweaker.api.item.IItemStack; +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.common.blocks.BlockCleanroomCasing; +import gregtech.common.blocks.MetaBlocks; +import gregtech.common.items.MetaItems; +import gregtechfoodoption.GTFOMaterialHandler; +import gregtechfoodoption.item.GTFOMetaItem; +import gregtechfoodoption.recipe.GTFORecipeMaps; +import gregtechfoodoption.utils.GTFOUtils; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.recipes.RecipeMaps.MIXER_RECIPES; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; +import static gregtechfoodoption.GTFOMaterialHandler.*; +import static gregtechfoodoption.item.GTFOMetaItem.*; +import static gregtechfoodoption.recipe.GTFORecipeMaps.*; +import static gregtechfoodoption.recipe.GTFORecipeMaps.MULTICOOKER_RECIPES; + +public class Cholesterolchain { + public static void init() { + CENTRIFUGE_RECIPES.recipeBuilder().EUt(24).duration(100) + .fluidInputs(Yolk.getFluid(1000)) + .fluidOutputs(EmulsifiedYolk.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Ethanol.getFluid(1000)) + .fluidInputs(EmulsifiedYolk.getFluid(1000)) + .fluidOutputs(yolkethanol.getFluid(1000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(24).duration(100) + .fluidInputs(yolkethanol.getFluid(1000)) + .fluidOutputs(lipidsolvent.getFluid(1000)) + .buildAndRegister(); + + DISTILLERY_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(lipidsolvent.getFluid(1000)) + .fluidOutputs(lipidsolution.getFluid(500)) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(lipidsolution.getFluid(1000)) + .fluidOutputs(Cholesterol.getFluid(1000)) + .buildAndRegister(); + } +} + diff --git a/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java b/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java index 052b5615..eab9e407 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/LurdmanineChain.java @@ -245,7 +245,7 @@ public static void init() { .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(1000) .fluidInputs(LurdmaninePrecursorDimer.getFluid(1000)) - .fluidOutputs(Chloroform.getFluid(100)) + .fluidInputs(Chloroform.getFluid(100)) .fluidOutputs(CrudeLurdmanine.getFluid(1000)) .buildAndRegister(); VACUUM_RECIPES.recipeBuilder().EUt(8).duration(1000) diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index e9ece701..f4c0b7c1 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -1284,6 +1284,14 @@ gregtech.material.gtfo_hot_n_methyl_ii_pyrrolidinone=Hot N-Methyl-2-Pyrrolidinon gregtech.material.gtfo_cooled_n_methyl_ii_pyrrolidinone=Cooled N-Methyl-2-Pyrrolidinone gregtech.material.gtfo_n_phenethyl_iv_piperidone_intermediate=N-Phenethyl-4-piperidone Intermediate +//Steroids +gregtech.material.gtfo_emulsified_yolk=Emulsified Yolk +gregtech.material.gtfo_yolk_ethanol_solution=Yolk Ethanol Solution +gregtech.material.gtfo_lipid_solvent_solution=Lipid Solvent Solution +gregtech.material.gtfo_lipid_solution=Lipid Solution +gregtech.material.gtfo_cholesterol=Cholesterol + + From a7c2ee298b653ae72bdff0245b04e06de05474f7 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Sun, 15 Sep 2024 12:15:27 +0100 Subject: [PATCH 15/17] start of test chain --- .../GTFOMaterialHandler.java | 21 ++++++++++++++++ .../recipe/chain/Testosteronechain.java | 24 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 7eef3268..60cf8fa6 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -647,6 +647,22 @@ public class GTFOMaterialHandler { public static final Material Cholesterol = fluidBuilder(22038, "cholesterol") .color(0xE4EEDA) .build(); + public static final Material Ozone = fluidBuilder(22039, "ozone") + .color(0xE4EEDA) + .build(); + public static final Material Pregnenoloneintermediate = fluidBuilder(22040, "pregnenolone_intermediate") + .color(0xE4EEDA) + .build(); + public static final Material Pregnenolone = fluidBuilder(22041, "pregnenolone") + .color(0xE4EEDA) + .build(); + public static final Material hydrogenperoxide = fluidBuilder(22042, "hydrogenperoxide") + .color(0xE4EEDA) + .components(Hydrogen, 2, Oxygen, 2) + .build(); + + + @@ -792,6 +808,11 @@ public class GTFOMaterialHandler { .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) .components(Sodium, 1, Hydrogen, 4, Boron, 1) .build(); + public static final Material PhthalicAnhydride = new Material.Builder(21906, gtfoId("phthalic_anhydride")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 8, Hydrogen, 4, Oxygen, 3) + .build(); + public static void onMaterialsInit() { Materials.Iron.addFlags(GENERATE_FRAME); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java b/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java new file mode 100644 index 00000000..196060cc --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java @@ -0,0 +1,24 @@ +package gregtechfoodoption.recipe.chain; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.Benzene; +import static gregtech.api.unification.material.Materials.Ethanol; +import static gregtechfoodoption.GTFOMaterialHandler.*; + +public class Testosteronechain { + public static void init() { + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Cholesterol.getFluid(1000)) + .fluidInputs(Ozone.getFluid(1000)) + .fluidOutputs(Pregnenoloneintermediate.getFluid(1000)) + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Pregnenoloneintermediate.getFluid(1000)) + .fluidInputs(hydrogenperoxide.getFluid(1000)) + .fluidOutputs(Pregnenolone.getFluid(1000)) + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Benzene.getFluid(1000)) + .fluidInputs(hydrogenperoxide.getFluid(1000)) + + } +} + From 931f3d20000e9f26091425dd2b2bcedd946f9f19 Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Sun, 15 Sep 2024 21:54:45 +0100 Subject: [PATCH 16/17] all steroid lines done --- .../GTFOMaterialHandler.java | 90 ++++++++++++++++++- .../recipe/GTFORecipeAddition.java | 4 +- .../recipe/chain/Dianabolchain.java | 30 +++++++ .../recipe/chain/Superdrolchain.java | 67 ++++++++++++++ .../recipe/chain/Testosteronechain.java | 61 ++++++++++++- .../recipe/chain/Trenchain.java | 63 +++++++++++++ 6 files changed, 310 insertions(+), 5 deletions(-) create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/Dianabolchain.java create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/Superdrolchain.java create mode 100644 src/main/java/gregtechfoodoption/recipe/chain/Trenchain.java diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index 60cf8fa6..b1a41054 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -656,10 +656,80 @@ public class GTFOMaterialHandler { public static final Material Pregnenolone = fluidBuilder(22041, "pregnenolone") .color(0xE4EEDA) .build(); - public static final Material hydrogenperoxide = fluidBuilder(22042, "hydrogenperoxide") + public static final Material hydrogenperoxide = fluidBuilder(22042, "hydrogen_peroxide") .color(0xE4EEDA) .components(Hydrogen, 2, Oxygen, 2) .build(); + public static final Material anthraquinone = fluidBuilder(22043, "anthraquinone") + .color(0xE4EEDA) + .build(); + public static final Material anthrahydroquinone = fluidBuilder(22044, "anthrahydroquinone") + .color(0xE4EEDA) + .build(); + public static final Material Chromicacid = fluidBuilder(22045, "chromic_acid") + .color(0xE4EEDA) + .build(); + public static final Material Progesterone = fluidBuilder(22046, "progesterone") + .color(0xE4EEDA) + .build(); + public static final Material Androstenedioneintermediate = fluidBuilder(22047, "androstenedione_intermediate") + .color(0xE4EEDA) + .build(); + public static final Material Androstenedione = fluidBuilder(22048, "androstenedione") + .color(0xE4EEDA) + .build(); + public static final Material Testosterone = fluidBuilder(22049, "testosterone") + .color(0xE4EEDA) + .build(); + public static final Material heatedPhthalicAcid = fluidBuilder(22050, "heated_phthalic_Acid") + .color(0xE4EEDA) + .build(); + public static final Material TrenboloneAcetate = fluidBuilder(22051, "trenbolone_acetate") + .color(0xE4EEDA) + .build(); + public static final Material TestosteroneEnoneIntermediate = fluidBuilder(22052, "testosterone_enone_intermediate") + .color(0xE4EEDA) + .build(); + public static final Material Dienedione = fluidBuilder(22053, "dienedione") + .color(0xE4EEDA) + .build(); + public static final Material DienoloneIntermediate = fluidBuilder(22054, "dienolone_intermediate") + .color(0xE4EEDA) + .build(); + public static final Material Trenbolone = fluidBuilder(22055, "trenbolone") + .color(0xE4EEDA) + .build(); + public static final Material PurifiedTrenbolone = fluidBuilder(22056, "purified_trenbolone") + .color(0xE4EEDA) + .build(); + public static final Material Dimethylformamide = fluidBuilder(22057, "dimethylformamide") + .color(0xE4EEDA) + .build(); + public static final Material Methyltestosterone = fluidBuilder(22058, "methyl_testosterone") + .color(0xE4EEDA) + .build(); + public static final Material SuperdrolSolution = fluidBuilder(22059, "superdrol_solution") + .color(0xE4EEDA) + .build(); + public static final Material PurifiedSuperdrolSolution = fluidBuilder(22060, "purified_superdrol_solution") + .color(0xE4EEDA) + .build(); + public static final Material FormicAcid = fluidBuilder(22061, "formic_acid") + .color(0xE4EEDA) + .build(); + public static final Material PotassiumCarbonate = fluidBuilder(22062, "potassium_carbonate") + .color(0xE4EEDA) + .build(); + public static final Material PurifiedDianabolSolution = fluidBuilder(22063, "purified_dianabol_solution") + .color(0xE4EEDA) + .build(); + public static final Material DianabolSolution = fluidBuilder(22064, "dianabol_solution") + .color(0xE4EEDA) + .build(); + + + + @@ -812,6 +882,23 @@ public class GTFOMaterialHandler { .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) .components(Carbon, 8, Hydrogen, 4, Oxygen, 3) .build(); + public static final Material PotassiumHydroxide = new Material.Builder(21907, gtfoId("potassium_hydroxide")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .components(Potassium, 1, Hydrogen, 1, Oxygen, 1) + .build(); + public static final Material MethylIodide = new Material.Builder(21908, gtfoId("methyl_iodide")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 1, Hydrogen, 3, Iodine, 1) + .build(); + public static final Material Superdrol = new Material.Builder(21909, gtfoId("superdrol")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 20, Hydrogen, 30, Oxygen, 2) + .build(); + public static final Material Dianabol = new Material.Builder(21910, gtfoId("dianabol")).dust() + .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .components(Carbon, 20, Hydrogen, 30, Oxygen, 2) + .build(); + public static void onMaterialsInit() { @@ -822,6 +909,7 @@ public static void onMaterialsInit() { Materials.Titanium.addFlags(GENERATE_DENSE); Materials.Aluminium.addFlags(GENERATE_DENSE); Bromine.setProperty(PropertyKey.FLUID, new FluidProperty(FluidStorageKeys.LIQUID, new FluidBuilder())); + Iodine.setProperty(PropertyKey.FLUID, new FluidProperty(FluidStorageKeys.LIQUID, new FluidBuilder())); Water.setProperty(FERTILIZER, new FertilizerProperty(5)); Blood.setProperty(FERTILIZER, new FertilizerProperty(30)); diff --git a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java index 45bb9c82..fa5e9f44 100644 --- a/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java +++ b/src/main/java/gregtechfoodoption/recipe/GTFORecipeAddition.java @@ -41,7 +41,9 @@ public static void init() { SorbetChain.init(); LurdmanineChain.init(); Cholesterolchain.init(); - + Testosteronechain.init(); + Trenchain.init(); + Superdrolchain.init(); if (Loader.isModLoaded(GTFOValues.MODID_GCYS)) { PopcornChain.init(); MineralWaterChain.init(); diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Dianabolchain.java b/src/main/java/gregtechfoodoption/recipe/chain/Dianabolchain.java new file mode 100644 index 00000000..768a1f2e --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/Dianabolchain.java @@ -0,0 +1,30 @@ +package gregtechfoodoption.recipe.chain; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtechfoodoption.GTFOMaterialHandler.*; + +public class Dianabolchain { + public static void init() { + CHEMICAL_RECIPES.recipeBuilder().EUt(128).duration(3600) + .fluidInputs(Methyltestosterone.getFluid(1000)) + .notConsumable(dust, ChromiumTrioxide) + .notConsumable(dust, AceticAnhydride) + .fluidInputs(Acetone.getFluid(1000)) + .fluidOutputs(DianabolSolution.getFluid(1000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(64).duration(1800) + .fluidInputs(DianabolSolution.getFluid(1000)) + .fluidOutputs(PurifiedDianabolSolution.getFluid(500)) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().EUt(96).duration(3600) + .fluidInputs(PurifiedDianabolSolution.getFluid(1000)) + .output(dust, Dianabol, 10) + .buildAndRegister(); + + } +} + diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Superdrolchain.java b/src/main/java/gregtechfoodoption/recipe/chain/Superdrolchain.java new file mode 100644 index 00000000..0660e641 --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/Superdrolchain.java @@ -0,0 +1,67 @@ +package gregtechfoodoption.recipe.chain; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtechfoodoption.GTFOMaterialHandler.*; + +public class Superdrolchain { + public static void init() { + CHEMICAL_RECIPES.recipeBuilder().EUt(64).duration(2400) + .fluidInputs(Testosterone.getFluid(1000)) + .input(dust, MethylIodide) + .fluidInputs(PotassiumCarbonate.getFluid(1000)) + .fluidInputs(Dimethylformamide.getFluid(1000)) + .fluidOutputs(Methyltestosterone.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(128).duration(3600) + .fluidInputs(Methyltestosterone.getFluid(1000)) + .notConsumable(dust, ChromiumTrioxide) + .notConsumable(SulfuricAcid.getFluid(1000)) + .fluidInputs(Acetone.getFluid(1000)) + .fluidOutputs(SuperdrolSolution.getFluid(1000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(64).duration(1800) + .fluidInputs(SuperdrolSolution.getFluid(1000)) + .fluidOutputs(PurifiedSuperdrolSolution.getFluid(500)) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().EUt(96).duration(3600) + .fluidInputs(PurifiedSuperdrolSolution.getFluid(1000)) + .output(dust, Superdrol, 10) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(128).duration(3600) + .fluidInputs(Methanol.getFluid(1000)) + .fluidInputs(CarbonDioxide.getFluid(1000)) + .notConsumable(dust, Silver) + .fluidOutputs(FormicAcid.getFluid(1000)) + .fluidOutputs(Water.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(128).duration(3600) + .fluidInputs(Dimethylamine.getFluid(1000)) + .fluidInputs(FormicAcid.getFluid(1000)) + .input(dust, Zinc, 1000) + .fluidOutputs(Dimethylformamide.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(64).duration(1800) + .input(dust, PotassiumHydroxide) + .fluidInputs(CarbonDioxide.getFluid(1000)) + .fluidOutputs(PotassiumCarbonate.getFluid(1000)) + .fluidOutputs(Water.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(128).duration(3600) + .fluidInputs(Methanol.getFluid(1000)) + .fluidInputs(Iodine.getFluid(1000)) + .notConsumable(dust, SulfurDioxide, 1000) + .output(dust, MethylIodide) + .buildAndRegister(); + + } +} + diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java b/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java index 196060cc..2def9196 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/Testosteronechain.java @@ -1,8 +1,8 @@ package gregtechfoodoption.recipe.chain; import static gregtech.api.recipes.RecipeMaps.*; -import static gregtech.api.unification.material.Materials.Benzene; -import static gregtech.api.unification.material.Materials.Ethanol; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; import static gregtechfoodoption.GTFOMaterialHandler.*; public class Testosteronechain { @@ -11,13 +11,68 @@ public static void init() { .fluidInputs(Cholesterol.getFluid(1000)) .fluidInputs(Ozone.getFluid(1000)) .fluidOutputs(Pregnenoloneintermediate.getFluid(1000)) + .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) .fluidInputs(Pregnenoloneintermediate.getFluid(1000)) .fluidInputs(hydrogenperoxide.getFluid(1000)) .fluidOutputs(Pregnenolone.getFluid(1000)) + .buildAndRegister(); + FLUID_HEATER_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(PhthalicAcid.getFluid(1000)) + .fluidOutputs(heatedPhthalicAcid.getFluid(1000)) + .buildAndRegister(); + AUTOCLAVE_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(heatedPhthalicAcid.getFluid(1000)) + .output(dust, PhthalicAnhydride, 10) + .buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) .fluidInputs(Benzene.getFluid(1000)) - .fluidInputs(hydrogenperoxide.getFluid(1000)) + .input(dust, PhthalicAnhydride) + .notConsumable(dust, Aluminium) + .fluidOutputs(anthraquinone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(anthraquinone.getFluid(1000)) + .fluidInputs(Hydrogen.getFluid(2000)) + .fluidOutputs(anthrahydroquinone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(anthrahydroquinone.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(2000)) + .fluidOutputs(anthraquinone.getFluid(1000)) + .fluidOutputs(hydrogenperoxide.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Water.getFluid(1000)) + .input(dust, ChromiumTrioxide) + .fluidOutputs(Chromicacid.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Chromicacid.getFluid(1000)) + .fluidInputs(Pregnenolone.getFluid(1000)) + .fluidOutputs(Progesterone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .input(dust, ChromiumTrioxide) + .fluidInputs(Progesterone.getFluid(1000)) + .fluidOutputs(Androstenedioneintermediate.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .fluidInputs(Androstenedioneintermediate.getFluid(1000)) + .fluidInputs(HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Androstenedione.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .input(dust, SodiumBorohydride) + .fluidInputs(Androstenedione.getFluid(1000)) + .fluidOutputs(Testosterone.getFluid(1000)) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().EUt(8).duration(300) + .input(dust, AceticAnhydride) + .fluidInputs(Androstenedione.getFluid(1000)) + .fluidOutputs(Testosterone.getFluid(1000)) + .buildAndRegister(); + } } diff --git a/src/main/java/gregtechfoodoption/recipe/chain/Trenchain.java b/src/main/java/gregtechfoodoption/recipe/chain/Trenchain.java new file mode 100644 index 00000000..3c7ac832 --- /dev/null +++ b/src/main/java/gregtechfoodoption/recipe/chain/Trenchain.java @@ -0,0 +1,63 @@ +package gregtechfoodoption.recipe.chain; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtechfoodoption.GTFOMaterialHandler.*; + +public class Trenchain { + public static void init() { + CHEMICAL_RECIPES.recipeBuilder().EUt(24).duration(1200) + .fluidInputs(Testosterone.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(2000)) + .notConsumable(dust, ChromiumTrioxide) + .notConsumable(dust, Sulfur) + .fluidOutputs(TestosteroneEnoneIntermediate.getFluid(1000)) + .fluidOutputs(Water.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(32).duration(1800) + .fluidInputs(TestosteroneEnoneIntermediate.getFluid(1000)) + .fluidInputs(hydrogenperoxide.getFluid(500)) + .notConsumable(dust, PotassiumHydroxide) + .fluidOutputs(Dienedione.getFluid(500)) + .fluidOutputs(Water.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(16).duration(900) + .fluidInputs(Dienedione.getFluid(850)) + .input(dust, SodiumHydroxide) + .fluidOutputs(DienoloneIntermediate.getFluid(800)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(32).duration(2400) + .fluidInputs(DienoloneIntermediate.getFluid(1000)) + .fluidInputs(Hydrogen.getFluid(3000)) + .notConsumable(dust, Palladium) + .notConsumable(dust, Carbon) + .fluidOutputs(Trenbolone.getFluid(750)) + .fluidOutputs(Water.getFluid(1000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(24).duration(1500) + .fluidInputs(Trenbolone.getFluid(1500)) + .fluidOutputs(PurifiedTrenbolone.getFluid(1000)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(48).duration(3000) + .fluidInputs(PurifiedTrenbolone.getFluid(1000)) + .fluidInputs(AceticAnhydride.getFluid(1000)) + .notConsumable(SulfuricAcid.getFluid(1000)) + .fluidOutputs(TrenboloneAcetate.getFluid(100)) + .fluidOutputs(AceticAcid.getFluid(200)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(48).duration(3000) + .fluidInputs(Oxygen.getFluid(1000)) + .fluidInputs(Hydrogen.getFluid(1000)) + .input(dust, Potassium) + .output(dust, PotassiumHydroxide) + .buildAndRegister(); + } +} + From 7926a67a5f429cae68703353bfb2665b89ce17cb Mon Sep 17 00:00:00 2001 From: lrdmtns Date: Sun, 15 Sep 2024 22:21:05 +0100 Subject: [PATCH 17/17] colors --- .../GTFOMaterialHandler.java | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java index b1a41054..bee69e79 100644 --- a/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java +++ b/src/main/java/gregtechfoodoption/GTFOMaterialHandler.java @@ -636,95 +636,95 @@ public class GTFOMaterialHandler { .color(0xFFD700) .build(); public static final Material yolkethanol = fluidBuilder(22035, "yolk_ethanol_solution") - .color(0xE4EEDA) + .color(0x876c41) .build(); public static final Material lipidsolvent = fluidBuilder(22036, "lipid_solvent_solution") - .color(0xE4EEDA) + .color(0x9c9488) .build(); public static final Material lipidsolution = fluidBuilder(22037, "lipid_solution") - .color(0xE4EEDA) + .color(0x817a6f) .build(); public static final Material Cholesterol = fluidBuilder(22038, "cholesterol") - .color(0xE4EEDA) + .color(0xa87e3c) .build(); public static final Material Ozone = fluidBuilder(22039, "ozone") - .color(0xE4EEDA) + .color(0x3ca896) .build(); public static final Material Pregnenoloneintermediate = fluidBuilder(22040, "pregnenolone_intermediate") - .color(0xE4EEDA) + .color(0x4b1cc9) .build(); public static final Material Pregnenolone = fluidBuilder(22041, "pregnenolone") - .color(0xE4EEDA) + .color(0x4b1cc9) .build(); public static final Material hydrogenperoxide = fluidBuilder(22042, "hydrogen_peroxide") - .color(0xE4EEDA) + .color(0x1cc9ad) .components(Hydrogen, 2, Oxygen, 2) .build(); public static final Material anthraquinone = fluidBuilder(22043, "anthraquinone") - .color(0xE4EEDA) + .color(0x878541) .build(); public static final Material anthrahydroquinone = fluidBuilder(22044, "anthrahydroquinone") - .color(0xE4EEDA) + .color(0x878541) .build(); public static final Material Chromicacid = fluidBuilder(22045, "chromic_acid") - .color(0xE4EEDA) + .color(0xf1f0da) .build(); public static final Material Progesterone = fluidBuilder(22046, "progesterone") - .color(0xE4EEDA) + .color(0xecff00) .build(); public static final Material Androstenedioneintermediate = fluidBuilder(22047, "androstenedione_intermediate") - .color(0xE4EEDA) + .color(0x10b1ac) .build(); public static final Material Androstenedione = fluidBuilder(22048, "androstenedione") - .color(0xE4EEDA) + .color(0x10b1ac) .build(); public static final Material Testosterone = fluidBuilder(22049, "testosterone") - .color(0xE4EEDA) + .color(0xb18a10) .build(); public static final Material heatedPhthalicAcid = fluidBuilder(22050, "heated_phthalic_Acid") - .color(0xE4EEDA) + .color(0x88b110) .build(); public static final Material TrenboloneAcetate = fluidBuilder(22051, "trenbolone_acetate") - .color(0xE4EEDA) + .color(0xaf1212) .build(); public static final Material TestosteroneEnoneIntermediate = fluidBuilder(22052, "testosterone_enone_intermediate") - .color(0xE4EEDA) + .color(0x1012b1) .build(); public static final Material Dienedione = fluidBuilder(22053, "dienedione") - .color(0xE4EEDA) + .color(0x000154) .build(); public static final Material DienoloneIntermediate = fluidBuilder(22054, "dienolone_intermediate") - .color(0xE4EEDA) + .color(0x000154) .build(); public static final Material Trenbolone = fluidBuilder(22055, "trenbolone") - .color(0xE4EEDA) + .color(0x921e1e) .build(); public static final Material PurifiedTrenbolone = fluidBuilder(22056, "purified_trenbolone") - .color(0xE4EEDA) + .color(0xc94a4a) .build(); public static final Material Dimethylformamide = fluidBuilder(22057, "dimethylformamide") - .color(0xE4EEDA) + .color(0x2d5400) .build(); public static final Material Methyltestosterone = fluidBuilder(22058, "methyl_testosterone") - .color(0xE4EEDA) + .color(0x99cba3) .build(); public static final Material SuperdrolSolution = fluidBuilder(22059, "superdrol_solution") - .color(0xE4EEDA) + .color(0xFF3300) .build(); public static final Material PurifiedSuperdrolSolution = fluidBuilder(22060, "purified_superdrol_solution") - .color(0xE4EEDA) + .color(0xFF3300) .build(); public static final Material FormicAcid = fluidBuilder(22061, "formic_acid") - .color(0xE4EEDA) + .color(0xc4cb99) .build(); public static final Material PotassiumCarbonate = fluidBuilder(22062, "potassium_carbonate") - .color(0xE4EEDA) + .color(0xc399cb) .build(); public static final Material PurifiedDianabolSolution = fluidBuilder(22063, "purified_dianabol_solution") - .color(0xE4EEDA) + .color(0x8b378e) .build(); public static final Material DianabolSolution = fluidBuilder(22064, "dianabol_solution") - .color(0xE4EEDA) + .color(0x8b378e) .build(); @@ -879,23 +879,23 @@ public class GTFOMaterialHandler { .components(Sodium, 1, Hydrogen, 4, Boron, 1) .build(); public static final Material PhthalicAnhydride = new Material.Builder(21906, gtfoId("phthalic_anhydride")).dust() - .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .color(0x5d3983).iconSet(MaterialIconSet.SHINY) .components(Carbon, 8, Hydrogen, 4, Oxygen, 3) .build(); public static final Material PotassiumHydroxide = new Material.Builder(21907, gtfoId("potassium_hydroxide")).dust() - .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .color(0x8b6f8c).iconSet(MaterialIconSet.SHINY) .components(Potassium, 1, Hydrogen, 1, Oxygen, 1) .build(); public static final Material MethylIodide = new Material.Builder(21908, gtfoId("methyl_iodide")).dust() - .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .color(0x5e1360).iconSet(MaterialIconSet.SHINY) .components(Carbon, 1, Hydrogen, 3, Iodine, 1) .build(); public static final Material Superdrol = new Material.Builder(21909, gtfoId("superdrol")).dust() - .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .color(0xFF3300).iconSet(MaterialIconSet.SHINY) .components(Carbon, 20, Hydrogen, 30, Oxygen, 2) .build(); public static final Material Dianabol = new Material.Builder(21910, gtfoId("dianabol")).dust() - .color(0xF7F4B9).iconSet(MaterialIconSet.SHINY) + .color(0x8b378e).iconSet(MaterialIconSet.SHINY) .components(Carbon, 20, Hydrogen, 30, Oxygen, 2) .build();