DisbandとBQu Link挙動の修正

Author: tier940

.claude/settings.local.json

@@ -0,0 +1,17 @@
+{
+  "env": {
+    "CLAUDE_CODE_NO_FLICKER": "0"
+  },
+  "permissions": {
+    "allow": [
+      "Bash(cat:*)",
+      "Bash(grep:*)",
+      "Bash(wc:*)",
+      "Bash(find:*)",
+      "Bash(./gradlew spotlessCheck:*)",
+      "Bash(./gradlew build:*)",
+      "Bash(./gradlew spotlessApply:*)",
+      "WebFetch(domain:deepwiki.com)"
+    ]
+  }
+}

CHANGELOG.md

@@ -7,57 +7,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * * *
 
+## [0.11.0]
+
+### Changed
+
+- **BQu Link now syncs the full member list**
+  - Turning BQu Link ON makes all BQu party members visible in BLPC automatically.
+  - Per-player opt-in is no longer required.
+- **BQu party auto-created on link**
+  - If no BQu party exists when BQu Link is toggled ON, one is created from the BLPC party's name, members, and roles.
+  - If a BQu party already exists, any missing BLPC members are added to it.
+- **Party screen stays open after BQu Link toggle**
+  - Switching BQu Link ON or OFF no longer closes the party menu — the panel refreshes in place.
+- **Disband only affects the BLPC party**
+  - Disbanding no longer touches the BQu party.
+  - Manage the BQu party through BetterQuesting's own screen.
+
+### Fixed
+
+- **Disband not working after re-creating a party**
+  - After disbanding and creating a new party, the Disband button would not show the confirmation dialog.
+- **Crash on world entry**
+  - Entering a world with certain mod combinations could cause a crash.
+- **BQu party appearing without linking**
+  - Creating a party in BQu would make it show up in BLPC's party list even when BQu Link was OFF.
+
+[0.11.0]: https://github.com/gtexpert/BetterLinkPartyClaim/releases/tag/v0.11.0
+
+* * *
+
 ## [0.10.0]
 
-> **Wire-protocol break.** The server-to-client notification packets were
-> merged into one (see *Changed* below). Client and server must run the same
-> version — a mixed pair will not communicate notifications correctly.
+> **Wire-protocol break.** Client and server must run the same version — a mixed pair will not communicate notifications correctly.
 
 ### Changed
 
-- **S→C notification packets unified**: `MessageChunkTransitNotify`,
-  `MessagePartyEventNotify`, and `MessageClaimFailed` are now a single
-  discriminator-multiplexed packet, `MessageClientNotify` (`int kind` +
-  per-kind payload). Wire IDs 6–8 collapsed into ID 6; new toast types are
-  added by appending a `KIND_*`/`EVENT_*` constant instead of a new wire ID.
-- **Live-update party UI**: the party panels (main menu, members, moderators,
-  settings, create/join, transfer ownership) now stay open and refresh in
-  place when server data changes, instead of closing on every sync. The view
-  closes only on a structural change — the party disappearing, a permission
-  boundary flipping, or ownership being lost.
-- **Free-to-join / invite flow**:
-  - Clicking a party in the create/join screen now opens the party menu
-    directly once the join succeeds, instead of just dismissing the screen.
-  - Full free-to-join parties are listed but shown grayed and non-clickable
-    rather than hidden, so a previously-available party doesn't silently vanish.
-- **Documentation**: `CLAUDE.md`, the architecture skill, and the code-review
-  agent updated to describe the discriminator-multiplexed packets, the
-  live-update widget patterns, and the shared `PartyWidgets` helpers.
+- **Live-update party UI**
+  - Party panels now stay open and refresh in place when data changes, instead of closing on every sync.
+  - Panels only close when the party is gone, permissions change, or ownership is lost.
+- **Free-to-join / invite flow**
+  - Joining a party from the create/join screen now opens the party menu directly.
+  - Full parties are shown grayed out instead of hidden.
 
 ### Fixed
 
