From 4ce3391fc247534ca3e835b05f420ed33331c374 Mon Sep 17 00:00:00 2001 From: tong-ge Date: Thu, 19 Feb 2026 14:43:24 +0800 Subject: [PATCH 1/3] add kerosene --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../api/unification/GTLiteMaterials.kt | 1 + .../GTLiteOrganicChemistryMaterials.kt | 12 ++++++++++++ .../loader/recipe/chain/OilsChain.kt | 19 +++++++++++++++++++ .../loader/recipe/chain/RocketFuelsChain.kt | 3 ++- .../assets/gtlitecore/lang/en_us.lang | 15 ++++++++------- .../assets/gtlitecore/lang/zh_cn.lang | 1 + 8 files changed, 46 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19996f267..9fa73fa55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -122,8 +122,8 @@ dependencies { } implementation(deobf(libs.modularui)) api(libs.codeChickenLib) - implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) - implementation(deobf(files("libs/gregtech-1.12.2-master-#2851.jar"))) + implementation(deobf(files("./libs/morphismlib-1.12.2-1.0.0.jar"))) + implementation(deobf(files("./libs/gregtech-1.12.2-master-#2851.jar"))) implementation(deobf(libs.ae2ExtendedLife)) implementation(libs.jei) implementation(libs.theOneProbe) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..aa02b02fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt index d42dc290e..1fb0b65ce 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/GTLiteMaterials.kt @@ -737,6 +737,7 @@ object GTLiteMaterials lateinit var Isophthaloylbisdiethylthiourea: Material lateinit var Silane: Material lateinit var EthyleneVinylAcetatePolymer: Material + lateinit var Kerosene: 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 b0e8f9765..1167f7848 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/GTLiteOrganicChemistryMaterials.kt @@ -24,8 +24,10 @@ import gregtech.api.unification.material.Materials.Hydrogen import gregtech.api.unification.material.Materials.Iodine import gregtech.api.unification.material.Materials.Iron import gregtech.api.unification.material.Materials.Lead +import gregtech.api.unification.material.Materials.LightFuel import gregtech.api.unification.material.Materials.Lithium import gregtech.api.unification.material.Materials.Methanol +import gregtech.api.unification.material.Materials.Naphtha import gregtech.api.unification.material.Materials.Nitrogen import gregtech.api.unification.material.Materials.Oxygen import gregtech.api.unification.material.Materials.Phosphorus @@ -40,6 +42,8 @@ import gregtech.api.unification.material.Materials.Tetranitromethane import gregtech.api.unification.material.Materials.Tin import gregtech.api.unification.material.Materials.VinylAcetate import gregtech.api.unification.material.info.MaterialFlags.DISABLE_DECOMPOSITION +import gregtech.api.unification.material.info.MaterialFlags.EXPLOSIVE +import gregtech.api.unification.material.info.MaterialFlags.FLAMMABLE import gregtech.api.unification.material.info.MaterialFlags.GENERATE_FINE_WIRE import gregtech.api.unification.material.info.MaterialFlags.GENERATE_FOIL import gregtech.api.unification.material.info.MaterialFlags.GENERATE_LENS @@ -297,6 +301,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Truxene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Xylenol import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Xylose import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Zylon +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Kerosene import gregtechlite.gtlitecore.api.unification.material.GTMaterialBuilder.addMaterial object GTLiteOrganicChemistryMaterials @@ -2350,6 +2355,13 @@ object GTLiteOrganicChemistryMaterials components(Ethylene, 3, VinylAcetate, 2) flags(DISABLE_DECOMPOSITION) } + //8235 Kerosene + Kerosene = addMaterial(8235, "kerosene"){ + liquid() + components(Naphtha, 3, LightFuel, 2) + colorAverage() + flags(DISABLE_DECOMPOSITION,FLAMMABLE,EXPLOSIVE) + } } diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/OilsChain.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/OilsChain.kt index 982f525f8..6abc37b04 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/OilsChain.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/OilsChain.kt @@ -11,6 +11,8 @@ import gregtech.api.recipes.RecipeMaps.COMBUSTION_GENERATOR_FUELS import gregtech.api.recipes.RecipeMaps.DISTILLATION_RECIPES import gregtech.api.recipes.RecipeMaps.DISTILLERY_RECIPES import gregtech.api.recipes.RecipeMaps.FLUID_HEATER_RECIPES +import gregtech.api.recipes.RecipeMaps.GAS_TURBINE_FUELS +import gregtech.api.recipes.RecipeMaps.MIXER_RECIPES import gregtech.api.recipes.ingredients.IntCircuitIngredient import gregtech.api.unification.material.Materials.Aluminium import gregtech.api.unification.material.Materials.AluminiumSulfite @@ -60,6 +62,7 @@ import gregtechlite.gtlitecore.api.SECOND import gregtechlite.gtlitecore.api.SU import gregtechlite.gtlitecore.api.TICK import gregtechlite.gtlitecore.api.extension.EUt +import gregtechlite.gtlitecore.api.extension.getFluid import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeHandler import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.CATALYTIC_REFORMER_RECIPES import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ROASTER_RECIPES @@ -68,6 +71,7 @@ import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.AluminiumSulfate import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Carbon5Fraction import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Dicyclopentadiene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DimerizedCarbon5Fraction +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Kerosene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.ParaXylene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Pentane import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.ZSM5 @@ -100,6 +104,15 @@ internal object OilsChain .EUt(VA[HV]) .duration(5 * SECOND) .buildAndRegister() + + //Kerosene Mixing + MIXER_RECIPES.recipeBuilder() + .fluidInputs(Naphtha.getFluid(3000), + LightFuel.getFluid(2000)) + .fluidOutputs(Kerosene.getFluid(5000)) + .EUt(VA[MV]) + .duration(16*TICK) + .buildAndRegister() } private fun ethaneCrackProcessing() @@ -434,6 +447,12 @@ internal object OilsChain .duration(2 * TICK) .buildAndRegister() + //Kerosene(Jet Fuel) + GAS_TURBINE_FUELS.recipeBuilder() + .fluidInputs(Kerosene.getFluid(1)) + .EUt(V[LV]) + .duration(15*TICK) + .buildAndRegister() } private fun catalyticReforming() diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt index 5a02131cd..452d173bc 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt @@ -19,6 +19,7 @@ import gregtechlite.gtlitecore.api.SECOND import gregtechlite.gtlitecore.api.extension.EUt import gregtechlite.gtlitecore.api.recipe.GTLiteRecipeMaps.ROCKET_ENGINE_FUELS import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.DenseHydrazineRocketFuel +import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Kerosene import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.Methylhydrazine import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.MethylhydrazineNitrateRocketFuel import gregtechlite.gtlitecore.api.unification.GTLiteMaterials.RP1RocketFuel @@ -36,7 +37,7 @@ internal object RocketFuelsChain // RP-1 Rocket Fuel MIXER_RECIPES.recipeBuilder() - .fluidInputs(CoalTar.getFluid(1000)) + .fluidInputs(Kerosene.getFluid(1000)) .fluidInputs(Oxygen.getFluid(FluidStorageKeys.LIQUID, 1000)) .fluidOutputs(RP1RocketFuel.getFluid(1000)) .EUt(VA[MV]) diff --git a/src/main/resources/assets/gtlitecore/lang/en_us.lang b/src/main/resources/assets/gtlitecore/lang/en_us.lang index 9a43695cb..c62094f3c 100644 --- a/src/main/resources/assets/gtlitecore/lang/en_us.lang +++ b/src/main/resources/assets/gtlitecore/lang/en_us.lang @@ -3541,12 +3541,12 @@ gtlitecore.material.octene=1-Octene gtlitecore.material.carbon_nanotube=Carbon Nanotube (CNT) item.gtlitecore.material.carbon_nanotube.ingot=Carbon Nanotube (CNT) Bar item.gtlitecore.material.carbon_nanotube.nugget=Carbon Nanotube (CNT) Pellet -item.gtlitecore.material.carbon_nanotube.dust=碳纳米管（CNT）末 -item.gtlitecore.material.carbon_nanotube.dustSmall=小堆碳纳米管（CNT）末 -item.gtlitecore.material.carbon_nanotube.dustTiny=小撮碳纳米管（CNT）末 -item.gtlitecore.material.carbon_nanotube.plate=碳纳米管（CNT）片 -item.gtlitecore.material.carbon_nanotube.foil=薄碳纳米管（CNT）片 -item.gtlitecore.material.carbon_nanotube.wireFine=碳纳米管（CNT）纤维 +item.gtlitecore.material.carbon_nanotube.dust=Carbon Nanotube (CNT) Dust +item.gtlitecore.material.carbon_nanotube.dustSmall=Small Carbon Nanotube (CNT) Dust +item.gtlitecore.material.carbon_nanotube.dustTiny=Tiny Carbon Nanotube (CNT) Dust +item.gtlitecore.material.carbon_nanotube.plate=Carbon Nanotube (CNT) Sheet +item.gtlitecore.material.carbon_nanotube.foil=Thin Carbon Nanotube (CNT) Sheet +item.gtlitecore.material.carbon_nanotube.wireFine=Carbon Nanotube (CNT) Fiber gtlitecore.material.sarcosine=Sarcosine gtlitecore.material.ferrocene=Ferrocene gtlitecore.material.ferrocenylfulleropyrddolidine=Ferrocenylfulleropyrddolidine @@ -3611,6 +3611,7 @@ gtlitecore.material.diethylthiourea=Diethylthiourea gtlitecore.material.isophthaloylbisdiethylthiourea=Isophthaloylbisdiethylthiourea gtlitecore.material.silane=Silane gtlitecore.material.ethylene_vinyl_acetate_polymer=Ethylene-Vinyl Acetate Polymer (EVA) +gtlitecore.material.kerosene=Kerosene (Jet Fuel) gtlitecore.material.latex=Latex gtlitecore.material.resin=Resin @@ -3885,7 +3886,7 @@ gtlitecore.tooltip.machine.energy_mode.emitter_casing=§6-%s%%/Emitter Casing Ti gtlitecore.tooltip.machine.energy_mode.sensor_casing=§6-%s%%/Sensor Casing Tier gtlitecore.tooltip.machine.energy_mode.field_gen_casing=§6-%s%%/Field Generator Casing Tier gtlitecore.tooltip.machine.energy_mode.processor_casing=§6-%s%%/Processor Casing Tier -gtlitecore.tooltip.machine.energy_mode.borosilicate_glass§6-%s%%/Borosilicate Glass Tier +gtlitecore.tooltip.machine.energy_mode.borosilicate_glass=§6-%s%%/Borosilicate Glass Tier gtlitecore.tooltip.machine.energy_mode.stabilization_field_gen=§6-%s%%/Stabilization Field Generator Tier gtlitecore.tooltip.machine.energy_mode.fusion_coil=§6-%s%%/Fusion Coil Tier gtlitecore.tooltip.machine.laser_hatch=Laser Hatch Support: §9Enabled diff --git a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang index c98ff4e0a..3ab7493c7 100644 --- a/src/main/resources/assets/gtlitecore/lang/zh_cn.lang +++ b/src/main/resources/assets/gtlitecore/lang/zh_cn.lang @@ -3616,6 +3616,7 @@ gtlitecore.material.diethylthiourea=二乙硫脲 gtlitecore.material.isophthaloylbisdiethylthiourea=间苯二甲酰二乙硫脲 gtlitecore.material.silane=硅烷 gtlitecore.material.ethylene_vinyl_acetate_polymer=乙烯-乙酸乙烯酯共聚物（EVA） +gtlitecore.material.kerosene=航空煤油 gtlitecore.material.latex=胶乳 gtlitecore.material.resin=树脂 From b4ffe87400e4b112668583bcda415cbbb19d43f8 Mon Sep 17 00:00:00 2001 From: tong-ge Date: Thu, 19 Feb 2026 23:34:46 +0800 Subject: [PATCH 2/3] revert RP-1 for using coal tar --- .../gtlitecore/loader/recipe/chain/RocketFuelsChain.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt index 452d173bc..27e3a2ead 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/loader/recipe/chain/RocketFuelsChain.kt @@ -37,7 +37,7 @@ internal object RocketFuelsChain // RP-1 Rocket Fuel MIXER_RECIPES.recipeBuilder() - .fluidInputs(Kerosene.getFluid(1000)) + .fluidInputs(CoalTar.getFluid(1000)) .fluidInputs(Oxygen.getFluid(FluidStorageKeys.LIQUID, 1000)) .fluidOutputs(RP1RocketFuel.getFluid(1000)) .EUt(VA[MV]) From ace8393af154508678de9103341379e6c5b1516f Mon Sep 17 00:00:00 2001 From: tong-ge Date: Thu, 19 Feb 2026 23:45:30 +0800 Subject: [PATCH 3/3] revert buildscript change --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9fa73fa55..19996f267 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -122,8 +122,8 @@ dependencies { } implementation(deobf(libs.modularui)) api(libs.codeChickenLib) - implementation(deobf(files("./libs/morphismlib-1.12.2-1.0.0.jar"))) - implementation(deobf(files("./libs/gregtech-1.12.2-master-#2851.jar"))) + implementation(deobf(files("libs/morphismlib-1.12.2-1.0.0.jar"))) + implementation(deobf(files("libs/gregtech-1.12.2-master-#2851.jar"))) implementation(deobf(libs.ae2ExtendedLife)) implementation(libs.jei) implementation(libs.theOneProbe) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa02b02fc..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists