From b4c6f137f03eb70ad7e2d9a9a21cae73799f7334 Mon Sep 17 00:00:00 2001 From: Zippity Date: Wed, 30 Jul 2025 18:06:48 -0700 Subject: [PATCH 1/4] fix sharp tools not taking damage when cutting grass --- kubejs/server_scripts/tfg/events.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index cc193ed06..77bd5d5f9 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -526,4 +526,23 @@ BlockEvents.rightClicked(event => { transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}_wall`, `tfc:rock/cobble/${stone}_wall`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true); }); }); -//#endregion \ No newline at end of file + +// Makes scythes, hoes, and knives take damage when cutting grass +BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { + let player = event.player; + let toolUsed = player.mainHandItem; + + if (!toolUsed.hasTag('tfc:sharp_tools')) { + return; + } + + if (!player.isCreative()) { + toolUsed.damageValue++; + if (toolUsed.damageValue >= toolUsed.maxDamage) { + event.server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); + toolUsed.count--; + } + } +}); + +//#endregion From a19877580719d321b8711e134a33d8cde0bbf0a4 Mon Sep 17 00:00:00 2001 From: Zippity Date: Wed, 30 Jul 2025 20:57:02 -0700 Subject: [PATCH 2/4] add TFC functionality to GT matchbox and matches --- kubejs/server_scripts/tfc/tags.js | 4 ++++ kubejs/server_scripts/tfg/events.js | 30 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index f6e7df5bc..4b8ae702b 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -60,6 +60,10 @@ const registerTFCItemTags = (event) => { event.add('tfc:usable_on_tool_rack', 'waterflasks:red_steel_flask') event.add('tfc:usable_on_tool_rack', 'tfc:wool_cloth') + // Igniters + event.add('tfc:starts_fires_with_durability', 'gtceu:matchbox') + event.add('tfc:starts_fires_with_items', 'gtceu:matches') + // Ингредиенты для закваски event.add('tfg:ferments_to_rennet', 'tfc:food/soybean') event.add('tfg:ferments_to_rennet', 'firmalife:food/fig') diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index 77bd5d5f9..d373afbbc 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -546,3 +546,33 @@ BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { }); //#endregion +// TODO +TFCEvents.startFire(event => { + let player = event.player + const item = player.mainHandItem + // player.tell(item) + if (item.id.toString() === 'gtceu:matchbox') { + player.tell('holding matchbox') + player.tell(item.nbt.getInt('usesLeft')) + + if (!item.nbt.contains('usesLeft')) { + player.tell('matchbox unused') + item.nbt.merge({usesLeft:15}) + return; + + } else if (item.nbt.getInt('usesLeft') <= 1) { + player.tell('???') + event.server.runCommandSilent(`playsound item.flintandsteel.use player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); + item.count-- + event.server.runCommandSilent(`give ${player.username} minecraft:paper`) + + } else { + let oldUses = item.nbt.getInt('usesLeft') + item.nbt.merge({usesLeft : oldUses - 1}) + return; + } + } + + + +}) \ No newline at end of file From 663b5680882cd5c7d094bae2ecef62170030b423 Mon Sep 17 00:00:00 2001 From: Zippity Date: Wed, 30 Jul 2025 18:06:48 -0700 Subject: [PATCH 3/4] fix sharp tools not taking damage when cutting grass --- kubejs/server_scripts/tfg/events.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index d373afbbc..93394e47c 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -546,6 +546,7 @@ BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { }); //#endregion +<<<<<<< HEAD // TODO TFCEvents.startFire(event => { let player = event.player @@ -575,4 +576,6 @@ TFCEvents.startFire(event => { -}) \ No newline at end of file +}) +======= +>>>>>>> b4c6f137 (fix sharp tools not taking damage when cutting grass) From 5c7bdece5ce6626d4a75a222c8a9af9ebefef913 Mon Sep 17 00:00:00 2001 From: Zippity Date: Wed, 6 Aug 2025 13:26:42 -0700 Subject: [PATCH 4/4] fixing all of my git sins --- kubejs/server_scripts/tfg/events.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index 93394e47c..6ce6f13df 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -546,7 +546,6 @@ BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { }); //#endregion -<<<<<<< HEAD // TODO TFCEvents.startFire(event => { let player = event.player @@ -577,5 +576,3 @@ TFCEvents.startFire(event => { }) -======= ->>>>>>> b4c6f137 (fix sharp tools not taking damage when cutting grass)