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

Merge branch 'dev' into feature/create-6

Browse source
This commit is contained in:
Pyritie 2025-05-29 21:01:44 +01:00
commit 8a283343e4
29 changed files with 524 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -243,4 +243,34 @@ const registerAFCRecipes = (event) => {
.itemOutputs('afc:birch_sugar')
.duration(500)
.EUt(GTValues.VA[GTValues.ULV])
// Stripped logs
global.AFC_WOOD_TYPES.forEach(wood => {
event.recipes.gtceu.lathe(`tfg:stripping_${wood}_log`)
.itemInputs(`afc:wood/log/${wood}`)
.itemOutputs(`afc:wood/stripped_log/${wood}`)
.duration(50)
.EUt(2)
event.recipes.gtceu.lathe(`tfg:stripping_${wood}_wood`)
.itemInputs(`afc:wood/wood/${wood}`)
.itemOutputs(`afc:wood/stripped_wood/${wood}`)
.duration(50)
.EUt(2)
event.custom({
type: 'vintageimprovements:turning',
ingredients: [{ item: `afc:wood/log/${wood}` }],
results: [{ item: `afc:wood/stripped_log/${wood}` }],
processingTime: 50
}).id(`tfg:vi/lathe/stripping_${wood}_log`)
event.custom({
type: 'vintageimprovements:turning',
ingredients: [{ item: `afc:wood/wood/${wood}` }],
results: [{ item: `afc:wood/stripped_wood/${wood}` }],
processingTime: 50
}).id(`tfg:vi/lathe/stripping_${wood}_wood`)
})
}

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

@ -698,7 +698,7 @@ const registerCreateRecipes = (event) => {
}).id('tfg:create/shaped/item_vault')
event.recipes.gtceu.assembler('tfg:create/item_vault')
.itemInputs('#forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/steel')
.itemInputs('#forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
.circuit(3)
.itemOutputs('create:item_vault')
.duration(200)
@ -755,7 +755,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_funnel')
.itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube')
.itemOutputs('2x create:brass_funnel')
.circuit(4)
.circuit(6)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -774,7 +774,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_funnel_leather')
.itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube')
.itemOutputs('2x create:brass_funnel')
.circuit(4)
.circuit(6)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])

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

@ -47,7 +47,7 @@ const registerCreateConnectedRecipes = (event) => {
}).id('create_connected:crafting/kinetics/item_silo')
event.recipes.gtceu.assembler('tfg:create_connected/item_silo')
.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/steel')
.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
.circuit(10)
.itemOutputs('create_connected:item_silo')
.duration(200)

15
kubejs/server_scripts/firmalife/data.js Normal file
View file

@ -0,0 +1,15 @@
// priority: 0
const registerTFCDataForFirmalife = (event) => {
registerFirmalifeItemSize(event)
}
//#region registerFirmalifeItemSize
const registerFirmalifeItemSize = (event) => {
event.itemSize('firmalife:jar/honey', 'tiny', 'medium', 'jar_of_honey')
event.itemSize('firmalife:jar/compost', 'tiny', 'medium', 'jar_of_compost')
event.itemSize('firmalife:jar/rotten_compost', 'tiny', 'medium', 'jar_of_rotten_compost')
event.itemSize('firmalife:jar/guano', 'tiny', 'medium', 'jar_of_guano')
}
//#endregion

1
kubejs/server_scripts/main_server_script.js
View file