-- **Stale party data in open panels**: after a disband, ownership transfer, or
-  kick performed by another player, an open party panel could keep showing the
-  old state (and, for the main menu, leave a stale "open sub-panel" button
-  behind). Panels now refresh or close correctly on every sync.
-- **Stale values in the Settings panel**: every server sync replaces the
-  cached party object, so the panel could display an out-of-date name, color,
-  member count, or toggle state. All Settings widgets now read the live party.
-- **Silent join failures**: trying to join a party that was disbanded, is no
-  longer free-to-join, or whose invite expired now shows a "Could not join the
-  party" toast instead of doing nothing visible. (Capacity failures already
-  showed "Party is full".)
-- **Self-notification toasts**: the player who joins a party no longer receives
-  a "you joined" toast for themselves, and the player who disbands a party no
-  longer receives a "party disbanded" toast.
-- **Optimistic-UI desync on rejected actions**: when the server rejects a party
-  action (e.g. a stale click), the rejecting player's client now receives a
-  corrective sync so the UI no longer shows a change that didn't take effect.
-- **Moderators panel after promotion**: a viewer who is promoted to OWNER while
-  the panel is open now gets the role-cycle controls without having to reopen.
-- **Memory leaks**: orphaned sub-panel handlers were accumulating each time the
-  main menu rebuilt (they are now created once and reused), and empty
-  invader-tracking sets were left behind on player logout.
+- **Stale party data in open panels**
+  - After a disband, ownership transfer, or kick by another player, open panels could keep showing outdated state.
+  - Panels now refresh or close correctly.
+- **Stale values in the Settings panel**
+  - Name, color, member count, and toggle states could show outdated values after a server sync.
+  - All settings now read live data.
+- **Silent join failures**
+  - Trying to join a disbanded, no-longer-free, or expired-invite party now shows a toast instead of doing nothing.
+- **Self-notification toasts**
+  - The player who joins or disbands a party no longer receives their own toast notification.
+- **UI desync on rejected actions**
+  - When the server rejects a party action, the client now receives a corrective sync so the UI matches the actual state.
+- **Moderators panel after promotion**
+  - A player promoted to OWNER while the panel is open now sees the role-cycle controls without reopening.
+- **Memory leaks**
+  - Sub-panel handlers were accumulating on each menu rebuild.
+  - Empty tracking sets were left behind on player logout.
 
 [0.10.0]: https://github.com/gtexpert/BetterLinkPartyClaim/releases/tag/v0.10.0
 
@@ -67,27 +77,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **Network layer refactor**: split the network handlers along the side
-  boundary. `IMessage` classes stay in `common/network/` and must not
-  reference any `@SideOnly` types in their bytecode; client-bound (S→C)
-  handlers now live in `client/network/` and are gated with
-  `@SideOnly(Side.CLIENT)`. Server-side registration uses a no-op handler
-  so the dedicated server never class-loads client code.
-- **`MessagePartyAction` dispatcher extracted**: the 22 action arms moved
-  from the inner `Handler` into `common/network/party/PartyActionDispatcher`,
-  one private method per action. Wire-protocol IDs and `ACTION_*` constants
-  are unchanged.
-- **`ModNetwork` registration**: client-bound messages are listed once in
-  `CLIENT_BOUND_MESSAGES` and installed via `ClientPacketHandlers.installAll()`
-  on the client. Wire IDs (0–8) are preserved.
+- **Network layer split by side**
+  - Server-side and client-side network handlers are now separated to prevent dedicated-server class-loading issues.
 
 ### Fixed
 
-- **Dedicated-server crash on party creation**:
-  `NoSuchMethodError: EnumDyeColor.func_193350_e()` — `EnumDyeColor.getColorValue()`
-  is `@SideOnly(Side.CLIENT)` in vanilla 1.12.2 and is not present on the
-  dedicated server. The default party color is now stored as the inlined
-  RGB constant instead.
+- **Dedicated-server crash on party creation**
+  - Creating a party on a dedicated server no longer crashes due to a missing client-only color method.
 
 [0.9.0]: https://github.com/gtexpert/BetterLinkPartyClaim/releases/tag/v0.9.0
 
@@ -99,54 +95,46 @@ Initial release.
 
 ### Added
 
