Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ object GTLiteMaterials
lateinit var Isophthaloylbisdiethylthiourea: Material
lateinit var Silane: Material
lateinit var EthyleneVinylAcetatePolymer: Material
lateinit var Kerosene: Material

// endregion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
}

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions src/main/resources/assets/gtlitecore/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/gtlitecore/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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=树脂
Expand Down