From 79e00e623eecbf21999a0d41772f1e07cb6495fc Mon Sep 17 00:00:00 2001
From: tier940 <tier940@protonmail.com>
Date: Thu, 12 Feb 2026 22:32:49 +0900
Subject: [PATCH] Fix BBW block preview showing on all GT tools

---
 CHANGELOG.md                                     |  5 +++++
 .../gtmt/mixins/bbw/ItemGTToolWandMixin.java     | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 821e586..c75ce8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.1.2
+- Fix BBW block preview showing on all GT tools.
+
+* * *
+
 # v1.1.1
 - Fix aluminum recipe conflicts with Chisel.
 
diff --git a/src/main/java/com/github/gtexpert/gtmt/mixins/bbw/ItemGTToolWandMixin.java b/src/main/java/com/github/gtexpert/gtmt/mixins/bbw/ItemGTToolWandMixin.java
index b3d65c0..5be10a6 100644
--- a/src/main/java/com/github/gtexpert/gtmt/mixins/bbw/ItemGTToolWandMixin.java
+++ b/src/main/java/com/github/gtexpert/gtmt/mixins/bbw/ItemGTToolWandMixin.java
@@ -74,7 +74,21 @@ public void nextFluidMode(ItemStack itemStack, EntityPlayer player) {
 
     @Override
     public IWand getWand() {
-        // Return a GT-aware IWand for BBW's preview rendering and other IWand consumers
+        if (!gtexpert$isWandTool()) {
+            // Non-wand GT tools: return IWand with 0 maxBlocks to suppress preview
+            return new IWand() {
+
+                @Override
+                public int getMaxBlocks(ItemStack itemStack) {
+                    return 0;
+                }
+
+                @Override
+                public boolean placeBlock(ItemStack itemStack, EntityLivingBase entity) {
+                    return false;
+                }
+            };
+        }
         return new IWand() {
 
             @Override