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-07 22:35:02 +01:00
commit 361cb69e59
15 changed files with 224 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -182,7 +182,7 @@ jobs:
- name: 📄 Format diff
id: format_diff
if: ${{ steps.read_diff.outputs.diff != '' }}
uses: roamingowl/template-output-with-eta@v1.12.0
uses: roamingowl/template-output-with-eta@v1.13.0
with:
template: |
```markdown
@ -430,7 +430,7 @@ jobs:
- name: 📄 Format diff
id: format_diff
if: ${{ needs.info.outputs.diff != '' }}
uses: roamingowl/template-output-with-eta@v1.12.0
uses: roamingowl/template-output-with-eta@v1.13.0
with:
template: |
```markdown

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
- Fixed a crash when trying to spawn rabbits on the moon (#1528) @Pyritie
- Fixed duplicate Create recipes @Pyritie
- Prevented hammers, wrenches, and spades from being placed in chests to match other tools. (#1538) @dimethylene
- Removed cinnabar to redstone recipe, which generated free resources. (#1548) @SpicyNoodle5
## [0.10.5] - 03-08-2025
### Major changes

5
kubejs/assets/tfg/particles/railgun_ammo.json Normal file
View file

@ -0,0 +1,5 @@
{
"textures": [
"tfg:railgun_ammo_shell_particle"
]
}

20
kubejs/assets/tfg/particles/railgun_boom.json Normal file
View file

@ -0,0 +1,20 @@
{
"textures": [
"minecraft:sonic_boom_0",
"minecraft:sonic_boom_1",
"minecraft:sonic_boom_2",
"minecraft:sonic_boom_3",
"minecraft:sonic_boom_4",
"minecraft:sonic_boom_5",
"minecraft:sonic_boom_6",
"minecraft:sonic_boom_7",
"minecraft:sonic_boom_8",
"minecraft:sonic_boom_9",
"minecraft:sonic_boom_10",
"minecraft:sonic_boom_11",
"minecraft:sonic_boom_12",
"minecraft:sonic_boom_13",
"minecraft:sonic_boom_14",
"minecraft:sonic_boom_15"
]
}

BIN
kubejs/assets/tfg/textures/particle/railgun_ammo_shell_particle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 689 B

135
kubejs/server_scripts/afc/recipes.js
View file

@ -130,7 +130,7 @@ const registerAFCRecipes = (event) => {
.minTemp(12)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/kapok_latex")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok"))
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_kapok"))
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(12)
.requiresNaturalLog(true)
@ -143,7 +143,7 @@ const registerAFCRecipes = (event) => {
.minTemp(-10)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/aspen_resin")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_aspen"))
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_aspen"))
.resultFluid(Fluid.of('tfg:conifer_pitch', 2))
.minTemp(-10)
.requiresNaturalLog(true)
@ -154,7 +154,7 @@ const registerAFCRecipes = (event) => {
.minTemp(-15)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/spruce_resin")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_spruce"))
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_spruce"))
.resultFluid(Fluid.of('tfg:conifer_pitch', 4))
.minTemp(-15)
.requiresNaturalLog(true)
@ -165,23 +165,26 @@ const registerAFCRecipes = (event) => {
.minTemp(-8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/white_cedar_resin")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_white_cedar"))
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_white_cedar"))
.resultFluid(Fluid.of('tfg:conifer_pitch', 3))
.minTemp(-8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/ancient_white_cedar_resin")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/douglas_fir"))
event.recipes.afc.tree_tapping(TFC.blockIngredient('tfc:wood/log/douglas_fir'))
.resultFluid(Fluid.of('tfg:conifer_pitch', 2))
.minTemp(-8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/douglas_fir_resin")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_douglas_fir"))
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_douglas_fir"))
.resultFluid(Fluid.of('tfg:conifer_pitch', 2))
.minTemp(-8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/ancient_douglas_fir_resin")
//#region Extractor Recipe
// Latex
event.recipes.gtceu.extractor('latex_from_log')
.itemInputs('#tfg:latex_logs')
@ -201,59 +204,119 @@ const registerAFCRecipes = (event) => {
.duration(750)
.EUt(20)
event.replaceOutput({ id: 'gtceu:centrifuge/sticky_resin_separation' }, 'gtceu:raw_rubber_dust', '3x gtceu:carbon_dust')
// Conifer Pitch
event.recipes.gtceu.extractor('conifer_from_log')
.itemInputs('#tfg:rosin_logs')
.outputFluids(Fluid.of('tfg:conifer_pitch', 250))
.duration(600)
.EUt(20)
event.recipes.gtceu.extractor('conifer_from_sapling')
.itemInputs('#tfg:rosin_saplings')
.outputFluids(Fluid.of('tfg:conifer_pitch', 100))
.duration(750)
.EUt(20)
event.recipes.gtceu.extractor('conifer_from_leaves')
.itemInputs('#tfg:rosin_leaves')
.outputFluids(Fluid.of('tfg:conifer_pitch', 50))
.duration(750)
.EUt(20)
// Maple Sirup
event.recipes.gtceu.extractor('maple_from_log')
.itemInputs('#tfc:maple_logs')
.outputFluids(Fluid.of('afc:maple_sap', 250))
.duration(600)
.EUt(20)
event.recipes.gtceu.extractor('maple_from_sapling')
.itemInputs('#tfg:maple_saplings')
.outputFluids(Fluid.of('afc:maple_sap', 100))
.duration(750)
.EUt(20)
event.recipes.gtceu.extractor('maple_from_leaves')
.itemInputs('#tfg:maple_leaves')
.outputFluids(Fluid.of('afc:maple_sap', 50))
.duration(750)
.EUt(20)
// Birch Sirup
event.recipes.gtceu.extractor('birch_from_log')
.itemInputs('#tfc:birch_logs')
.outputFluids(Fluid.of('afc:birch_sap', 250))
.duration(600)
.EUt(20)
event.recipes.gtceu.extractor('birch_from_sapling')
.itemInputs('tfc:wood/sapling/birch')
.outputFluids(Fluid.of('afc:birch_sap', 100))
.duration(750)
.EUt(20)
event.recipes.gtceu.extractor('birch_from_leaves')
.itemInputs('tfc:wood/leaves/birch')
.outputFluids(Fluid.of('afc:birch_sap', 50))
.duration(750)
.EUt(20)
//#endregion
// Из бревна капока
// Из бревна капока / Logs Centrifuge
event.recipes.gtceu.centrifuge('rubber_log_separation')
.itemInputs('#tfg:latex_logs')
.chancedOutput('gtceu:raw_rubber_dust', 5000, 1200)
.chancedOutput('gtceu:plant_ball', 3750, 900)
.chancedOutput('gtceu:sticky_resin', 2500, 600)
.chancedOutput('gtceu:wood_dust', 2500, 700)
.chancedOutput('gtceu:raw_rubber_dust', 5000, 0)
.chancedOutput('gtceu:plant_ball', 3750, 0)
.chancedOutput('gtceu:sticky_resin', 2500, 0)
.chancedOutput('gtceu:wood_dust', 2500, 0)
.outputFluids(Fluid.of('gtceu:methane', 60))
.duration(200)
.EUt(20)
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.centrifuge('conifer_log_separation')
.itemInputs('#tfg:rosin_logs')
.chancedOutput('tfg:conifer_rosin', 7500, 1200)
.chancedOutput('gtceu:plant_ball', 3750, 900)
.chancedOutput('gtceu:sticky_resin', 2500, 600)
.chancedOutput('gtceu:wood_dust', 2500, 700)
.chancedOutput('tfg:conifer_rosin', 7500, 0)
.chancedOutput('gtceu:plant_ball', 3750, 0)
.chancedOutput('gtceu:sticky_resin', 2500, 0)
.chancedOutput('gtceu:wood_dust', 2500, 0)
.outputFluids(Fluid.of('gtceu:methane', 60))
.duration(200)
.EUt(20)
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.centrifuge('maple_syrup_log_separation')
.itemInputs('#tfc:maple_logs')
.chancedOutput('afc:maple_sugar', 7500, 1200)
.chancedOutput('gtceu:plant_ball', 3750, 900)
.chancedOutput('gtceu:wood_dust', 2500, 700)
.chancedOutput('afc:maple_sugar', 7500, 0)
.chancedOutput('gtceu:plant_ball', 3750, 0)
.chancedOutput('gtceu:wood_dust', 2500, 0)
.outputFluids(Fluid.of('gtceu:methane', 60), Fluid.of('afc:maple_syrup', 100))
.duration(200)
.EUt(20)
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.centrifuge('birch_syrup_log_separation')
.itemInputs('#tfc:birch_logs')
.chancedOutput('afc:birch_sugar', 7500, 1200)
.chancedOutput('gtceu:plant_ball', 3750, 900)
.chancedOutput('gtceu:wood_dust', 2500, 700)
.chancedOutput('afc:birch_sugar', 7500, 0)
.chancedOutput('gtceu:plant_ball', 3750, 0)
.chancedOutput('gtceu:wood_dust', 2500, 0)
.outputFluids(Fluid.of('gtceu:methane', 60), Fluid.of('afc:birch_syrup', 100))
.duration(200)
.EUt(20)
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
//#endregion
//region gt sap processing
event.recipes.gtceu.fluid_heater('maple_sap_condense')
.inputFluids(Fluid.of('afc:maple_sap', 4000))
.inputFluids(Fluid.of('afc:maple_sap', 1000))
.outputFluids(Fluid.of('afc:maple_syrup', 100))
.duration(20*25)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.fluid_heater('birch_sap_condense')
.inputFluids(Fluid.of('afc:birch_sap', 8000))
.inputFluids(Fluid.of('afc:birch_sap', 1000))
.outputFluids(Fluid.of('afc:birch_syrup', 100))
.duration(20*35)
.EUt(GTValues.VA[GTValues.ULV])
@ -264,14 +327,14 @@ const registerAFCRecipes = (event) => {
event.recipes.gtceu.fluid_solidifier('maple_syrup')
.inputFluids(Fluid.of('afc:maple_syrup', 100))
.itemOutputs('afc:maple_sugar')
.duration(500)
.EUt(GTValues.VA[GTValues.ULV])
.duration(20*12)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.fluid_solidifier('birch_syrup')
.inputFluids(Fluid.of('afc:birch_syrup', 100))
.itemOutputs('afc:birch_sugar')
.duration(500)
.EUt(GTValues.VA[GTValues.ULV])
.duration(20*12)
.EUt(GTValues.VHA[GTValues.ULV])
// Stripped logs

44
kubejs/server_scripts/afc/tags.js
View file

@ -43,15 +43,12 @@ const registerAFCItemTags = (event) => {
event.add('minecraft:saplings', `afc:wood/sapling/${x.sapling}`)
})
// Latex Tag
event.add("tfg:latex_logs", "#tfc:kapok_logs")
event.add("tfg:latex_logs", "#afc:hevea_logs")
event.add("tfg:latex_logs", "#afc:rubber_fig_logs")
event.add("tfg:rosin_logs", "#tfc:aspen_logs")
event.add("tfg:rosin_logs", "#tfc:spruce_logs")
event.add("tfg:rosin_logs", "#tfc:white_cedar_logs")
event.add("tfg:rosin_logs", "#tfc:douglas_fir_logs")
event.add("tfg:rubber_saplings", "tfc:wood/sapling/kapok")
event.add("tfg:rubber_saplings", "afc:wood/sapling/red_silk_cotton")
event.add("tfg:rubber_saplings", "afc:wood/sapling/hevea")
@ -62,13 +59,48 @@ const registerAFCItemTags = (event) => {
event.add("tfg:rubber_leaves", "afc:wood/leaves/hevea")
event.add("tfg:rubber_leaves", "afc:wood/leaves/rubber_fig")
// Rosin Tag
event.add("tfg:rosin_logs", "#tfc:aspen_logs")
event.add("tfg:rosin_logs", "#tfc:spruce_logs")
event.add("tfg:rosin_logs", "#tfc:white_cedar_logs")
event.add("tfg:rosin_logs", "#tfc:douglas_fir_logs")
event.add("tfg:rosin_saplings", 'tfc:wood/leaves/aspen')
event.add("tfg:rosin_saplings", 'afc:wood/leaves/coast_spruce')
event.add("tfg:rosin_saplings", 'tfc:wood/leaves/spruce')
event.add("tfg:rosin_saplings", 'afc:wood/leaves/black_spruce')
event.add("tfg:rosin_saplings", 'afc:wood/leaves/sitka_spruce')
event.add("tfg:rosin_saplings", 'tfc:wood/leaves/douglas_fir')
event.add("tfg:rosin_saplings", 'tfc:wood/leaves/white_cedar')
event.add("tfg:rosin_leaves", 'tfc:wood/sapling/aspen')
event.add("tfg:rosin_leaves", 'afc:wood/sapling/coast_spruce')
event.add("tfg:rosin_leaves", 'tfc:wood/sapling/spruce')
event.add("tfg:rosin_leaves", 'afc:wood/sapling/black_spruce')
event.add("tfg:rosin_leaves", 'afc:wood/sapling/sitka_spruce')
event.add("tfg:rosin_leaves", 'tfc:wood/sapling/douglas_fir')
event.add("tfg:rosin_leaves", 'tfc:wood/sapling/white_cedar')
// Maple Syrup Tag
event.add("tfg:maple_saplings", 'tfc:wood/sapling/maple')
event.add("tfg:maple_saplings", 'afc:wood/sapling/bigleaf_maple')
event.add("tfg:maple_saplings", 'afc:wood/sapling/weeping_maple')
event.add("tfg:maple_leaves", 'tfc:wood/leaves/maple')
event.add("tfg:maple_leaves", 'afc:wood/leaves/bigleaf_maple')
event.add("tfg:maple_leaves", 'tfc:wood/leaves/weeping_maple')
// Misc
event.add("tfg:rubber_plants", "tfc:plant/goldenrod")
event.add("tfg:rubber_plants", "tfc:plant/dandelion")
}
/**
*
* @
* @param {TagEvent.Block} event
*/
const registerAFCBlockTags = (event) => {

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

@ -144,14 +144,14 @@ const registerGTCEURecipes = (event) => {
.id('tfg:pot/sticky_resin_from_conifer_pitch')
event.recipes.gtceu.fluid_solidifier('tfg:fluid_solidifier/latex_to_sticky_resin')
.duration(24 * 20)
.duration(12 * 20)
.EUt(30)
.itemInputs('tfc:powder/wood_ash')
.itemOutputs('gtceu:sticky_resin')
.inputFluids(Fluid.of('tfg:latex', 1000))
event.recipes.gtceu.fluid_solidifier('tfg:fluid_solidifier/pitch_to_sticky_resin')
.duration(24 * 20)
.duration(12 * 20)
.EUt(30)
.itemInputs('tfc:powder/wood_ash')
.itemOutputs('gtceu:sticky_resin')
@ -485,11 +485,23 @@ const registerGTCEURecipes = (event) => {
D: 'gtceu:tin_single_cable'
}).id('gtceu:shaped/electric_blast_furnace2')
// Клей из ТФК клея
// Клей из ТФК клея / Glue from resin
event.recipes.gtceu.extractor('tfg:glue_from_tfc_glue')
.itemInputs('tfc:glue')
.outputFluids(Fluid.of('gtceu:glue', 50))
.duration(400)
.duration(20*10)
.EUt(5)
event.recipes.gtceu.extractor('tfg:glue_from_sticky_resin')
.itemInputs('gtceu:sticky_resin')
.outputFluids(Fluid.of('gtceu:glue', 100))
.duration(20*10)
.EUt(5)
event.recipes.gtceu.extractor('tfg:glue_from_conifer_resin')
.itemInputs('tfg:conifer_rosin')
.outputFluids(Fluid.of('gtceu:glue', 50))
.duration(20*10)
.EUt(5)
event.recipes.gtceu.mixer('tfg:glue_from_bone_meal')
@ -975,9 +987,17 @@ const registerGTCEURecipes = (event) => {
.itemInputs('tfg:conifer_rosin')
.outputFluids(Fluid.of('gtceu:glue', 50))
.itemOutputs('2x #forge:dusts/carbon')
.chancedOutput('gtceu:plant_ball', 1000, 850)
.duration(400)
.EUt(GTValues.VA[GTValues.ULV])
.chancedOutput('gtceu:plant_ball', 7500, 0)
.duration(20*20)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.centrifuge('tfg:centrifuge_sticky_resin')
.itemInputs('gtceu:sticky_resin')
.outputFluids(Fluid.of('gtceu:glue', 100))
.itemOutputs('3x #forge:dusts/carbon')
.chancedOutput('gtceu:plant_ball', 5000, 0)
.duration(20*20)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.chemical_reactor(`tfg:treat_latex_plants_into_latex`)
.itemInputs('16x #tfg:rubber_plants', 'gtceu:tiny_sodium_hydroxide_dust')
@ -1333,13 +1353,13 @@ const registerGTCEURecipes = (event) => {
F: 'gtceu:stainless_steel_huge_fluid_pipe'
}).id('tfg:shaped/large_centrifuge')
event.recipes.gtceu.extractor('tfg:logs_to_wood_gas')
.itemInputs('#minecraft:logs_that_burn')
event.recipes.gtceu.chemical_reactor('tfg:wood_ash_to_wood_gas_air')
.itemInputs('8x tfc:powder/wood_ash')
.inputFluids(Fluid.of('gtceu:air', 100))
.outputFluids('gtceu:wood_gas 100')
.duration(100)
.duration(20*5)
.EUt(GTValues.VA[GTValues.LV])
// Buttons
event.replaceOutput({ id: 'gtceu:cutter/blackstone_button' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button')
event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button')

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

@ -712,6 +712,10 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'minecraft:ender_eye' })
// Remove GTceu Sticky Resin Centrifuge recipe
event.remove({ id: 'gtceu:centrifuge/sticky_resin_separation' })
// Remove old treated plank and wood plank recipe
event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' })

2
kubejs/server_scripts/tfg/recipes.food.js
View file

@ -359,7 +359,7 @@ function registerTFGFoodRecipes(event) {
circuit: 6,
itemInputs: [item],
itemOutputs: [item],
fluidInputs: [Fluid.of('gtceu:wood_gas', 50)],
fluidInputs: [Fluid.of('gtceu:wood_gas', 5)],
itemOutputProvider: TFC.isp.copyInput().addTrait("firmalife:smoked")
})
})

