From 4ec762e6a509e5345f9128832bec32c1dac3ffd4 Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Sat, 25 Jul 2026 16:59:16 +0800 Subject: [PATCH 1/2] add bpa polycarbonate glass chain --- .../api/unification/GTLiteMaterials.kt | 3 + .../GTLiteOrganicChemistryMaterials.kt | 28 +++++++++ .../properties/GTLiteMaterialProperties.kt | 2 + .../recipe/chain/BPAPolycarbonateChain.kt | 59 +++++++++++++++++++ .../recipe/chain/ChemistryRecipeList.kt | 1 + .../loader/recipe/machine/PolisherRecipes.kt | 10 ++++ .../assets/gtlitecore/lang/en_us.lang | 3 + .../assets/gtlitecore/lang/zh_cn.lang | 5 +- 8 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/BPAPolycarbonateChain.kt diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt index 705f1338a..7c8534539 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt @@ -742,6 +742,9 @@ object GTLiteMaterials lateinit var MethylStearate: Material lateinit var GlycidylStearate: Material lateinit var Monoglyceride: Material + lateinit var DimethylCarbonate: Material + lateinit var DiphenylCarbonate: Material + lateinit var BPAPolycarbonate: Material // endregion diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt index 57b965315..b9e7e8641 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt @@ -79,6 +79,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Aniline import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.AscorbicAcid import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Azafullerene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BETS +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BPAPolycarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Benzaldehyde import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BenzylBromide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BenzylChloride @@ -132,6 +133,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Difluorobenzophen import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Diiodobiphenyl import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Diisopropylcarbodiimide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Diketopyrrolopyrrole +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylCarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylSulfide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylTerephthalate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylacetamide @@ -140,6 +142,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylaminopyri import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylformamide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dinitrodipropanyloxybenzene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dinitrotoluene +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiphenylCarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DirectBrown77 import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DitertbutylDicarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Durene @@ -2420,6 +2423,31 @@ object GTLiteOrganicChemistryMaterials components(Carbon, 21, Hydrogen, 42, Oxygen, 4) flags(DISABLE_DECOMPOSITION) } + + // 8240 Dimethyl Carbonate + DimethylCarbonate = addMaterial(8240, "dimethyl_carbonate") + { + liquid() + color(0xC5EB9E) + components(Carbon, 3, Hydrogen, 6, Oxygen, 3) + } + + // 8241 Diphenyl Carbonate + DiphenylCarbonate = addMaterial(8241, "diphenyl_carbonate") + { + liquid() + colorAverage(DimethylCarbonate, Benzene) + components(Carbon, 13, Hydrogen, 10, Oxygen, 3) + } + + // 8242 BPA Polycarbonate + BPAPolycarbonate = addMaterial(8242, "bpa_polycarbonate") + { + polymer() + liquid() + color(0xE3EBDA) + flags(DISABLE_DECOMPOSITION, NO_SMASHING, NO_SMELTING) + components(Carbon, 16, Hydrogen, 14, Oxygen, 3)} } // @formatter:on diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt index dd7754d09..96b238bba 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt @@ -210,6 +210,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiethylSulfide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiethylhexylPhosphoricAcid import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Diethylthiourea import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Difluorobenzophenone +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylCarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylSulfide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylacetamide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylamineHydrochloride @@ -879,6 +880,7 @@ object GTLiteMaterialProperties Trisaminoethylamine.setFormula("(NH2CH2CH2)3N", true) Ethylamine.setFormula("C2H5NH2", true) Diethylthiourea.setFormula("(C2H5NH)2CS", true) + DimethylCarbonate.setFormula("(CH3O)2CO", true) // endregion diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/BPAPolycarbonateChain.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/BPAPolycarbonateChain.kt new file mode 100644 index 000000000..ae4862b59 --- /dev/null +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/BPAPolycarbonateChain.kt @@ -0,0 +1,59 @@ +package gregtechlite.gtlitecore.loader.recipe.chain + +import gregtech.api.GTValues.EV +import gregtech.api.GTValues.HV +import gregtech.api.GTValues.IV +import gregtech.api.GTValues.L +import gregtech.api.GTValues.VA +import gregtech.api.recipes.RecipeMaps.CHEMICAL_RECIPES +import gregtech.api.unification.material.Materials.BisphenolA +import gregtech.api.unification.material.Materials.CarbonDioxide +import gregtech.api.unification.material.Materials.Methanol +import gregtech.api.unification.material.Materials.Phenol +import gregtech.api.unification.material.Materials.Water +import gregtechlite.gtlitecore.api.SECOND +import gregtechlite.gtlitecore.api.extension.EUt +import gregtechlite.gtlitecore.api.extension.addRecipe +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BPAPolycarbonate +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylCarbonate +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiphenylCarbonate + +internal object BPAPolycarbonateChain +{ + // @formatter:off + + fun init() + { + // CO2 + 2CH4O -> C3H6O3 + H2O + CHEMICAL_RECIPES.addRecipe { + fluidInputs(CarbonDioxide.getFluid(1000)) + fluidInputs(Methanol.getFluid(2000)) + fluidOutputs(DimethylCarbonate.getFluid(1000)) + fluidOutputs(Water.getFluid(1000)) + EUt(VA[HV]) + duration(6 * SECOND) + } + + // C3H6O3 + 2C6H6O -> C13H10O3 + 2CH4O (cycle) + CHEMICAL_RECIPES.addRecipe { + fluidInputs(DimethylCarbonate.getFluid(1000)) + fluidInputs(Phenol.getFluid(2000)) + fluidOutputs(DiphenylCarbonate.getFluid(1000)) + fluidOutputs(Methanol.getFluid(2000)) + EUt(VA[EV]) + duration(6 * SECOND) + } + + // C13H10O3 + C15H16O2 -> BPA Polycarbonate + 2C6H6O (cycle) + CHEMICAL_RECIPES.addRecipe { + fluidInputs(DiphenylCarbonate.getFluid(1000)) + fluidInputs(BisphenolA.getFluid(1000)) + fluidOutputs(BPAPolycarbonate.getFluid(L)) + fluidOutputs(Phenol.getFluid(2000)) + EUt(VA[IV]) + duration(8 * SECOND) + } + } + + // @formatter:on +} \ No newline at end of file diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt index c3597dc93..3365db4c2 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt @@ -101,6 +101,7 @@ internal object ChemistryRecipeList RHTIHChain.init() SolarPanelChain.init() BorosilicateGlassChain.init() + BPAPolycarbonateChain.init() } // @formatter:on diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt index 4c6bf87e5..e66a4a08e 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt @@ -34,6 +34,7 @@ import gregtechlite.gtlitecore.api.extension.outputs import gregtechlite.gtlitecore.api.extension.removeRecipe import gregtechlite.gtlitecore.api.extension.stack import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.POLISHER_RECIPES +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BPAPolycarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BlueSchist import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.ErbiumDopedZBLANGlass import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.GSTGlass @@ -301,6 +302,15 @@ internal object PolisherRecipes EUt(VA[HV]) duration(5 * SECOND) } + + // BPA Polycarbonate Glass + POLISHER_RECIPES.addRecipe { + input(block, BPAPolycarbonate) + outputs(GlassCasing.BPA_POLYCARBONATE.getStack(2)) + output(dust, BPAPolycarbonate) + EUt(VA[HV]) + duration(5 * SECOND) + } } // @formatter:on diff --git a/src/main/resources/assets/gtlitecore/lang/en_us.lang b/src/main/resources/assets/gtlitecore/lang/en_us.lang index fe896ec14..589242f75 100644 --- a/src/main/resources/assets/gtlitecore/lang/en_us.lang +++ b/src/main/resources/assets/gtlitecore/lang/en_us.lang @@ -3859,6 +3859,9 @@ gtlitecore.material.sodium_stearate=Sodium Stearate gtlitecore.material.methyl_stearate=Methyl Stearate gtlitecore.material.glycidyl_stearate=Glycidyl Stearate gtlitecore.material.monoglyceride=Monoglyceride +gtlitecore.material.dimethyl_carbonate=Dimethyl Carbonate +gtlitecore.material.diphenyl_carbonate=Diphenyl Carbonate +gtlitecore.material.bpa_polycarbonate=Bisphenol A Polycarbonate gtlitecore.material.latex=Latex gtlitecore.material.resin=Resin diff --git a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang index 7d4b13260..56348b230 100644 --- a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang +++ b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang @@ -653,7 +653,7 @@ tile.gtlitecore.glass_casing_01.red_matter_borosilicate.name=红物质强化硼 tile.gtlitecore.glass_casing_02.pmma.name=PMMA玻璃 tile.gtlitecore.glass_casing_02.pmma.tooltip=亚克力玻璃 -tile.gtlitecore.glass_casing_02.bpa_polycarbonate.name=BPA聚碳酸酯玻璃 +tile.gtlitecore.glass_casing_02.bpa_polycarbonate.name=双酚A聚碳酸酯玻璃 tile.gtlitecore.glass_casing_02.bpa_polycarbonate.tooltip=灰色石英 tile.gtlitecore.glass_casing_02.cbdo_polycarbonate.name=CBDO聚碳酸酯玻璃 tile.gtlitecore.glass_casing_02.cbdo_polycarbonate.tooltip=并不是挡风玻璃 @@ -3859,6 +3859,9 @@ gtlitecore.material.sodium_stearate=硬脂酸钠 gtlitecore.material.methyl_stearate=硬脂酸甲酯 gtlitecore.material.glycidyl_stearate=硬脂酸缩水甘油酯 gtlitecore.material.monoglyceride=单硬脂酸甘油酯 +gtlitecore.material.dimethyl_carbonate=碳酸二甲酯 +gtlitecore.material.diphenyl_carbonate=碳酸二苯酯 +gtlitecore.material.bpa_polycarbonate=双酚A聚碳酸酯 gtlitecore.material.latex=胶乳 gtlitecore.material.resin=树脂 From 0b62fc9c085102dd9976a3e93509e70bdf8e377a Mon Sep 17 00:00:00 2001 From: Magic_Sweepy Date: Sat, 25 Jul 2026 17:46:12 +0800 Subject: [PATCH 2/2] add cbdo polycarbonate glass chain --- .../api/unification/GTLiteMaterials.kt | 5 ++ .../GTLiteOrganicChemistryMaterials.kt | 52 ++++++++++- .../material/info/GTLiteMaterialFlags.kt | 2 + .../properties/GTLiteMaterialProperties.kt | 2 + .../recipe/chain/CBDOPolycarbonateChain.kt | 88 +++++++++++++++++++ .../recipe/chain/ChemistryRecipeList.kt | 1 + .../loader/recipe/machine/PolisherRecipes.kt | 10 +++ .../assets/gtlitecore/lang/en_us.lang | 5 ++ .../assets/gtlitecore/lang/zh_cn.lang | 7 +- 9 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/CBDOPolycarbonateChain.kt diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt index 7c8534539..a6a7689d8 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt @@ -745,6 +745,11 @@ object GTLiteMaterials lateinit var DimethylCarbonate: Material lateinit var DiphenylCarbonate: Material lateinit var BPAPolycarbonate: Material + lateinit var IsobutyricAcid: Material + lateinit var IsobutyricAnhydride: Material + lateinit var Dimethylketene: Material + lateinit var Tetramethylcyclobutanediol: Material + lateinit var CBDOPolycarbonate: Material // endregion diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt index b9e7e8641..17db887da 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt @@ -11,11 +11,13 @@ import gregtech.api.unification.material.Materials.Benzene import gregtech.api.unification.material.Materials.Boron import gregtech.api.unification.material.Materials.Bromine import gregtech.api.unification.material.Materials.Butene +import gregtech.api.unification.material.Materials.Butyraldehyde import gregtech.api.unification.material.Materials.Carbon import gregtech.api.unification.material.Materials.Chlorine import gregtech.api.unification.material.Materials.Dimethylamine import gregtech.api.unification.material.Materials.Dimethylhydrazine import gregtech.api.unification.material.Materials.EXT_METAL +import gregtech.api.unification.material.Materials.Ethenone import gregtech.api.unification.material.Materials.Ethylene import gregtech.api.unification.material.Materials.Fluorine import gregtech.api.unification.material.Materials.Gallium @@ -97,6 +99,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Bromomethane import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Butanediol import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Butanol import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Butyllithium +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.CBDOPolycarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Carbamide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.CarbonNanotube import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Cellulose @@ -140,6 +143,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylacetamide import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimethylamineHydrochloride import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylaminopyridine import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylformamide +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylketene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dinitrodipropanyloxybenzene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dinitrotoluene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiphenylCarbonate @@ -195,6 +199,8 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Hydroxyquinoline import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Indanone import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Indene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Indigo +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsobutyricAcid +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsobutyricAnhydride import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Isochloropropane import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Isophthaloylbisdiethylthiourea import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsopropylAlcohol @@ -288,6 +294,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Tetraethylammoniu import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Tetrahydrofuran import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.TetramethylammoniumChloride import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.TetramethylammoniumHydroxide +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Tetramethylcyclobutanediol import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.TetrasodiumEDTA import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.ThionylChloride import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.TolueneDiisocyanate @@ -2447,7 +2454,50 @@ object GTLiteOrganicChemistryMaterials liquid() color(0xE3EBDA) flags(DISABLE_DECOMPOSITION, NO_SMASHING, NO_SMELTING) - components(Carbon, 16, Hydrogen, 14, Oxygen, 3)} + components(Carbon, 16, Hydrogen, 14, Oxygen, 3) + } + + // 8243 Isobutyric Acid + IsobutyricAcid = addMaterial(8243, "isobutyric_acid") + { + liquid() + colorAverage(Butyraldehyde, Oxygen) + components(Carbon, 4, Hydrogen, 8, Oxygen, 2) + } + + // 8244 Isobutyric Anhydride + IsobutyricAnhydride = addMaterial(8244, "isobutyric_anhydride") + { + liquid() + colorAverage(IsobutyricAcid, AceticAnhydride) + components(Carbon, 8, Hydrogen, 14, Oxygen, 3) + } + + // 8245 Dimethylketene + Dimethylketene = addMaterial(8245, "dimethylketene") + { + liquid() + colorAverage(Ethenone, IsobutyricAnhydride) + components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + } + + // 8246 Tetramethylcyclobutanediol (CBDO) + Tetramethylcyclobutanediol = addMaterial(8246, "tetramethylcyclobutanediol") + { + liquid() + colorAverage(Dimethylketene, Butanediol) + components(Carbon, 8, Hydrogen, 16, Oxygen, 2) + } + + // 8247 CBDO Polycarbonate + CBDOPolycarbonate = addMaterial(8247, "cbdo_polycarbonate") + { + polymer() + liquid() + color(0xDFDFDF) + flags(DISABLE_DECOMPOSITION, NO_SMASHING, NO_SMELTING) + components(Carbon, 9, Hydrogen, 14, Oxygen, 3) + } } // @formatter:on diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialFlags.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialFlags.kt index a21d7c76f..cd77ad7f3 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialFlags.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialFlags.kt @@ -159,6 +159,7 @@ import gregtech.api.unification.material.Materials.VanadiumSteel import gregtech.api.unification.material.Materials.WroughtIron import gregtech.api.unification.material.Materials.Wulfenite import gregtech.api.unification.material.Materials.Ytterbium +import gregtech.api.unification.material.Materials.Yttrium import gregtech.api.unification.material.Materials.YttriumBariumCuprate import gregtech.api.unification.material.Materials.Zinc import gregtech.api.unification.material.Materials.Zircaloy4 @@ -601,6 +602,7 @@ object GTLiteMaterialFlags Nihonium.addFlags(GENERATE_ROD) Francium.addFlags(GENERATE_ROD) Moscovium.addFlags(GENERATE_ROD) + Yttrium.addFlags(GENERATE_ROD) // stickLong Chrome.addFlags(GENERATE_LONG_ROD) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt index 96b238bba..9f0b3fbfa 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/properties/GTLiteMaterialProperties.kt @@ -249,6 +249,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.HydroxyquinolineA import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Indanone import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Indene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Iron3Sulfate +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsobutyricAcid import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Isochloropropane import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsopropylChloride import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Jade @@ -881,6 +882,7 @@ object GTLiteMaterialProperties Ethylamine.setFormula("C2H5NH2", true) Diethylthiourea.setFormula("(C2H5NH)2CS", true) DimethylCarbonate.setFormula("(CH3O)2CO", true) + IsobutyricAcid.setFormula("(CH3)2CHCO2H", true) // endregion diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/CBDOPolycarbonateChain.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/CBDOPolycarbonateChain.kt new file mode 100644 index 000000000..913ba4d9a --- /dev/null +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/CBDOPolycarbonateChain.kt @@ -0,0 +1,88 @@ +package gregtechlite.gtlitecore.loader.recipe.chain + +import gregtech.api.GTValues.EV +import gregtech.api.GTValues.HV +import gregtech.api.GTValues.IV +import gregtech.api.GTValues.L +import gregtech.api.GTValues.MV +import gregtech.api.GTValues.UV +import gregtech.api.GTValues.VA +import gregtech.api.recipes.RecipeMaps.CHEMICAL_RECIPES +import gregtech.api.recipes.RecipeMaps.PYROLYSE_RECIPES +import gregtech.api.unification.material.Materials.AceticAcid +import gregtech.api.unification.material.Materials.Butyraldehyde +import gregtech.api.unification.material.Materials.Hydrogen +import gregtech.api.unification.material.Materials.Oxygen +import gregtech.api.unification.material.Materials.Phenol +import gregtech.api.unification.material.Materials.Rhenium +import gregtech.api.unification.material.Materials.Yttrium +import gregtech.api.unification.ore.OrePrefix.dust +import gregtech.api.unification.ore.OrePrefix.stick +import gregtechlite.gtlitecore.api.SECOND +import gregtechlite.gtlitecore.api.extension.EUt +import gregtechlite.gtlitecore.api.extension.addRecipe +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.AceticAnhydride +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.CBDOPolycarbonate +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dimethylketene +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DiphenylCarbonate +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsobutyricAcid +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.IsobutyricAnhydride +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Tetramethylcyclobutanediol + +internal object CBDOPolycarbonateChain +{ + // @formatter:off + + fun init() + { + // C4H8O + O -> C4H8O2 + CHEMICAL_RECIPES.addRecipe { + fluidInputs(Butyraldehyde.getFluid(1000)) + fluidInputs(Oxygen.getFluid(1000)) + fluidOutputs(IsobutyricAcid.getFluid(1000)) + EUt(VA[HV]) + duration(9 * SECOND) + } + + // 2C4H8O2 + C4H6O3 -> C8H14O3 + 2C2H4O2 + CHEMICAL_RECIPES.addRecipe { + fluidInputs(IsobutyricAcid.getFluid(2000)) + fluidInputs(AceticAnhydride.getFluid(1000)) + fluidOutputs(IsobutyricAnhydride.getFluid(1000)) + fluidOutputs(AceticAcid.getFluid(2000)) + EUt(VA[EV]) + duration(3 * SECOND) + } + + // C8H14O3 -> 2C4H6O2 + 2H2O (lost) + PYROLYSE_RECIPES.addRecipe { + notConsumable(stick, Yttrium) + fluidInputs(IsobutyricAnhydride.getFluid(1000)) + fluidOutputs(Dimethylketene.getFluid(2000)) + EUt(VA[IV]) + duration(12 * SECOND) + } + + // 2C4H6O2 + 4H -> C8H16O2 + CHEMICAL_RECIPES.addRecipe { + notConsumable(dust, Rhenium) + fluidInputs(Dimethylketene.getFluid(2000)) + fluidInputs(Hydrogen.getFluid(4000)) + fluidOutputs(Tetramethylcyclobutanediol.getFluid(1000)) + EUt(VA[UV]) + duration(6 * SECOND) + } + + // C8H16O2 + C13H10O3 -> C9H14O3 + 2C6H6O + CHEMICAL_RECIPES.addRecipe { + fluidInputs(Tetramethylcyclobutanediol.getFluid(1000)) + fluidInputs(DiphenylCarbonate.getFluid(1000)) + fluidOutputs(CBDOPolycarbonate.getFluid(L)) + fluidOutputs(Phenol.getFluid(2000)) + EUt(VA[MV]) + duration(8 * SECOND) + } + } + + // @formatter:on +} \ No newline at end of file diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt index 3365db4c2..6cd336adc 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/ChemistryRecipeList.kt @@ -102,6 +102,7 @@ internal object ChemistryRecipeList SolarPanelChain.init() BorosilicateGlassChain.init() BPAPolycarbonateChain.init() + CBDOPolycarbonateChain.init() } // @formatter:on diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt index e66a4a08e..867e14b70 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/machine/PolisherRecipes.kt @@ -36,6 +36,7 @@ import gregtechlite.gtlitecore.api.extension.stack import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.POLISHER_RECIPES import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BPAPolycarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.BlueSchist +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.CBDOPolycarbonate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.ErbiumDopedZBLANGlass import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.GSTGlass import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.GreenSchist @@ -311,6 +312,15 @@ internal object PolisherRecipes EUt(VA[HV]) duration(5 * SECOND) } + + // CBDO Polycarbonate Glass + POLISHER_RECIPES.addRecipe { + input(block, CBDOPolycarbonate) + outputs(GlassCasing.CBDO_POLYCARBONATE.getStack(2)) + output(dust, CBDOPolycarbonate) + EUt(VA[HV]) + duration(5 * SECOND) + } } // @formatter:on diff --git a/src/main/resources/assets/gtlitecore/lang/en_us.lang b/src/main/resources/assets/gtlitecore/lang/en_us.lang index 589242f75..da2107bd7 100644 --- a/src/main/resources/assets/gtlitecore/lang/en_us.lang +++ b/src/main/resources/assets/gtlitecore/lang/en_us.lang @@ -3862,6 +3862,11 @@ gtlitecore.material.monoglyceride=Monoglyceride gtlitecore.material.dimethyl_carbonate=Dimethyl Carbonate gtlitecore.material.diphenyl_carbonate=Diphenyl Carbonate gtlitecore.material.bpa_polycarbonate=Bisphenol A Polycarbonate +gtlitecore.material.isobutyric_acid=Isobutyric Acid +gtlitecore.material.isobutyric_anhydride=Isobutyric Anhydride +gtlitecore.material.dimethylketene=Dimethylketene +gtlitecore.material.tetramethylcyclobutanediol=Tetramethylcyclobutanediol (CBDO) +gtlitecore.material.cbdo_polycarbonate=CBDO Polycarbonate gtlitecore.material.latex=Latex gtlitecore.material.resin=Resin diff --git a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang index 56348b230..75f1062c6 100644 --- a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang +++ b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang @@ -653,7 +653,7 @@ tile.gtlitecore.glass_casing_01.red_matter_borosilicate.name=红物质强化硼 tile.gtlitecore.glass_casing_02.pmma.name=PMMA玻璃 tile.gtlitecore.glass_casing_02.pmma.tooltip=亚克力玻璃 -tile.gtlitecore.glass_casing_02.bpa_polycarbonate.name=双酚A聚碳酸酯玻璃 +tile.gtlitecore.glass_casing_02.bpa_polycarbonate.name=BPA聚碳酸酯玻璃 tile.gtlitecore.glass_casing_02.bpa_polycarbonate.tooltip=灰色石英 tile.gtlitecore.glass_casing_02.cbdo_polycarbonate.name=CBDO聚碳酸酯玻璃 tile.gtlitecore.glass_casing_02.cbdo_polycarbonate.tooltip=并不是挡风玻璃 @@ -3862,6 +3862,11 @@ gtlitecore.material.monoglyceride=单硬脂酸甘油酯 gtlitecore.material.dimethyl_carbonate=碳酸二甲酯 gtlitecore.material.diphenyl_carbonate=碳酸二苯酯 gtlitecore.material.bpa_polycarbonate=双酚A聚碳酸酯 +gtlitecore.material.isobutyric_acid=异丁酸 +gtlitecore.material.isobutyric_anhydride=异丁酸酐 +gtlitecore.material.dimethylketene=二甲基乙烯酮 +gtlitecore.material.tetramethylcyclobutanediol=四甲基环丁二醇（CBDO） +gtlitecore.material.cbdo_polycarbonate=CBDO聚碳酸酯 gtlitecore.material.latex=胶乳 gtlitecore.material.resin=树脂