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-03 23:05:18 +00:00
commit 77fbe3003b
6 changed files with 93 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/ftbquests/quests/chapters/applied_energistics_2.snbt
View file

@ -218,13 +218,6 @@
id: "432E105A84AEA630"
type: "checkmark"
}
{
dimension: "ad_astra:moon"
disable_toast: true
icon: "tfg:marker/moon"
id: "6A4F5147475443C5"
type: "dimension"
}
]
title: "{quests.ae2.fluix_liquid.title}"
x: -3.5d

2
kubejs/assets/gtceu/lang/en_us.json
View file

@ -132,7 +132,7 @@
"material.gtceu.damascus_steel": "Swine-steel",
"material.gtceu.air": "Earth Air",
"material.gtceu.liquid_air": "Liquid Earth Air",
"material.gtceu.fish_oil": "Tallowate",
"material.gtceu.fish_oil": "Fish Oil",
"material.gtceu.cooperite": "Cooperite",
"material.gtceu.armalcolite": "Armalcolite",
"material.gtceu.desh": "Desh",

1
kubejs/server_scripts/firmalife/tags.js
View file

@ -82,6 +82,7 @@ const registerFirmaLifeFluidTags = (event) => {
event.add('firmalife:mixable', 'afc:maple_syrup')
event.add('firmalife:mixable', 'afc:birch_syrup')
event.add('firmalife:oils', 'tfc:tallow')
event.add('firmalife:oils', 'gtceu:seed_oil')
event.add('firmalife:oils', 'gtceu:fish_oil')
event.add('firmalife:oils', 'tfg:triglyceride_oil')

54
kubejs/server_scripts/handglider/recipes.js
View file

@ -4,6 +4,8 @@ const registerHandGliderRecipes = (event) => {
event.remove({id: 'hangglider:glider_framework'})
event.remove({id: 'hangglider:reinforced_hang_glider'})
// Glider Framework
event.shaped('hangglider:glider_framework', [
'AAA',
@ -16,6 +18,7 @@ const registerHandGliderRecipes = (event) => {
D: '#forge:rings'
}).id('hangglider:shaped/glider_framework')
// Glider Wing
event.shaped('hangglider:glider_wing', [
' C',
' BA',
@ -25,4 +28,53 @@ const registerHandGliderRecipes = (event) => {
B: ChemicalHelper.get(TagPrefix.rod, GTMaterials.WroughtIron, 1),
C: '#forge:rings'
}).id('hangglider:shaped/glider_wing')
}
//Reinforced Hang Glider Stuff
event.shaped('hangglider:reinforced_hang_glider', [
' A ',
'ABA',
' C '
], {
A: 'sns:reinforced_fabric',
B: 'hangglider:hang_glider',
C: '#forge:rods/long/aluminium'
}).id('hangglider:shaped/reinforced_hang_glider')
event.shaped('hangglider:reinforced_hang_glider', [
' A ',
' B ',
' C '
], {
A: '#tfg:lightweight_cloth',
B: 'hangglider:hang_glider',
C: '#forge:rods/long/aluminium'
}).id('hangglider:shaped/reinforced_hang_glider2')
event.recipes.gtceu.assembler('tfg:hand_glider/reinforced_hang_glider')
.itemInputs('3x sns:reinforced_fabric', '1x hangglider:hang_glider', '1x #forge:rods/long/aluminium')
.circuit(3)
.itemOutputs(Item.of('hangglider:reinforced_hang_glider', "{Damage:0}"))
.duration(1200)
.EUt(30)
event.recipes.gtceu.assembler('tfg:hand_glider/reinforced_hang_glider2')
.itemInputs('1x #tfg:lightweight_cloth', '1x hangglider:hang_glider', '1x #forge:rods/long/aluminium')
.circuit(3)
.itemOutputs(Item.of('hangglider:reinforced_hang_glider', "{Damage:0}"))
.duration(600)
.EUt(30)
event.recipes.gtceu.assembler('tfg:hang_glider/reinforced_hang_glider_repairing')
.itemInputs('3x sns:reinforced_fabric', 'hangglider:reinforced_hang_glider')
.circuit(3)
.itemOutputs(Item.of('hangglider:reinforced_hang_glider', "{Damage:0}"))
.duration(800)
.EUt(30)
event.recipes.gtceu.assembler('tfg:hang_glider/reinforced_hang_glider_repairing2')
.itemInputs('1x #tfg:lightweight_cloth', 'hangglider:reinforced_hang_glider')
.circuit(3)
.itemOutputs(Item.of('hangglider:reinforced_hang_glider', "{Damage:0}"))
.duration(400)
.EUt(30)
}

30
kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js
View file

@ -56,6 +56,14 @@ function registerTFGBiodieselRecipes(event) {
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`tallow_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 6000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
// So you can craft Biodiesel without Chemical Reactor
event.recipes.gtceu.mixer(`tfg:fish_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:fish_oil', 1000))
@ -64,6 +72,14 @@ function registerTFGBiodieselRecipes(event) {
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.mixer(`tfg:tallow_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`olive_oil_ethanol_biodiesel`)
.inputFluids(Fluid.of('tfc:olive_oil', 4000), Fluid.of('gtceu:ethanol', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
@ -91,4 +107,18 @@ function registerTFGBiodieselRecipes(event) {
.outputFluids(Fluid.of('gtceu:glycerol'), Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.LV])
event.recipes.gtceu.chemical_reactor(`tallow_methanol_biodiesel`)
.inputFluids(Fluid.of('tfc:tallow', 6000), Fluid.of('gtceu:methanol', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:glycerol'), Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.LV])
event.recipes.gtceu.chemical_reactor(`tallow_ethanol_biodiesel`)
.inputFluids(Fluid.of('tfc:tallow', 6000), Fluid.of('gtceu:ethanol', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:glycerol'), Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.LV])
}

18
kubejs/server_scripts/tfg/powergen/recipes.boiler.js
View file

@ -62,26 +62,24 @@ function registerTFGBoilerRecipes(event) {
.duration(200)
.dimension('minecraft:overworld')
// fish oil (aka tallowate) extraction
event.recipes.gtceu.steam_boiler('tfg:tallow')
.inputFluids(Fluid.of('tfc:tallow', 160))
.duration(200)
.dimension('minecraft:overworld')
// fish oil extraction
event.recipes.gtceu.extractor(`tfg:fish_oil`)
.itemInputs('#minecraft:fishes')
.outputFluids(Fluid.of('gtceu:fish_oil', 200))
.outputFluids(Fluid.of('gtceu:fish_oil', 400))
.duration(40)
.EUt(4)
event.recipes.gtceu.extractor(`tfg:tallow`)
.itemInputs('tfc:blubber')
.outputFluids(Fluid.of('tfc:tallow', 200))
.outputFluids(Fluid.of('tfc:tallow', 400))
.duration(40)
.EUt(4)
// you get tallow from killing things like orcas, so this seems close enough
event.recipes.gtceu.mixer('tallow_to_fish_oil')
.inputFluids('tfc:tallow 100', 'tfc:lye 100')
.outputFluids('gtceu:fish_oil 200')
.duration(100)
.EUt(4)
// Seed oil
event.recipes.gtceu.extractor(`tfg:seed_oil`)
.itemInputs('#tfc:seeds')