2
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -48,7 +48,7 @@ function registerTFGMiscellaneousRecipes(event) {
.inputFluids(Fluid.of('tfg:conifer_pitch', 1000))
.itemInputs('tfc:powder/charcoal')
.itemOutputs('tfg:conifer_rosin')
.duration(20*24)
.duration(20*12)
.EUt(GTValues.VA[GTValues.LV])
// Decorative Vases

83
kubejs/server_scripts/tfg/recipes.space.js
View file

@ -57,23 +57,27 @@ function registerTFGSpaceRecipes(event) {
// Aqueous accumulator
let aaCircuit = 1;
event.recipes.gtceu.aqueous_accumulator('water_overworld')
.circuit(aaCircuit++)
.dimension('minecraft:overworld')
event.recipes.gtceu.aqueous_accumulator('water')
.duration(20)
.EUt(GTValues.VHA[GTValues.ULV])
.addDataString("fluidA", "minecraft:water")
.outputFluids(Fluid.of("minecraft:water", 1000))
event.recipes.gtceu.aqueous_accumulator('sea_water_overworld')
.circuit(aaCircuit++)
.dimension('minecraft:overworld')
event.recipes.gtceu.aqueous_accumulator('sea_water')
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
.addDataString("fluidA", "tfc:salt_water")
.outputFluids(Fluid.of("tfc:salt_water", 1000))
event.recipes.gtceu.aqueous_accumulator('semiheavy_water_mars')
.dimension('ad_astra:mars')
.duration(20)
.EUt(GTValues.VHA[GTValues.ULV])
.addDataString("fluidA", "tfg:semiheavy_ammoniacal_water")
.outputFluids(Fluid.of("tfg:semiheavy_ammoniacal_water", 1000))
let aaCircuit = 1;
event.recipes.gtceu.aqueous_accumulator('lava_overworld')
.circuit(aaCircuit++)
@ -83,77 +87,14 @@ function registerTFGSpaceRecipes(event) {
.addDataString("fluidA", "minecraft:lava")
.outputFluids(Fluid.of("minecraft:lava", 1000))
event.recipes.gtceu.aqueous_accumulator('water_nether')
.circuit(aaCircuit++)
.dimension('minecraft:the_nether')
.duration(20*2)
.EUt(GTValues.VHA[GTValues.LV])
.addDataString("fluidA", "minecraft:water")
.outputFluids(Fluid.of("minecraft:water", 1000))
event.recipes.gtceu.aqueous_accumulator('sea_water_nether')
.circuit(aaCircuit++)
.dimension('minecraft:the_nether')
.duration(20*2)
.EUt(GTValues.VA[GTValues.LV])
.addDataString("fluidA", "tfc:salt_water")
.outputFluids(Fluid.of("tfc:salt_water", 1000))
event.recipes.gtceu.aqueous_accumulator('lava_nether')
.circuit(aaCircuit++)
.dimension('minecraft:the_nether')
.duration(20*5)
.duration(20*7)
.EUt(GTValues.VHA[GTValues.HV])
.addDataString("fluidA", "minecraft:lava")
.outputFluids(Fluid.of("minecraft:lava", 1000))
event.recipes.gtceu.aqueous_accumulator('water_moon')
.circuit(aaCircuit++)
.dimension('ad_astra:moon')
.duration(20*5)
.EUt(GTValues.VHA[GTValues.MV])
.addDataString("fluidA", "minecraft:water")
.outputFluids(Fluid.of("minecraft:water", 1000))
event.recipes.gtceu.aqueous_accumulator('sea_water_moon')
.circuit(aaCircuit++)
.dimension('ad_astra:moon')
.duration(20*5)
.EUt(GTValues.VA[GTValues.MV])
.addDataString("fluidA", "tfc:salt_water")
.outputFluids(Fluid.of("tfc:salt_water", 1000))
event.recipes.gtceu.aqueous_accumulator('water_orbit')
.circuit(aaCircuit++)
.dimension('ad_astra:earth_orbit')
.dimension('ad_astra:moon_orbit')
.dimension('ad_astra:mars_orbit')
.dimension('ad_astra:venus_orbit')
.dimension('ad_astra:mercury_orbit')
.duration(20*5)
.EUt(GTValues.VHA[GTValues.MV])
.addDataString("fluidA", "minecraft:water")
.outputFluids(Fluid.of("minecraft:water", 1000))
event.recipes.gtceu.aqueous_accumulator('sea_water_orbit')
.circuit(aaCircuit)
.dimension('ad_astra:earth_orbit')
.dimension('ad_astra:moon_orbit')
.dimension('ad_astra:mars_orbit')
.dimension('ad_astra:venus_orbit')
.dimension('ad_astra:mercury_orbit')
.duration(20*5)
.EUt(GTValues.VA[GTValues.MV])
.addDataString("fluidA", "tfc:salt_water")
.outputFluids(Fluid.of("tfc:salt_water", 1000))
event.recipes.gtceu.aqueous_accumulator('semiheavy_water_mars')
.dimension('ad_astra:mars')
.duration(20)
.EUt(GTValues.VHA[GTValues.ULV])
.addDataString("fluidA", "tfg:semiheavy_ammoniacal_water")
.outputFluids(Fluid.of("tfg:semiheavy_ammoniacal_water", 1000))
// Plants - Can't use the default builder here because fertiliser is much harder to get on the moon,
// and we're using helium-3 as the fertiliser

1
kubejs/startup_scripts/tfc/constants.js
View file

@ -946,7 +946,6 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
{ input: '#forge:dusts/malachite', output: '4x tfc:powder/malachite', name: 'malachite_powder' },
{ input: '#forge:dusts/yellow_limonite', output: '4x tfc:powder/limonite', name: 'limonite_powder' },
{ input: '#forge:dusts/hematite', output: '4x tfc:powder/hematite', name: 'hematite_powder' },
{ input: '#forge:dusts/cinnabar', output: '4x minecraft:redstone', name: 'cinnabar_powder' },
{ input: '#forge:dusts/sulfur', output: '4x tfc:powder/sulfur', name: 'sulfur_powder' },
{ input: '#forge:dusts/saltpeter', output: '4x tfc:powder/saltpeter', name: 'saltpeter_powder' },
{ input: '#forge:dusts/salt', output: '4x tfc:powder/salt', name: 'salt_powder' },

2
kubejs/startup_scripts/tfg/blocks.nether.js
View file

@ -67,6 +67,7 @@ function registerTFGNetherBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:metamorphic_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/dripstone', 'tfc:loose_rock')
.itemTexture('tfg:item/loose/dripstone')
@ -77,6 +78,7 @@ function registerTFGNetherBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:sedimentary_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:mushroom_roots', 'tfg:decorative_plant')
.soundType('nether_wart')

8
kubejs/startup_scripts/tfg/blocks.space.js
View file

@ -149,6 +149,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_intrusive_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/moon_deepslate', 'tfc:loose_rock')
.soundType('deepslate')
@ -157,6 +158,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_intrusive_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/mars_stone', 'tfc:loose_rock')
.stoneSoundType()
@ -165,6 +167,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:sedimentary_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/venus_stone', 'tfc:loose_rock')
.stoneSoundType()
@ -173,6 +176,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_extrusive_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/mercury_stone', 'tfc:loose_rock')
.stoneSoundType()
@ -181,6 +185,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_intrusive_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/glacio_stone', 'tfc:loose_rock')
.stoneSoundType()
@ -189,6 +194,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_extrusive_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/permafrost', 'tfc:loose_rock')
.stoneSoundType()
@ -197,6 +203,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:metamorphic_rock')
.tagItem("rnr:loose_rock_items")
event.create('tfg:loose/red_granite', 'tfc:loose_rock')
.stoneSoundType()
@ -205,6 +212,7 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_intrusive_rock')
.tagItem("rnr:loose_rock_items")
// Spikes