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-12-15 18:46:47 +00:00
commit aeca63edfb
8 changed files with 244 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -456,7 +456,7 @@ const registerGTCEuMachines = (event) => {
.machine((holder) => new CoilWorkableElectricMultiblockMachine(holder))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType('coal_liquefaction_tower')
.recipeModifiers([(machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe), GTRecipeModifiers.BATCH_MODE])
.recipeModifiers([(machine, recipe) => GTRecipeModifiers.pyrolyseOvenOverclock(machine, recipe), GTRecipeModifiers.BATCH_MODE])
.appearanceBlock(() => Block.getBlock('gtceu:solid_machine_casing'))
.pattern(definition => FactoryBlockPattern.start()
.aisle('CCC', 'D D', 'D D', 'DED', 'DED', 'BBB')

14
kubejs/startup_scripts/tfg/items.js
View file

@ -68,4 +68,18 @@ const registerTFGItems = (event) => {
event.create('gtceu:refined_rose_quartz_ore').texture('tfg:item/deprecated')
event.create('gtceu:rose_quartz_lens').texture('tfg:item/deprecated')
event.create('gtceu:rose_quartz_plate').texture('tfg:item/deprecated')
// Add item for BTX Fuel
event.create('tfg:catalyser_pt_re_zsm')
.translationKey('item.tfg.catalyser_pt_re_zsm')
.texture('tfg:item/btx/catalyser_zsm')
event.create('tfg:used_catalyser')
.translationKey('item.tfg.used_catalyser')
.texture('tfg:item/btx/used_catalyser')
event.create('tfg:loaded_resin')
.translationKey('item.tfg.loaded_resin')
.texture('tfg:item/btx/loaded_resin')
}

86
kubejs/startup_scripts/tfg/materials.power_rework.js
View file

@ -52,4 +52,90 @@ const registerTFGPowerReworkMaterials = (event) => {
.gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(540))
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
//#region Materials for BTX
// Propylene
event.create('tfg:propylene')
.gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(350))
.components('3x carbon', '6x hydrogen')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xffb347)
.secondaryColor(0xffe0b2)
// Crude Mixed Gas
event.create('tfg:crude_mixed_gas')
.gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(500))
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0x9bb6c9)
.secondaryColor(0xd7e7ef)
// Sodium Silicate
event.create('tfg:sodium_silicate')
.liquid(new GTFluidBuilder().temperature(293))
.components('1x sodium', '1x silicon', '4x oxygen', '4x hydrogen')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xcce0f0)
.secondaryColor(0xa9c6db)
// Sodium Aluminium
event.create('tfg:sodium_aluminium')
.dust()
.components('2x sodium', '1x aluminium', '2x oxygen')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.iconSet(GTMaterialIconSet.FLINT)
.color(0xf0e68c)
.secondaryColor(0xded7a8)
// TPAOH
event.create('tfg:tpaoh')
.liquid(new GTFluidBuilder().temperature(293))
.components('2x carbon', '9x hydrogen', '1x nitrogen', '1x oxygen', '2x sodium')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xffd8b1)
.secondaryColor(0xe6b88f)
// ZSM-5 Gel
event.create('tfg:zsm5_gel')
.liquid(new GTFluidBuilder().temperature(323))
.components('24x carbon', '128x hydrogen', '12x nitrogen', '5x silicon', '1x aluminium', '34x oxygen', '31x sodium')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xf2e8d6)
.secondaryColor(0xd0c4b0)
// Catalyser Powder
event.create('tfg:catalyser_powder')
.dust()
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.iconSet(GTMaterialIconSet.FLINT)
.color(0x7f7f7f)
.secondaryColor(0xcfcfcf)
// Clean Powder
event.create('tfg:clean_powder')
.dust()
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.iconSet(GTMaterialIconSet.FLINT)
.color(0xffffff)
.secondaryColor(0xdfe6e6)
// Leachate
event.create('tfg:leachate')
.liquid(new GTFluidBuilder().temperature(298))
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xbfd6d0)
.secondaryColor(0x8fbdb0)
// Metal Rich Solution
event.create('tfg:metal_rich_solution')
.liquid(new GTFluidBuilder().temperature(298))
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
.color(0xb56f5a)
.secondaryColor(0xd9b0a3)
// Aciditic Waste
event.create('tfg:aciditic_waste')
.liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID))
.color(0x9df2b4)
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
}