Network multiplayer optimization (delta synchronization, reconnect support)

.gitattributes

@@ -1 +1,9 @@
-* text=auto
+* text=auto
+
+# Prevent merging of branch-specific files
+# These files use "ours" merge strategy - local version is always kept during merges
+.gitattributes merge=ours
+testlogs/ merge=ours
+testlogs/** merge=ours
+.documentation/ merge=ours
+.documentation/** merge=ours

.gitignore

@@ -94,3 +94,8 @@ forge-gui/tools/PerSetTrackingResults
 # Ignore python temporaries
 __pycache__
 *.pyc
+
+# Ignore Claude configuration files
+.claude
+CLAUDE.md
+

forge-game/src/main/java/forge/game/GameView.java

@@ -313,4 +313,12 @@ public GameOutcome getOutcome() {
     public AnteResult getAnteResult(PlayerView player) {
         return getOutcome().getAnteResult(player);
     }
+
+    @Override
+    public String toString() {
+        return String.format("GameView[id=%d, turn=%d, phase=%s, players=%d, gameOver=%b]",
+                getId(), getTurn(), getPhase(),
+                getPlayers() != null ? getPlayers().size() : 0,
+                isGameOver());
+    }
 }

forge-game/src/main/java/forge/game/spellability/StackItemView.java

@@ -41,6 +41,14 @@ public StackItemView(SpellAbilityStackInstance si) {
         updateOptionalCost(si);
     }
 
+    /**
+     * Constructor for network deserialization.
+     * Creates an empty StackItemView that will be populated via property deserialization.
+     */
+    public StackItemView(final int id0, final forge.trackable.Tracker tracker) {
+        super(id0, tracker);
+    }
+
     public String getKey() {
         return get(TrackableProperty.Key);
     }

forge-game/src/main/java/forge/trackable/TrackableObject.java

@@ -1,6 +1,7 @@
 package forge.trackable;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.Map;
@@ -64,7 +65,7 @@ protected final <T> T get(final TrackableProperty key) {
         return value;
     }
 
