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

merge

Browse source
This commit is contained in:
Pyritie 2025-05-29 21:01:25 +01:00
commit 1305d713f4
28 changed files with 523 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

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')
@ -361,12 +364,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')
@ -385,6 +387,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')