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

Merge branch 'dev' into feature/space

Browse source
This commit is contained in:
Pyritie 2025-05-08 22:15:15 +01:00
commit ec576813c2
23 changed files with 818 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,14 @@ function registerGTCEuTFCMetalsRecipes(event)
// red alloy, because crucible always makes 4+1=5
event.remove({ id: 'gtceu:alloy_blast_smelter/red_alloy' })
event.recipes.gtceu.alloy_blast_smelter('tfg:red_alloy_mixer')
.itemInputs('1x gtceu:copper_dust', '4x minecraft:redstone')
.outputFluids(Fluid.of('gtceu:red_alloy', 720))
.circuit(5)
.duration(75)
.EUt(GTValues.VA[GTValues.LV])
event.remove({ id: 'gtceu:mixer/red_alloy' })
event.recipes.gtceu.mixer('tfg:red_alloy_mixer')
.itemInputs('1x gtceu:copper_dust', '4x minecraft:redstone')

13
kubejs/server_scripts/minecraft/recipes.js
View file

@ -991,6 +991,19 @@ const registerMinecraftRecipes = (event) => {
.EUt(GTValues.VA[GTValues.ULV])
//#endregion
// Slime
event.smelting('tfc:glue', 'minecraft:slime_ball')
.id('tfg:smelting/slime_to_glue')
// Clay
event.shaped('minecraft:clay', [
'AA',
'AA'
], {
A: 'minecraft:clay_ball'
})
.id('tfg:shaped/clay_balls_to_block')
event.shapeless('4x minecraft:clay_ball', ['minecraft:clay'])
.id('tfg:shapeless/clay_block_to_balls')
}

21
kubejs/server_scripts/tfc/recipes.dirt.js
View file

@ -131,4 +131,25 @@ function registerTFCDirtRecipes(event) {
})
//#endregion
// #region Wattle and daub
// TODO: Workaround for not being able to stain wattle and daub with normal dyes
// See https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/910
event.shaped('tfc:wattle/unstained', [
'AB',
'CC'
], {
A: 'tfc:wattle',
B: 'tfc:daub',
C: '#forge:rods/wood'
})
.id('tfg:shapeless/unstained_wattle')
global.MINECRAFT_DYE_NAMES.forEach(color => {
event.shapeless(`tfc:wattle/${color}`, ['tfc:wattle/unstained', `#forge:dyes/${color}`])
.id(`tfg:shapeless/wattle/${color}`)
})
// #endregion
}

110
kubejs/server_scripts/tfc/recipes.js
View file

