illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-08-11 22:59:40 +01:00
commit 7bd4862c5e
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1287,9 +1287,9 @@ const registerGTCEURecipes = (event) => {
.EUt(GTValues.VH[GTValues.EV]) .EUt(GTValues.VH[GTValues.EV])
event.recipes.gtceu.large_chemical_reactor('tfg:solar_coolant_t2') event.recipes.gtceu.large_chemical_reactor('tfg:solar_coolant_t2')
.inputFluids(Fluid.of('tfg:solar_coolant', 1000), Fluid.of('gtceu:argon', 1000)) .inputFluids(Fluid.of('tfg:solar_coolant', 8000), Fluid.of('gtceu:argon', 1000))
.itemInputs(Item.of('#forge:aerogels')) .itemInputs(Item.of('#forge:aerogels'))
.outputFluids(Fluid.of('tfg:solar_coolant_tier2', 1000)) .outputFluids(Fluid.of('tfg:solar_coolant_tier2', 8000))
.duration(20*15) .duration(20*15)
.EUt(GTValues.VH[GTValues.IV]) .EUt(GTValues.VH[GTValues.IV])

8
kubejs/server_scripts/gregtech/recipes.machines.js
View file

@ -1119,8 +1119,8 @@ function registerGTCEuMachineRecipes(event) {
.notConsumable('ad_astra:photovoltaic_etrium_cell') .notConsumable('ad_astra:photovoltaic_etrium_cell')
.perTick(true) .perTick(true)
.chancedFluidInput('tfg:solar_coolant 10', 5000, 0) .chancedFluidInput('tfg:solar_coolant 10', 5000, 0)
.inputFluids('tfg:cryogenized_fluix 40') .inputFluids('tfg:cryogenized_fluix 4')
.outputFluids('tfg:fluix 10') .outputFluids('tfg:fluix 1')
.perTick(false) .perTick(false)
.duration(20 * 20) .duration(20 * 20)
.daytime(false) .daytime(false)
@ -1142,8 +1142,8 @@ function registerGTCEuMachineRecipes(event) {
.notConsumable('ad_astra:photovoltaic_vesnium_cell') .notConsumable('ad_astra:photovoltaic_vesnium_cell')
.perTick(true) .perTick(true)
.chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0)
.inputFluids('tfg:cryogenized_fluix 40') .inputFluids('tfg:cryogenized_fluix 4')
.outputFluids('tfg:fluix 10') .outputFluids('tfg:fluix 1')
.perTick(false) .perTick(false)
.duration(20 * 20) .duration(20 * 20)
.daytime(false) .daytime(false)

3
kubejs/startup_scripts/gtceu/machines.js
View file

@ -340,7 +340,7 @@ const registerGTCEuMachines = (event) => {
.rotationState(RotationState.NON_Y_AXIS) .rotationState(RotationState.NON_Y_AXIS)
.generator(true) .generator(true)
.recipeType('large_solar_panel_tier3') .recipeType('large_solar_panel_tier3')
.noRecipeModifier() .recipeModifiers(GTRecipeModifiers.PARALLEL_HATCH)
.appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh')) .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh'))
.pattern(definition => FactoryBlockPattern.start() .pattern(definition => FactoryBlockPattern.start()
.aisle(" A A ", " A A ", " A A ", " S S ", " S S ", " S S ", " CCCCCCCCC ", " ", " ", " ", " ", " ", " ", " ") .aisle(" A A ", " A A ", " A A ", " S S ", " S S ", " S S ", " CCCCCCCCC ", " ", " ", " ", " ", " ", " ", " ")
@ -414,6 +414,7 @@ const registerGTCEuMachines = (event) => {
.where("I", Predicates.blocks("tfg:casings/machine_casing_iron_desh") .where("I", Predicates.blocks("tfg:casings/machine_casing_iron_desh")
.or(Predicates.autoAbilities(definition.getRecipeTypes())) .or(Predicates.autoAbilities(definition.getRecipeTypes()))
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
) )
.where(" ", Predicates.any()) .where(" ", Predicates.any())
.build() .build()

2
kubejs/startup_scripts/tfg/materials.js
View file

@ -173,7 +173,7 @@ const registerTFGMaterials = (event) => {
event.create('tfg:solar_coolant_tier2') event.create('tfg:solar_coolant_tier2')
.gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(73)) .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(73))
.formula('(He³8O11H11)(Ar)(?)') .formula('(He³8O11H11)8(Ar)(?)')
.color(0xfeff5d) .color(0xfeff5d)
//end region //end region