-- **Chunk claiming**: claim, unclaim, and force-load chunks via a full-screen
-  ModularUI map (`M` key) and a client-side minimap HUD (`N` key to toggle).
-  Bulk operations are supported by drag selection, and dedicated buttons allow
-  unclaiming or unloading every chunk owned by the player at once.
-- **Server-authoritative party system**: parties are persisted under
-  `world/betterlink/pc/parties/<id>.dat` with three roles (`OWNER`, `ADMIN`,
-  `MEMBER`) and a configurable member cap.
-- **Trust levels** (`NONE`, `ALLY`, `MEMBER`, `MODERATOR`, `OWNER`) per
-  protected action: block edit, block interaction, attacking entities, and item
-  use. A separate trust level controls fake-player automation mods such as
-  BuildCraft and EnderIO.
-- **Allies and enemies**: party-versus-party relations replace the previous
-  per-player allowlists. Enemies are denied protection access regardless of
-  trust level.
-- **Explosion protection toggle** for claimed chunks (per party).
-- **Free-to-join parties** with optional invitation flow, configurable
-  description, color, and display name.
-- **Modular party manager UI** with tabbed panels for party info, protection,
-  allies, enemies, members, and invitations. Players and parties are filterable
-  via a search field, and all rows expose tooltips for available actions.
-- **Toast notifications** for party events (member joined/left, kicked,
-  disbanded, ownership transferred, role changed, BQu link/unlink, party full)
-  and a dedicated stream for claim-limit failures.
-- **Transit notifications** announcing when a member returns home, an ally
-  visits, or an enemy enters or leaves a claimed area.
-- **BetterQuesting integration** (optional): an opt-in switch links a player's
-  BLPC party to a BQu party. The active party provider is selected per player,
-  so non-linked players never modify BQu state.
-- **Chunk map rendering**: async terrain colorization with a `DynamicTexture`
-  cache; player position, claim ownership, and party color overlays are drawn
-  on top of the rendered map.
-- **Chat commands** (Forge `CommandTreeBase` rooted at `/blpc`):
-  - Public (level 0): `list`, `info <party>`, `me`, `here`, `claims`,
-    `invites`, `accept <party>`, `decline <party>`, `leave`.
-  - Operator only (level 3, under `/blpc admin`): `move-owner <party> <player>`,
-    `kick <party> <player>`, `disband <party>`.
-  - All commands provide tab completion for parties, members, and pending
-    invitations as appropriate.
-- **Localization**: full English (`en_us`) and Japanese (`ja_jp`) translations.
-- **Persistence**: party data, BQu link state, and chunk claims are saved via
-  `BLPCSaveHandler`; a one-time migration imports legacy data from the
-  pre-FTB-Lib layout.
+- **Chunk claiming**
+  - Claim, unclaim, and force-load chunks via a full-screen map (`M` key) and a minimap HUD (`N` key to toggle).
+  - Supports drag selection and bulk unclaim/unload buttons.
+- **Party system**
+  - Server-authoritative parties with three roles (Owner, Admin, Member) and a configurable member cap.
+  - Persisted per world.
+- **Trust levels**
+  - Per-action trust settings (block edit, block interaction, attacking entities, item use) with levels from None to Owner.
+  - A separate setting controls fake-player automation mods.
+- **Allies and enemies**
+  - Party-versus-party relations.
+  - Allies share protection access; enemies are denied regardless of trust level.
+- **Explosion protection**
+  - Per-party toggle for claimed chunks.
+- **Free-to-join parties**
+  - Optional open-join mode with invitation flow, description, color, and display name.
+- **Party manager UI**
+  - Tabbed panels for party info, protection, allies, enemies, members, and invitations.
+  - Searchable player/party lists with tooltips.
+- **Toast notifications**
+  - Party events: join, leave, kick, disband, ownership transfer, role change, BQu link/unlink, party full.
+  - Claim-limit failures.
+- **Transit notifications**
+  - Alerts when a member returns home, an ally visits, or an enemy enters/leaves claimed territory.
+- **BetterQuesting integration** (optional)
+  - Opt-in switch to link a BLPC party to a BQu party.
+  - Non-linked players are unaffected.
+- **Chunk map rendering**
+  - Async terrain colorization with player position, claim ownership, and party color overlays.
+- **Chat commands**
+  - Public: `/blpc list`, `info`, `me`, `here`, `claims`, `invites`, `accept`, `decline`, `leave`.
+  - Operator: `/blpc admin move-owner`, `kick`, `disband`.
+  - All commands support tab completion.
+- **Localization**
+  - English and Japanese translations.
 
 ### Compatibility
 
 - Minecraft 1.12.2, Forge.
 - Required: ModularUI 3.1.5+.