@ -127,6 +127,7 @@ TFCEvents.data(event => {
registerTFCDataForTFC(event)
registerTFCDataForTFCBetterBF(event)
registerTFCDataForWaterFlasks(event)
registerTFCDataForFirmalife(event)
})
/**

5
kubejs/server_scripts/minecraft/tags.js
View file

@ -56,10 +56,11 @@ const registerMinecraftItemTags = (event) => {
event.remove('forge:gems', 'minecraft:charcoal')
event.remove('forge:gems', 'minecraft:coal')
event.remove('minecraft:dirt', 'minecraft:moss_block')
event.add('tfc:compost_greens_high', 'minecraft:red_mushroom_block')
event.add('tfc:compost_greens_high', 'minecraft:brown_mushroom_block')
event.add('tfc:colored_terracotta', 'minecraft:white_terracotta')
}
const registerMinecraftBlockTags = (event) => {
@ -129,8 +130,6 @@ const registerMinecraftBlockTags = (event) => {
event.add('tfg:brick_stairs', 'minecraft:blackstone_stairs')
event.add('tfg:brick_slabs', 'minecraft:blackstone_slab')
event.add('tfg:brick_walls', 'minecraft:blackstone_wall')
event.remove('minecraft:dirt', 'minecraft:moss_block')
//#region
}

3
kubejs/server_scripts/tfc/data.js
View file

@ -209,6 +209,9 @@ const registerTFCItemSize = (event) => {
event.itemSize('tfg:fishing_net/magnalium', 'large', 'medium', 'magnalium_fishing_net')
event.itemSize('#tfc:ore_pieces', 'very_small', 'very_light', 'tfc_ores')
event.itemSize('#tfc:foods/sealed_preserves', 'tiny', 'medium', 'sealed_preserves')
event.itemSize('#tfc:foods/preserves', 'tiny', 'medium', 'preserves')
}
//#endregion

14
kubejs/server_scripts/tfc/recipes.dyes.js
View file

@ -30,6 +30,18 @@ function registerTFCDyeRecipes(event) {
//#endregion
//#region Terracotta
event.replaceInput({id: 'tfc:barrel/dye/bleach_terracotta'}, '#tfc:colored_terracotta', 'minecraft:terracotta')
event.replaceInput({id: 'gtceu:chemical_bath/decolor_terracotta'}, '#minecraft:terracotta', '#tfc:colored_terracotta')
global.MINECRAFT_DYE_NAMES.forEach(dye => {
event.replaceInput({id: `gtceu:chemical_bath/dye_terracotta_to_${dye}`}, 'minecraft:terracotta', '#minecraft:terracotta')
})
//#endregion
//#region Обычный сосуд
event.recipes.gtceu.chemical_bath(`unfired_vessel_decolor`)
@ -122,7 +134,7 @@ function registerTFCDyeRecipes(event) {
inputArray.push(`#forge:dyes/${dyeName}`);
}
event.recipes.tfc.pot(inputArray, Fluid.of('tfc:salt_water', 250 * i), 600, 2000)
event.recipes.tfc.pot(inputArray, Fluid.of('tfc:vinegar', 250 * i), 200, 200)
.fluidOutput(Fluid.of(`tfc:${dyeName}_dye`, 144 * i))
.id(`tfc:pot/${i}x_${dyeName}_dye`)
}

30
kubejs/server_scripts/tfc/recipes.machines.js
View file

@ -544,4 +544,34 @@ function registerTFCMachineRecipes(event) {
.itemOutputs('#forge:dusts/carbon')
.duration(20)
.EUt(2)
// Stripped logs
global.TFC_WOOD_TYPES.forEach(wood => {
event.recipes.gtceu.lathe(`tfg:stripping_${wood}_log`)
.itemInputs(`tfc:wood/log/${wood}`)
.itemOutputs(`tfc:wood/stripped_log/${wood}`)
.duration(50)
.EUt(2)
event.recipes.gtceu.lathe(`tfg:stripping_${wood}_wood`)
.itemInputs(`tfc:wood/wood/${wood}`)
.itemOutputs(`tfc:wood/stripped_wood/${wood}`)
.duration(50)
.EUt(2)
event.custom({
type: 'vintageimprovements:turning',
ingredients: [{ item: `tfc:wood/log/${wood}` }],
results: [{ item: `tfc:wood/stripped_log/${wood}` }],
processingTime: 50
}).id(`tfg:vi/lathe/stripping_${wood}_log`)
event.custom({
type: 'vintageimprovements:turning',
ingredients: [{ item: `tfc:wood/wood/${wood}` }],
results: [{ item: `tfc:wood/stripped_wood/${wood}` }],
processingTime: 50
}).id(`tfg:vi/lathe/stripping_${wood}_wood`)
})
}

28
kubejs/server_scripts/tfg/events.js
View file

@ -20,8 +20,8 @@
if (item.id != `tfg:${pill_event}_pill`) return
item.count--
player.addItemCooldown(item, 100)
player.runCommandSilent(`effect give ${username} minecraft:${pill_event} 480 0 true`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${username} ${x} ${y} ${z} 10 1.5 1`)
server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 480 0 true`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`)
});
ItemEvents.rightClicked(event => {
@ -29,8 +29,8 @@
if (item.id != `tfg:${pill_event}_tablet`) return
item.count--
player.addItemCooldown(item, 100)
player.runCommandSilent(`effect give ${username} minecraft:${pill_event} 1800 0 true`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${username} ${x} ${y} ${z} 10 1.5 1`)
server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 1800 0 true`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`)
});
});
@ -40,7 +40,7 @@
item.count--
player.addItemCooldown(item, 50)
event.player.removeEffect('minecraft:poison')
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${username} ${x} ${y} ${z} 10 1.5 1`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`)
});
ItemEvents.rightClicked(event => {
@ -59,7 +59,7 @@
event.player.removeEffect('minecraft:bad_omen')
event.player.removeEffect('minecraft:darkness')
event.player.removeEffect('minecraft:unluck')
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${username} ${x} ${y} ${z} 10 1.5 1`)
server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`)
});
//salvos
@ -77,8 +77,8 @@
if (item.id != `tfg:${salvo_event}_salvo`) return
item.count--
player.addItemCooldown(item, 100)
player.runCommandSilent(`effect give ${username} minecraft:${salvo_event} 480 0 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${username} ${x} ${y} ${z} 10 2 1`)
server.runCommandSilent(`effect give ${player.username} minecraft:${salvo_event} 480 0 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`)
});
});
@ -87,8 +87,8 @@ ItemEvents.rightClicked(event => {
if (item.id != `tfg:absorption_salvo`) return
item.count--
player.addItemCooldown(item, 200)
player.runCommandSilent(`effect give ${username} minecraft:absorption 480 4 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${username} ${x} ${y} ${z} 10 2 1`)
server.runCommandSilent(`effect give ${player.username} minecraft:absorption 480 4 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`)
});
ItemEvents.rightClicked(event => {
@ -96,8 +96,8 @@ ItemEvents.rightClicked(event => {
if (item.id != `tfg:instant_health_salvo`) return
item.count--
player.addItemCooldown(item, 100)
player.runCommandSilent(`effect give ${username} minecraft:instant_health 1 1 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${username} ${x} ${y} ${z} 10 2 1`)
server.runCommandSilent(`effect give ${player.username} minecraft:instant_health 1 1 true`)
server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`)
});
//#endregion
@ -107,7 +107,7 @@ global.MINECRAFT_DYE_NAMES.forEach(color => {
BlockEvents.rightClicked(event => {
const {block,server,player,player:{x,y,z,username}} = event
if (block.id != `tfg:decorative_vase/${color}`) {return}{
server.runCommandSilent(`playsound tfc:block.quern.drag block ${username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
}})
});
@ -115,7 +115,7 @@ global.MINECRAFT_DYE_NAMES.forEach(color => {
BlockEvents.rightClicked(event => {
const {block,server,player,player:{x,y,z,username}} = event
if (block.id != 'tfg:decorative_vase') {return}{
server.runCommandSilent(`playsound tfc:block.quern.drag block ${username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
}});
//#endregion

7
kubejs/server_scripts/tfg/tags.js
View file

@ -85,6 +85,7 @@ const registerTFGItemTags = (event) => {
event.add('tfg:speed_ingredients', 'firmalife:raw_honey')
event.add('tfg:slowness_ingredients', 'tfc:plant/marigold')
event.add('tfg:slowness_ingredients', 'tfc:plant/nasturtium')
event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_red')
event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_white')
event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_yellow')
@ -92,6 +93,8 @@ const registerTFGItemTags = (event) => {
event.add('tfg:weakness_ingredients', 'tfc:plant/laminaria')
event.add('tfg:weakness_ingredients', 'tfc:plant/sea_palm')
event.add('tfg:weakness_ingredients', 'tfc:plant/sea_lavender')
event.add('tfg:weakness_ingredients', 'tfc:plant/canna')
event.add('tfg:weakness_ingredients', 'tfc:plant/water_canna')
event.add('tfg:haste_ingredients', '#tfg:sugars')
@ -374,12 +377,11 @@ const registerTFGPlacedFeatures = (event) => {
// #region Nether ores
event.add('tfg:nether_veins', 'beneath:vein/cursecoal')
event.add('tfg:nether_veins', 'beneath:vein/sylvite')
event.add('tfg:nether_veins', 'beneath:vein/crackrack_pipe')
// Lower only
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_naquadah')
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_sylvite')
// Full height
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_garnet')
@ -398,6 +400,7 @@ const registerTFGPlacedFeatures = (event) => {
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_topaz')
// Upper only
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_anthracite')
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_apatite')
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_basaltic_sands')
event.add('tfg:nether_veins', 'tfg:nether/vein/nether_bauxite')

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

@ -610,6 +610,31 @@ function registerVintageImprovementsRecipes(event) {
}).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber')
// #endregion
// #region Coiling
event.custom({
type: 'vintageimprovements:coiling',
ingredients: [{ item: 'tfc:wool' }],
results: [{ item: 'tfc:wool_yarn', count: 8 }],
processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/coiling/wool_yarn`)
event.custom({
type: 'vintageimprovements:coiling',
ingredients: [{ item: 'minecraft:phantom_membrane' }],
results: [{ item: 'tfg:phantom_thread', count: 16 }],
processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/coiling/phantom_thread`)
event.custom({
type: 'vintageimprovements:coiling',
ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)],
results: [{ item: 'tfg:polycaprolactam_string', count: 32 }],
processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/coiling/nylon_string`)
// #endregion
}
function generateHammeringRecipe(event, material, blows, anvil) {

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

@ -26,7 +26,7 @@ const registerWaterFlasksRecipes = (event) => {
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))
.resultFluid(Fluid.of('gtceu:red_steel', 144))
.useDurability(true)
.id('waterflasks:tfc/heating/unfinished_red_steel_flask')
@ -50,24 +50,73 @@ const registerWaterFlasksRecipes = (event) => {
//#region Железная фласка
event.replaceInput({ mod: 'waterflasks' }, 'tfc:burlap_cloth', '#forge:cloth')
// For some reason, replaceInput isn't working on these
event.remove({ id: 'waterflasks:crafting/iron_flask' })
event.shaped('waterflasks:iron_flask', [
' AB',
'CDC',
'EFE'
], {
A: '#forge:string',
B: '#forge:tools/knives',
C: '#forge:cloth',
D: 'waterflasks:bladder',
E: 'waterflasks:leather_side',
F: 'waterflasks:unfinished_iron_flask'
}).id('tfg:shaped/iron_flask')
event.remove({ id: 'waterflasks:crafting/repair_broken_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:broken_iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_broken_iron')
event.remove({ id: 'waterflasks:crafting/repair_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_iron')
event.remove({ id: 'waterflasks:crafting/red_steel_flask' })
event.shaped('waterflasks:red_steel_flask', [
' AB',
'CDC',
'EFE'
], {
A: '#forge:string',
B: '#forge:tools/knives',
C: 'tfg:phantom_silk',
D: 'waterflasks:bladder',
E: 'waterflasks:leather_side',
F: 'waterflasks:unfinished_red_steel_flask'
}).id('tfg:shaped/red_steel_flask')
event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask')
.itemInputs('2x #forge:cloth', '#forge:string', '#forge:leather', '#forge:plates/wrought_iron')
.itemInputs('2x #forge:cloth', '#forge:string', '#forge:plates/wrought_iron', '3x #forge:foils/rubber')
.circuit(5)
.itemOutputs('waterflasks:iron_flask')
.duration(250)
.EUt(16)
event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask_repair')
.itemInputs('waterflasks:broken_iron_flask', '#forge:cloth', '#forge:string', '#forge:leather')
.itemInputs('waterflasks:broken_iron_flask', '#forge:cloth', '#forge:foils/rubber')
.circuit(6)
.itemOutputs('waterflasks:iron_flask')
.duration(250)
.EUt(16)
event.recipes.gtceu.assembler('tfg:water_flasks/red_steel_flask')
.itemInputs('2x tfc:silk_cloth', '#forge:string', '#forge:leather', '#forge:plates/red_steel')
.itemInputs('2x tfg:phantom_silk', '#forge:string', '#forge:plates/red_steel', '3x #forge:foils/rubber')
.circuit(5)
.itemOutputs('waterflasks:red_steel_flask')
.duration(250)