From 1a3e868f695a9b8c0bf55476185d173afc9ab7b6 Mon Sep 17 00:00:00 2001
From: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Date: Wed, 29 Oct 2025 08:07:25 -0500
Subject: [PATCH] fixing graphite frame block interaction (#2122)

* Update events.js

* Update CHANGELOG.md

* Update CHANGELOG.md
---
 CHANGELOG.md                        | 2 ++
 kubejs/server_scripts/tfg/events.js | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dda25c682..eea9db615 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - Changed Salvos to use Phenol instead of Aminophenol (#2119) @Xtrial-01
 - The teleporting between the Beneath and the Overworld should now only replace collapsible blocks with air (instead of everything), and will give 30 sec of slow fall and fire protection @Pyritie
 - Added tortilla chips, tomato sauce, salsa, and shredded cheese to the meal bag tag @Pyritie
+- Glacian Rams now give more wool @BlueBoat29
 ### Bug fixes
 - Fixed part of the tungsten processing loop giving way too much salt (#2095) @Redeix
 - Fixed basic super tanks so you can now left/right click with them in GUIs like you can with the others (#2100) @jurrejelle
@@ -33,6 +34,7 @@
 - Fixed some AFC logs not having stripping recipes @Pyritie
 - Fixed some issues related to AE2 blocking mode @ko-lja
 - Fixed wild bulbkin plants not dropping bulbkin seeds @Pyritie
+- Fixed graphite moderator frame interactions @BlueBoat29
 ### Translation updates
 - Chinese (simplified) @jmecn
 - Ukranian @MetEnBouldry
diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js
index 537ab0a0e..37f1b7963 100644
--- a/kubejs/server_scripts/tfg/events.js
+++ b/kubejs/server_scripts/tfg/events.js
@@ -593,6 +593,7 @@ function transformBlockWithToolReturn(event, inputBlock, outputBlock, outputItem
 	} else {
 		if (block.id.toString() !== inputBlock) return;
 	}
+	if (!player.crouching) return;
 
 	if (toolId.startsWith('#')) {
 		if (item.isEmpty() || !player.mainHandItem.hasTag(toolId.substring(1))) return;
@@ -754,7 +755,7 @@ BlockEvents.rightClicked(event => {
 	transformBlockWithToolReturn(event, 'tfg:moderate_core_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:graphite_moderator', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
 
 	transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:impure_moderate_core_frame', 'tfg:impure_graphite_moderator', true, 1, 'block.wool.place', 'minecraft:happy_villager', true);
-	transformBlockWithToolReturn(event, 'tfg:impure_moderate_core_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:graphite_moderator', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
+	transformBlockWithToolReturn(event, 'tfg:impure_moderate_core_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:impure_graphite_moderator', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
 
 });