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