@ -259,57 +259,69 @@ const registerTFCRecipes = (event) => {
'prepared',
'sheepskin'
];
const sizes = [
'small',
'medium',
'large'
];
stages.forEach((stage) => {
sizes.forEach((size, index) => {
// Find the next larger size.
const nextLarger = sizes[index + 1];
// If a larger size exists, sew the hides together.
if (nextLarger) {
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`1x tfc:${nextLarger}_${stage}_hide`, [
`2x tfc:${size}_${stage}_hide`,
'#tfc:sewing_needles',
'#forge:string',
'tfc:glue'
]).id(`tfg:tfc/${size}_to_${nextLarger}_${stage}_hide`)
)
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/${size}_to_${nextLarger}_${stage}_hide`)
.inputFluids(Fluid.of('gtceu:glue', 25))
.itemOutputs(`1x tfc:${nextLarger}_${stage}_hide`)
.itemInputs(`2x tfc:${size}_${stage}_hide`)
.duration(60)
.circuit(7)
.EUt(GTValues.VA[GTValues.ULV])
}
stages.forEach(stage => {
//Combining
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`1x tfc:medium_${stage}_hide`, [
`2x tfc:small_${stage}_hide`,
'#tfc:sewing_needles',
'#forge:string',
'tfc:glue'
]).id(`tfg:tfc/small_to_medium_${stage}_hide`)
)
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`1x tfc:large_${stage}_hide`, [
`3x tfc:small_${stage}_hide`,
'#tfc:sewing_needles',
'#forge:string',
'tfc:glue'
]).id(`tfg:tfc/small_to_large_${stage}_hide`)
)
// Find the next smaller size.
const nextSmaller = sizes[index - 1];
// If a smaller size exists, cut the hide.
if (nextSmaller) {
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`2x tfc:${nextSmaller}_${stage}_hide`, [
`1x tfc:${size}_${stage}_hide`,
'#forge:shears'
]).id(`tfg:tfc/${size}_to_${nextSmaller}_${stage}_hide`)
)
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/small_to_medium_${stage}_hide`)
.inputFluids(Fluid.of('gtceu:glue', 25))
.itemOutputs(`1x tfc:medium_${stage}_hide`)
.itemInputs(`2x tfc:small_${stage}_hide`)
.duration(60)
.circuit(7)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/${size}_to_${nextSmaller}_${stage}_hide`)
.itemOutputs(`2x tfc:${nextSmaller}_${stage}_hide`)
.itemInputs(`1x tfc:${size}_${stage}_hide`)
.duration(60)
.circuit(4)
.EUt(GTValues.VA[GTValues.ULV])
}
});
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/small_to_large_${stage}_hide`)
.inputFluids(Fluid.of('gtceu:glue', 25))
.itemOutputs(`1x tfc:large_${stage}_hide`)
.itemInputs(`3x tfc:small_${stage}_hide`)
.duration(60)
.circuit(9)
.EUt(GTValues.VA[GTValues.ULV])
//Cutting
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`2x tfc:small_${stage}_hide`, [
`1x tfc:medium_${stage}_hide`,
'#forge:shears'
]).id(`tfg:tfc/medium_to_small_${stage}_hide`)
)
event.recipes.tfc.damage_inputs_shapeless_crafting(
event.shapeless(`3x tfc:small_${stage}_hide`, [
`1x tfc:large_${stage}_hide`,
'#forge:shears'
]).id(`tfg:tfc/large_to_small_${stage}_hide`)
)
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/medium_to_small_${stage}_hide`)
.itemOutputs(`2x tfc:small_${stage}_hide`)
.itemInputs(`1x tfc:medium_${stage}_hide`)
.duration(60)
.circuit(4)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.assembler(`tfg:gtceu/assembler/large_to_small_${stage}_hide`)
.itemOutputs(`3x tfc:small_${stage}_hide`)
.itemInputs(`1x tfc:large_${stage}_hide`)
.duration(60)
.circuit(6)
.EUt(GTValues.VA[GTValues.ULV])
});
}

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

@ -250,9 +250,9 @@ function registerTFGMiscellaneousRecipes(event) {
.id('tfg:quern/ice_dust')
event.recipes.gtceu.macerator('tfg:macerating_ice_shavings')
.itemInputs('4x firmalife:ice_shavings')
.itemOutputs('#forge:dusts/ice')
.duration(40)
.itemInputs('firmalife:ice_shavings')
.itemOutputs('#forge:small_dusts/ice')
.duration(10)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.macerator('tfg:macerating_ice_shavings_reverse')

3
kubejs/server_scripts/tfg/recipes.supports.js
View file

@ -168,7 +168,6 @@ function registerTFGSupportRecipes(event) {
.EUt(GTValues.VA[GTValues.ULV])
// Metal Supports
event.recipes.tfc.damage_inputs_shaped_crafting(
event.shaped('8x tfg:rebar_support', [
'BA ',
'AC '
@ -176,7 +175,7 @@ function registerTFGSupportRecipes(event) {
A: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1),
B: ChemicalHelper.get(TagPrefix.wireFine, GTMaterials.Steel, 1),
C: '#forge:tools/wire_cutters'
}).id('tfg:shaped/rebar_support'))
}).id('tfg:shaped/rebar_support')
event.recipes.gtceu.assembler('tfg:gtceu/assembler/rebar_support')
.circuit(4)

2
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -24,7 +24,7 @@ function registerVintageImprovementsRecipes(event) {
'DAG',
'FCF'
], {
A: 'gtceu:ulv_machine_hull',
A: 'gtceu:ulv_machine_casing',
B: 'greate:steel_mechanical_pump',
C: 'create:mechanical_piston',
D: '#forge:springs/wrought_iron',

6
kubejs/server_scripts/water_flasks/recipes.js
View file

@ -24,6 +24,12 @@ const registerWaterFlasksRecipes = (event) => {
.useDurability(true)
.id(`waterflasks:heating/red_steel_flask`)
event.remove({id: 'waterflasks:heating/red_steel_unfinished_red_steel_flask'})
event.recipes.tfc.heating('waterflasks:unfinished_red_steel_flask', 1535)
.resultFluid(Fluid.of('tfc:metal/red_steel', 144))
.useDurability(true)
.id('waterflasks:tfc/heating/unfinished_red_steel_flask')
//#region Кожанная фласка
event.recipes.gtceu.assembler('tfg:water_flasks/leather_flask')