From 14b845e9a88b9c4e9b2aa53784c8c2eeefcbb426 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 8 Jun 2026 18:22:27 +0000 Subject: [PATCH] =?UTF-8?q?0.8.2:=20Counting=20House=20=E2=86=92=20Exchang?= =?UTF-8?q?e=20+=20fix=20click-doesn't-refresh-detail=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename ------ Counting House → Exchange everywhere. "Exchange" reads as intuitive ("an exchange where I trade items for spurs") where Counting House was historically accurate but obscure. /bns open counthouse → /bns open exchange. Class CountingHouseScreen → ExchangeScreen. Lang key counting_house → exchange. NPC name suggestion in docs: "Exchange Clerk". Click-doesn't-refresh bug ------------------------- ItemCell/BountyRow/PlotRow's mousePressed updated the static `selected` field, but the detail sub-panel was already built with the old value at refreshWidgets time. Result: clicking a different item updated the highlight but the right-side detail pane never changed. Fix: call getGui().refreshWidgets() after updating selection. FTB Library's recursive refresh re-runs SellDetail.addWidgets/ BountyDetail.addWidgets/PlotDetail.addWidgets with the new selected value. Standard FTB Library pattern for "selection changed → redraw". Co-Authored-By: Claude Opus 4.7 --- gradle.properties | 2 +- .../sijbers/bnstoolkit/client/BnsKeyBindings.java | 4 ++-- .../bnstoolkit/client/OpenScreenDispatcher.java | 4 ++-- .../client/screens/BountyBoardScreen.java | 1 + ...CountingHouseScreen.java => ExchangeScreen.java} | 13 +++++++++---- .../bnstoolkit/client/screens/HubScreen.java | 2 +- .../client/screens/PlotPurchaseScreen.java | 1 + .../bnstoolkit/client/screens/QuestLogScreen.java | 8 ++++---- .../uk/sijbers/bnstoolkit/data/SellCatalogue.java | 8 ++++---- .../network/s2c/TierStateUpdatePacket.java | 2 +- .../bnstoolkit/server/BnsServerCommands.java | 4 ++-- .../bnstoolkit/server/CountingHouseCommands.java | 12 ++++++------ .../resources/assets/bnstoolkit/lang/en_us.json | 4 ++-- 13 files changed, 36 insertions(+), 29 deletions(-) rename src/main/java/uk/sijbers/bnstoolkit/client/screens/{CountingHouseScreen.java => ExchangeScreen.java} (94%) diff --git a/gradle.properties b/gradle.properties index 45577e5..1ed3a20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,5 +19,5 @@ loader_version_range=[1,) mod_id=bnstoolkit mod_name=Brass and Sigil Toolkit mod_license=All Rights Reserved -mod_version=0.8.1 +mod_version=0.8.2 mod_group_id=uk.sijbers.bnstoolkit diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/BnsKeyBindings.java b/src/main/java/uk/sijbers/bnstoolkit/client/BnsKeyBindings.java index b91b0c9..cce3ef9 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/BnsKeyBindings.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/BnsKeyBindings.java @@ -10,7 +10,7 @@ import net.neoforged.neoforge.client.settings.KeyConflictContext; import org.lwjgl.glfw.GLFW; import uk.sijbers.bnstoolkit.BnsToolkit; import uk.sijbers.bnstoolkit.client.screens.BountyBoardScreen; -import uk.sijbers.bnstoolkit.client.screens.CountingHouseScreen; +import uk.sijbers.bnstoolkit.client.screens.ExchangeScreen; import uk.sijbers.bnstoolkit.client.screens.HubScreen; import uk.sijbers.bnstoolkit.client.screens.PlotPurchaseScreen; import uk.sijbers.bnstoolkit.client.screens.QuestLogScreen; @@ -114,7 +114,7 @@ public final class BnsKeyBindings { } if (OPEN_SHOP.consumeClick()) { NetSend.requestSnapshot("SELL"); - new CountingHouseScreen().openGui(); + new ExchangeScreen().openGui(); } if (OPEN_QUESTLOG.consumeClick()) { NetSend.requestSnapshot("ALL"); diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/OpenScreenDispatcher.java b/src/main/java/uk/sijbers/bnstoolkit/client/OpenScreenDispatcher.java index 1f900af..f677211 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/OpenScreenDispatcher.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/OpenScreenDispatcher.java @@ -2,7 +2,7 @@ package uk.sijbers.bnstoolkit.client; import uk.sijbers.bnstoolkit.BnsToolkit; import uk.sijbers.bnstoolkit.client.screens.BountyBoardScreen; -import uk.sijbers.bnstoolkit.client.screens.CountingHouseScreen; +import uk.sijbers.bnstoolkit.client.screens.ExchangeScreen; import uk.sijbers.bnstoolkit.client.screens.HubScreen; import uk.sijbers.bnstoolkit.client.screens.PlotPurchaseScreen; import uk.sijbers.bnstoolkit.client.screens.QuestLogScreen; @@ -25,7 +25,7 @@ public final class OpenScreenDispatcher { case "tier" -> { NetSend.requestSnapshot("TIER"); new TierUpgradeScreen().openGui(); } case "bounty" -> { NetSend.requestSnapshot("BOUNTY"); new BountyBoardScreen().openGui(); } case "plot" -> { NetSend.requestSnapshot("PLOT"); new PlotPurchaseScreen().openGui(); } - case "counthouse" -> { NetSend.requestSnapshot("SELL"); new CountingHouseScreen().openGui(); } + case "exchange" -> { NetSend.requestSnapshot("SELL"); new ExchangeScreen().openGui(); } case "journal" -> { NetSend.requestSnapshot("ALL"); new QuestLogScreen().openGui(); } case "hub" -> { NetSend.requestSnapshot("ALL"); new HubScreen().openGui(); } default -> BnsToolkit.LOG.warn("[bnstoolkit] unknown screen requested: {}", which); diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/screens/BountyBoardScreen.java b/src/main/java/uk/sijbers/bnstoolkit/client/screens/BountyBoardScreen.java index 6f78a80..1a31d92 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/screens/BountyBoardScreen.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/screens/BountyBoardScreen.java @@ -120,6 +120,7 @@ public final class BountyBoardScreen extends BaseBnsScreen { if (isMouseOver) { selected = b.id(); TierUpgradeScreen.playClick(); + getGui().refreshWidgets(); // re-init so detail pane reads new selection return true; } return false; diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/screens/CountingHouseScreen.java b/src/main/java/uk/sijbers/bnstoolkit/client/screens/ExchangeScreen.java similarity index 94% rename from src/main/java/uk/sijbers/bnstoolkit/client/screens/CountingHouseScreen.java rename to src/main/java/uk/sijbers/bnstoolkit/client/screens/ExchangeScreen.java index bb9fe36..0a29221 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/screens/CountingHouseScreen.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/screens/ExchangeScreen.java @@ -20,7 +20,7 @@ import uk.sijbers.bnstoolkit.data.SpurBalance; import uk.sijbers.bnstoolkit.network.NetSend; /** - * The Counting House — wealth exchange screen. + * The Exchange — wealth exchange screen. * * Players bring diamonds / netherite / ancient debris and convert them * to spurs credited directly to their bank. Reached via the Counting @@ -34,9 +34,9 @@ import uk.sijbers.bnstoolkit.network.NetSend; *

Bottom-right: Back (returns to Hub if opened from there) / * Close (NPC-opened path). */ -public final class CountingHouseScreen extends BaseBnsScreen { - public CountingHouseScreen() { - super(Component.translatable("screen.bnstoolkit.counting_house")); +public final class ExchangeScreen extends BaseBnsScreen { + public ExchangeScreen() { + super(Component.translatable("screen.bnstoolkit.exchange")); } private static ResourceLocation selected = ResourceLocation.parse("minecraft:diamond"); @@ -115,6 +115,11 @@ public final class CountingHouseScreen extends BaseBnsScreen { if (isMouseOver) { selected = itemId; TierUpgradeScreen.playClick(); + // Detail pane was built with the old selected value — re-init + // the whole screen so SellDetail.addWidgets reads the new + // selection. FTB Library's refreshWidgets clears + re-adds + // + recurses into sub-panels, which is what we need. + getGui().refreshWidgets(); return true; } return false; diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/screens/HubScreen.java b/src/main/java/uk/sijbers/bnstoolkit/client/screens/HubScreen.java index 2277f0b..d9cbf47 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/screens/HubScreen.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/screens/HubScreen.java @@ -21,7 +21,7 @@ import uk.sijbers.bnstoolkit.network.NetSend; * wealth, current shop fee, slot caps, active bounties count, owned * plots count. The Quest Log button opens the read-only quest overview. * - *

Transactional features (Counting House exchange, Bounty Board, + *

Transactional features (Exchange exchange, Bounty Board, * Tier Upgrade, Plot Office) are not reachable from the hub by design. * Players visit the corresponding NPC at spawn — that's what makes spawn * worth caring about. NPCs invoke {@code /bns open } on the diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/screens/PlotPurchaseScreen.java b/src/main/java/uk/sijbers/bnstoolkit/client/screens/PlotPurchaseScreen.java index 7b9b0de..370ac7d 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/screens/PlotPurchaseScreen.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/screens/PlotPurchaseScreen.java @@ -92,6 +92,7 @@ public final class PlotPurchaseScreen extends BaseBnsScreen { if (isMouseOver) { selected = p.id(); TierUpgradeScreen.playClick(); + getGui().refreshWidgets(); return true; } return false; diff --git a/src/main/java/uk/sijbers/bnstoolkit/client/screens/QuestLogScreen.java b/src/main/java/uk/sijbers/bnstoolkit/client/screens/QuestLogScreen.java index 6efe333..f4efd27 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/client/screens/QuestLogScreen.java +++ b/src/main/java/uk/sijbers/bnstoolkit/client/screens/QuestLogScreen.java @@ -26,10 +26,10 @@ import java.util.Map; *

* @@ -85,8 +85,8 @@ public final class QuestLogScreen extends BaseBnsScreen { add(new Header(this,"")); - // Section 2: Counting House rates - add(new Header(this,"§e=== Counting House Rates ===")); + // Section 2: Exchange rates + add(new Header(this,"§e=== Exchange Rates ===")); int fee = ClientBnsState.effectiveFeePct; add(new Header(this,"§7 Your tier fee: §c" + fee + "%§r")); for (Map.Entry entry : SellCatalogue.PRICES.entrySet()) { diff --git a/src/main/java/uk/sijbers/bnstoolkit/data/SellCatalogue.java b/src/main/java/uk/sijbers/bnstoolkit/data/SellCatalogue.java index 3199df5..f610fe1 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/data/SellCatalogue.java +++ b/src/main/java/uk/sijbers/bnstoolkit/data/SellCatalogue.java @@ -6,11 +6,11 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * Counting House exchange rates. + * Exchange rates — the four wealth-tokens the Exchange will buy. * - *

The Counting House is the realm's wealth exchange — not a general - * shop. It accepts the universal wealth-store items (diamond, netherite, - * ancient debris) and credits the player's bank account in spurs. + *

The Exchange is the realm's wealth exchange — not a general + * shop. It accepts diamond, diamond_block, netherite_ingot, and + * ancient_debris, crediting the player's bank account in spurs. * *

Iron, gold, coal, redstone, mob drops etc. are not here. * Players who want to sell those operate their own shops with diff --git a/src/main/java/uk/sijbers/bnstoolkit/network/s2c/TierStateUpdatePacket.java b/src/main/java/uk/sijbers/bnstoolkit/network/s2c/TierStateUpdatePacket.java index 8805fe4..29409fa 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/network/s2c/TierStateUpdatePacket.java +++ b/src/main/java/uk/sijbers/bnstoolkit/network/s2c/TierStateUpdatePacket.java @@ -11,7 +11,7 @@ import uk.sijbers.bnstoolkit.client.ClientBnsState; /** * S2C: civic tier (1..13), cash on hand (inventory coins), bank balance - * (Numismatics personal account), and the effective Counting House fee%. + * (Numismatics personal account), and the effective Exchange fee%. * * Cash + bank are sent separately so the hub UI can break them out * ("on hand" vs "in bank") while the HUD overlay sums them for the diff --git a/src/main/java/uk/sijbers/bnstoolkit/server/BnsServerCommands.java b/src/main/java/uk/sijbers/bnstoolkit/server/BnsServerCommands.java index fb836c1..404cddd 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/server/BnsServerCommands.java +++ b/src/main/java/uk/sijbers/bnstoolkit/server/BnsServerCommands.java @@ -35,7 +35,7 @@ public final class BnsServerCommands { private BnsServerCommands() {} private static final String[] SCREEN_NAMES = { - "hub", "tier", "bounty", "plot", "counthouse", "journal" + "hub", "tier", "bounty", "plot", "exchange", "journal" }; @SubscribeEvent @@ -74,7 +74,7 @@ public final class BnsServerCommands { for (String s : SCREEN_NAMES) if (s.equals(which)) { ok = true; break; } if (!ok) { src.sendFailure(Component.literal("Unknown screen: " + which - + ". Options: hub, tier, bounty, plot, counthouse, journal")); + + ". Options: hub, tier, bounty, plot, exchange, journal")); return 0; } ServerEconomyBridge.openScreen(sp, which); diff --git a/src/main/java/uk/sijbers/bnstoolkit/server/CountingHouseCommands.java b/src/main/java/uk/sijbers/bnstoolkit/server/CountingHouseCommands.java index 4446f02..c8b96f1 100644 --- a/src/main/java/uk/sijbers/bnstoolkit/server/CountingHouseCommands.java +++ b/src/main/java/uk/sijbers/bnstoolkit/server/CountingHouseCommands.java @@ -22,13 +22,13 @@ import uk.sijbers.bnstoolkit.economy.NumismaticsBridge; import uk.sijbers.bnstoolkit.network.ServerEconomyBridge; /** - * Counting House commands — the wealth-exchange + wallet inspection + * Exchange commands — the wealth-exchange + wallet inspection * verbs that used to live in KubeJS. * *

    *
  • {@code /bns sell } — exchange wealth-token items * for spurs, credited straight to the player's Numismatics bank - * account. NPC dialogue at the Counting House Clerk fires this on + * account. NPC dialogue at the Exchange Clerk fires this on * the clicking player.
    • *
  • {@code /bns wallet} — show inventory cash, bank balance, total.
    • *
  • {@code /bns wallet deposit } — move coins from inventory @@ -67,7 +67,7 @@ public final class CountingHouseCommands { ctx.getSource(), IntegerArgumentType.getInteger(ctx, "amount")))))); event.getDispatcher().register(bns); - BnsToolkit.LOG.info("[bnstoolkit] registered Counting House + wallet commands"); + BnsToolkit.LOG.info("[bnstoolkit] registered Exchange + wallet commands"); } // ─── /bns sell ─────────────────────────────────────────────────── @@ -86,8 +86,8 @@ public final class CountingHouseCommands { return 0; } if (!SellCatalogue.PRICES.containsKey(item)) { - sp.sendSystemMessage(Component.literal("§cThe Counting House doesn't exchange '" + itemId - + "'. Try diamonds, netherite, or ancient debris.")); + sp.sendSystemMessage(Component.literal("§cThe Exchange doesn't accept '" + itemId + + "'. Bring diamonds, netherite, or ancient debris.")); return 0; } @@ -130,7 +130,7 @@ public final class CountingHouseCommands { sp.sendSystemMessage(Component.literal("§6Sold " + count + "x " + itemId + " for §a" + payout + " spurs§r§6 → bank.")); - BnsToolkit.LOG.info("[bns/counthouse] {} sold {}x {} for {} spurs (lifetime now {})", + BnsToolkit.LOG.info("[bns/exchange] {} sold {}x {} for {} spurs (lifetime now {})", sp.getName().getString(), count, itemId, payout, lifetimeSold + count); // Push fresh snapshots so the HUD updates instantly diff --git a/src/main/resources/assets/bnstoolkit/lang/en_us.json b/src/main/resources/assets/bnstoolkit/lang/en_us.json index 37a5c5e..2a4e28c 100644 --- a/src/main/resources/assets/bnstoolkit/lang/en_us.json +++ b/src/main/resources/assets/bnstoolkit/lang/en_us.json @@ -4,7 +4,7 @@ "key.bnstoolkit.tier": "Open Tier Ladder (direct)", "key.bnstoolkit.bounties": "Open Bounty Board (direct)", "key.bnstoolkit.plots": "Open Plot Office (direct)", - "key.bnstoolkit.shop": "Open Counting House (direct)", + "key.bnstoolkit.shop": "Open Exchange (direct)", "key.bnstoolkit.journal": "Open Adventurer's Journal (direct)", "key.bnstoolkit.questlog": "Open Quest Log (direct)", @@ -13,5 +13,5 @@ "screen.bnstoolkit.bounty_board": "Bounty Board", "screen.bnstoolkit.quest_log": "Adventurer's Journal", "screen.bnstoolkit.plot_purchase": "Plot Office", - "screen.bnstoolkit.counting_house": "Counting House" + "screen.bnstoolkit.exchange": "Exchange" }