-- Optional: BetterQuesting (for party integration), JourneyMap (for the
-  minimap integration hooks).
+- Optional: BetterQuesting (party integration), JourneyMap (minimap integration).
 
 [0.8.0]: https://github.com/gtexpert/BetterLinkPartyClaim/releases/tag/v0.8.0

buildscript.properties

@@ -30,7 +30,7 @@ autoUpdateBuildScript = false
 minecraftVersion = 1.12.2
 
 # Debug mod compatibility
-debug_all = false
+debug_all = true
 debug_bqu = false
 debug_jmap = false
 

src/main/java/com/github/gtexpert/blpc/api/party/IPartyProvider.java

@@ -70,6 +70,17 @@ default boolean hasNativeParty(UUID playerUUID) {
         return getPartyName(playerUUID) != null;
     }
 
+    /**
+     * Ensures a native party exists for the owner with the same members as the
+     * given BLPC party. Creates the native party if absent, adds missing
+     * members, and maps roles. Returns {@code true} if the native party is
+     * ready for linking after this call.
+     */
+    default boolean ensureNativePartyWithMembers(EntityPlayerMP owner,
+                                                 com.github.gtexpert.blpc.common.party.Party blpcParty) {
+        return hasNativeParty(owner.getUniqueID());
+    }
+
     /** Syncs party data to all connected clients after mutations. */
     void syncToAll();
 

src/main/java/com/github/gtexpert/blpc/client/gui/party/CreatePanel.java