-    protected final <T> void set(final TrackableProperty key, final T value) {
+    public final <T> void set(final TrackableProperty key, final T value) {
         if (tracker != null && tracker.isFrozen()) { //if trackable objects currently frozen, queue up delayed prop change
             boolean respectsFreeze = false;
             if (key.getFreezeMode() == TrackableProperty.FreezeMode.RespectsFreeze) {
@@ -130,4 +131,44 @@ public final void deserialize(final TrackableDeserializer td) {
         }
         changedProps.clear();
     }
+
+    // Delta sync support methods
+    /**
+     * Check if this object has any changed properties that need to be synced.
+     * @return true if there are pending changes
+     */
+    public final boolean hasChanges() {
+        return !changedProps.isEmpty();
+    }
+
+    /**
+     * Get an unmodifiable view of the changed properties.
+     * Changes are not cleared until clearChanges() is called.
+     * @return set of properties that have changed
+     */
+    public final Set<TrackableProperty> getChangedProps() {
+        return Collections.unmodifiableSet(changedProps);
+    }
+
+    /**
+     * Clear the change tracking flags after changes have been acknowledged.
+     * Should be called after delta has been sent and acknowledged by client.
+     */
+    public final void clearChanges() {
+        changedProps.clear();
+    }
+
+    /**
+     * Serialize only the changed properties (for delta sync).
+     * Does not clear the change flags - call clearChanges() separately after acknowledgment.
+     * @param ts the serializer to write to
+     */
+    public final void serializeChangedOnly(final TrackableSerializer ts) {
+        ts.write(changedProps.size());
+        for (TrackableProperty key : changedProps) {
+            ts.write(TrackableProperty.serialize(key));
+            key.serialize(ts, props.get(key));
+        }
+        // Note: Does not clear changedProps - that's done on acknowledgment
+    }
 }

forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java

@@ -86,10 +86,11 @@ private void join(final String url) {
         });
 
         final ChatMessage result = NetConnectUtil.join(url, VSubmenuOnlineLobby.SINGLETON_INSTANCE, FNetOverlay.SINGLETON_INSTANCE);
-        if(Objects.equals(result.getMessage(), ForgeConstants.CLOSE_CONN_COMMAND)) {
+        String message = result.getMessage();
+        if(Objects.equals(message, ForgeConstants.CLOSE_CONN_COMMAND)) {
             FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("UnableConnectToServer", url));
             SOverlayUtils.hideOverlay();
-        } else if (Objects.equals(result.getMessage(), ForgeConstants.INVALID_HOST_COMMAND)) {
+        } else if (Objects.equals(message, ForgeConstants.INVALID_HOST_COMMAND)) {
             FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblDetectedInvalidHostAddress", url));
             SOverlayUtils.hideOverlay();
         } else {

forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java

@@ -186,5 +186,24 @@ public boolean onClosing(final FScreen screen) {
 
     @Override
     public void closeConn(String msg) {
+        // Clean up connection state
+        if (client != null) {
+            client.close();
+            client = null;
+        }
+        FServerManager server = FServerManager.getInstance();
+        if (server.isHosting()) {
+            server.stopServer();
+        }
+        FNetOverlay.SINGLETON_INSTANCE.reset();
+
+        // Clear lobby and repopulate
+        this.lobby = null;
+        populate();
+
+        // Show error message if provided
+        if (msg != null && !msg.isEmpty()) {
+            SOptionPane.showErrorDialog(msg, Localizer.getInstance().getMessage("lblConnectionError"));
+        }
     }
 }

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -72,7 +72,7 @@
 import forge.game.spellability.StackItemView;
 import forge.game.spellability.TargetChoices;
 import forge.game.zone.ZoneType;
-import forge.gamemodes.match.AbstractGuiGame;
+import forge.gamemodes.net.NetworkDebugLogger;
 import forge.gui.FNetOverlay;
 import forge.gui.FThreads;
 import forge.gui.GuiBase;
@@ -123,7 +123,9 @@
 import forge.toolbox.imaging.FImageUtil;
 import forge.toolbox.special.PhaseIndicator;
 import forge.toolbox.special.PhaseLabel;
+import forge.trackable.Tracker;
 import forge.trackable.TrackableCollection;
+import forge.trackable.TrackableTypes;
 import forge.util.FSerializableFunction;
 import forge.util.ITriggerEvent;
 import forge.util.Localizer;
@@ -144,7 +146,7 @@
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  */
 public final class CMatchUI
-    extends AbstractGuiGame
+    extends forge.gamemodes.net.NetworkGuiGame
     implements ICDoc, IMenuProvider {
 
     public static final EnumSet<ZoneType> FLOATING_ZONE_TYPES = EnumSet.of(ZoneType.Library, ZoneType.Graveyard, ZoneType.Exile,
@@ -293,6 +295,13 @@ private void initMatch(final FCollectionView<PlayerView> sortedPlayers, final Co
         this.sortedPlayers = sortedPlayers;
         allHands = sortedPlayers.size() == getLocalPlayerCount();
 
+        // Debug logging for network play
+        NetworkDebugLogger.debug("[CMatchUI.initMatch] sortedPlayers count=%d", sortedPlayers.size());
+        for (PlayerView p : sortedPlayers) {
+            NetworkDebugLogger.debug("[CMatchUI.initMatch]   Player ID=%d, hash=%d, isLocal=%b",
+                    p.getId(), System.identityHashCode(p), (myPlayers != null && myPlayers.contains(p)));
+        }
+
         final String[] indices = FModel.getPreferences().getPref(FPref.UI_AVATARS).split(",");
 
         final List<VField> fields = new ArrayList<>();
@@ -435,6 +444,10 @@ public void updateZones(final Iterable<PlayerZoneUpdate> zonesToUpdate) {
         for (final PlayerZoneUpdate update : zonesToUpdate) {
             final PlayerView owner = update.getPlayer();
 
+            // Debug logging
+            NetworkDebugLogger.debug("[CMatchUI.updateZones] Processing update for player %d, zones=%s, ownerHash=%d",
+                    owner.getId(), update.getZones(), System.identityHashCode(owner));
+
             boolean setupPlayZone = false, updateHand = false, updateAnte = false, updateZones = false;
             for (final ZoneType zone : update.getZones()) {
                 switch (zone) {
@@ -460,13 +473,19 @@ public void updateZones(final Iterable<PlayerZoneUpdate> zonesToUpdate) {
                 cAntes.update();
             }
             final VField vField = getFieldViewFor(owner);
-            if(vField == null)
+            if(vField == null) {
+                NetworkDebugLogger.error("[CMatchUI.updateZones] ERROR: vField is null for player %d, sortedPlayers.indexOf=%d",
+                        owner.getId(), sortedPlayers.indexOf(owner));
                 return;
+            }
             if (setupPlayZone) {
                 vField.getTabletop().update();
             }
             if (updateHand) {
                 final VHand vHand = getHandFor(owner);
+                NetworkDebugLogger.debug("[CMatchUI.updateZones] updateHand for player %d, vHand=%s, handSize=%s",
+                        owner.getId(), (vHand != null ? "exists" : "NULL"),
+                        (owner.getHand() != null ? String.valueOf(owner.getHand().size()) : "null"));
                 if (vHand != null) {
                     vHand.getLayoutControl().updateHand();
                 }
@@ -1025,11 +1044,25 @@ public Map<Object, Integer> assignGenericAmount(final CardView effectSource, fin
 
     @Override
     public void openView(final TrackableCollection<PlayerView> myPlayers) {
+        NetworkDebugLogger.log("[CMatchUI.openView] Called");
         final GameView gameView = getGameView();
         gameView.getGameLog().addObserver(cLog);
 
         // Sort players
         FCollectionView<PlayerView> players = gameView.getPlayers();
+
+        // Debug: Log PlayerView instances from gameView
+        NetworkDebugLogger.debug("[CMatchUI.openView] gameView.getPlayers() count=%d", players.size());
+        for (PlayerView pv : players) {
+            Tracker t = pv.getTracker();
+            PlayerView inTracker = t != null ? t.getObj(TrackableTypes.PlayerViewType, pv.getId()) : null;
+            NetworkDebugLogger.debug("[CMatchUI.openView]   Player %d: hash=%d, tracker=%s, inTracker=%b, sameInstance=%b",
+                    pv.getId(), System.identityHashCode(pv),
+                    t != null ? "exists" : "null",
+                    inTracker != null,
+                    pv == inTracker);
+        }
+
         if (players.size() == 2 && myPlayers != null && myPlayers.size() == 1 && myPlayers.get(0).equals(players.get(1))) {
             players = new FCollection<>(new PlayerView[]{players.get(1), players.get(0)});
         }