@@ -40,7 +40,7 @@ public static ModularPanel build() {
     public static ModularPanel build(IPanelHandler reopener) {
         UUID playerId = Minecraft.getMinecraft().player.getUniqueID();
 
-        ModularPanel panel = new ModularPanel(PANEL_ID);
+        ModularPanel panel = new ModularPanel(PartyWidgets.uniquePanelId(PANEL_ID));
         panel.size(PartyWidgets.STANDARD_W, PartyWidgets.STANDARD_H);
 
         PartyWidgets.addHeader(panel, "blpc.party.create_title");

src/main/java/com/github/gtexpert/blpc/client/gui/party/MainPanel.java

@@ -51,7 +51,7 @@ public static ModularPanel build(UUID playerId, IPanelHandler reopener) {
 
         UUID partyId = party.getPartyId();
 
-        ModularPanel panel = new ModularPanel(PANEL_ID);
+        ModularPanel panel = new ModularPanel(PartyWidgets.uniquePanelId(PANEL_ID));
         panel.size(PartyWidgets.STANDARD_W, PartyWidgets.STANDARD_H);
 
         panel.child(new ScrollingTextWidget(IKey.dynamic(() -> {
@@ -80,7 +80,7 @@ public static ModularPanel build(UUID playerId, IPanelHandler reopener) {
         rebuildMenu(menuList, panel, partyId, playerId, nav);
 
         IPanelHandler disbandHandler = IPanelHandler.simple(
-                panel, (pp, player) -> ConfirmDialog.builder("blpc.party.dialog.disband")
+                panel, (pp, player) -> ConfirmDialog.builder(PartyWidgets.uniquePanelId("blpc.party.dialog.disband"))
                         .title("blpc.party.disband_confirm_title")
                         .message("blpc.party.disband_confirm_msg")
                         .yesLabel("blpc.party.disband_yes")
@@ -98,7 +98,6 @@ public static ModularPanel build(UUID playerId, IPanelHandler reopener) {
                 .setEnabledIf(w -> isOwner(partyId, playerId)));
 
         PartyWidgets.addSyncRefreshListener(panel, () -> {
-            // Party gone: cascade-close sub-panels too.
             if (ClientPartyCache.getPartyByPlayer(playerId) == null) {
                 panel.closeIfOpen();
                 return;

src/main/java/com/github/gtexpert/blpc/client/gui/party/MembersPanel.java

@@ -33,7 +33,7 @@ public static ModularPanel build(Party party) {
         boolean canManage = myRole != null && myRole.canInvite();
         UUID partyId = party.getPartyId();
 
-        ModularPanel panel = new ModularPanel(PANEL_ID);
+        ModularPanel panel = new ModularPanel(PartyWidgets.uniquePanelId(PANEL_ID));
         PartyRole[] myRoleRef = { myRole };
 
         LiveSearchableList<PlayerEntry> membersList = new LiveSearchableList<>(

src/main/java/com/github/gtexpert/blpc/client/gui/party/ModeratorsPanel.java

@@ -32,7 +32,7 @@ public static ModularPanel build(Party party) {
         UUID partyId = party.getPartyId();
         boolean[] isOwnerRef = { party.getRole(playerId) == PartyRole.OWNER };
 
-        ModularPanel panel = new ModularPanel(PANEL_ID);
+        ModularPanel panel = new ModularPanel(PartyWidgets.uniquePanelId(PANEL_ID));
         panel.size(PartyWidgets.STANDARD_W, PartyWidgets.STANDARD_H);
         PartyWidgets.addHeader(panel, "blpc.party.moderators_title");
 

src/main/java/com/github/gtexpert/blpc/client/gui/party/PartyWidgets.java

@@ -49,6 +49,18 @@ public final class PartyWidgets {
 
     private PartyWidgets() {}
 
+    /**
+     * Per-instance unique panel name suffix. MUI's {@code PanelManager.panelHandlerMap}
+     * keys on {@link ModularPanel#getName()} and never removes entries; a fresh
+     * {@code IPanelHandler.simple(...)} that opens the same panel name silently
+     * redirects to the stale first handler ("Using existing panel handler!" in
+     * MUI log). Appending a monotonic suffix to every rebuilt panel/dialog name
+     * makes each instance unique so the lookup hits the current handler.
+     */
+    public static String uniquePanelId(String base) {
+        return base + "#" + System.nanoTime();
+    }
+
     /** Centered title + close button at the top of the panel. */
     public static void addHeader(ModularPanel panel, IKey title) {
         panel.child(title.color(GuiColors.WHITE).shadow(true)

src/main/java/com/github/gtexpert/blpc/client/gui/party/SettingsPanel.java

@@ -50,7 +50,7 @@ public class SettingsPanel {
     private static final TrustLevel[] CYCLE_LEVELS = { TrustLevel.NONE, TrustLevel.ALLY, TrustLevel.MEMBER };
 
     public static ModularPanel build(Party initialParty) {
-        ModularPanel panel = new ModularPanel(PANEL_ID);
+        ModularPanel panel = new ModularPanel(PartyWidgets.uniquePanelId(PANEL_ID));
         panel.size(PartyWidgets.LARGE_W, PartyWidgets.LARGE_H);
 
         UUID partyId = initialParty.getPartyId();
@@ -87,7 +87,7 @@ private static IWidget buildPartyInfoPage(Supplier<Party> partyRef, ModularPanel
 
         // Pre-create handlers to avoid "same panel handler already exists" on repeated clicks.
         IPanelHandler renameHandler = IPanelHandler.simple(panel, (pp, player) -> InputDialog
-                .builder("blpc.party.dialog.rename")
+                .builder(PartyWidgets.uniquePanelId("blpc.party.dialog.rename"))
                 .title("blpc.party.name_field")
                 .defaultValue(partyRef.get().getName())
                 .confirmLabel("blpc.map.yes")
@@ -98,7 +98,7 @@ private static IWidget buildPartyInfoPage(Supplier<Party> partyRef, ModularPanel
                 .build(), true);
 
         IPanelHandler descHandler = IPanelHandler.simple(panel, (pp, player) -> InputDialog
-                .builder("blpc.party.dialog.description")
+                .builder(PartyWidgets.uniquePanelId("blpc.party.dialog.description"))
                 .title("blpc.party.description_field")
                 .defaultValue(partyRef.get().getDescription())
                 .confirmLabel("blpc.map.yes")