Network multiplayer optimization (delta sync + testing)

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

@@ -241,7 +241,7 @@ public GameLogEntry visit(final GameEventBlockersDeclared ev) {
             }
 
             String controllerName;
-            if (defender instanceof CardView c) {
+            if (defender instanceof CardView c && c.getController() != null) {
                 controllerName = c.getCurrentState().isBattle() ? c.getProtectingPlayer().getName() : c.getController().getName();
             } else {
                 controllerName = defender.getName();

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

@@ -33,7 +33,7 @@ public class GameView extends TrackableObject {
 
     private final transient Game game; //TODO: Remove this when possible before network support added
     private final transient Match match; //TODO: Remove this when possible before network support added
-    private final transient GameLog gameLog;
+    private transient GameLog gameLog;
 
     public GameView(final Game game) {
         super(game.getId(), game.getTracker());
@@ -184,6 +184,11 @@ public GameLog getGameLog() {
         return gameLog;
     }
 
+    /** Initialize the game log for network-deserialized GameViews (transient field is null after deserialization). */
+    public void initGameLog() {
+        this.gameLog = new GameLog();
+    }
+
     public TrackableCollection<CardView> getRevealedCollection() {
         return get(TrackableProperty.RevealedCardsCollection);
     }
@@ -218,9 +223,6 @@ public void setDependencies(Table<StaticAbility, StaticAbility, Set<StaticAbilit
     public CombatView getCombat() {
         return get(TrackableProperty.CombatView);
     }
-    public void updateCombatView(CombatView combatView) {
-        set(TrackableProperty.CombatView, combatView);
-    }
 
     void updateCombat(Combat combat) {
         if (combat == null) {
@@ -240,24 +242,7 @@ void updateCombat(Combat combat) {
                     isBlocked ? CardView.getCollection(blockers) : null,
                     CardView.getCollection(blockers));
         }
-        updateCombatView(combatView);
-    }
-
-    public void serialize() {
-        /*try {
-            GameStateSerializer serializer = new GameStateSerializer(filename);
-            game.saveState(serializer);
-            serializer.writeEndOfFile();
-            serializer.bw.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }*/
-    }
-
-    public void deserialize() {
-        /*GameStateDeserializer deserializer = new GameStateDeserializer();
-        deserializer.readObject();*/
+        set(TrackableProperty.CombatView, combatView);
     }
 
     //TODO: Find better ways to make this information available to all GUIs without using the Game class
@@ -294,4 +279,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/card/CardView.java

@@ -341,6 +341,7 @@ public boolean hasSamePT(CardView otherCard) {
     }
     void updateCounters(Card c) {
         set(TrackableProperty.Counters, c.getCounters());
+        flagAsChanged(TrackableProperty.Counters);
         updateLethalDamage(c);
         CardStateView state = getCurrentState();
         state.updatePower(c);
@@ -425,6 +426,7 @@ public List<String> getNotedTypes() {
     }
     void updateNotedTypes(Card c) {
         set(TrackableProperty.NotedTypes, c.getNotedTypes());
+        flagAsChanged(TrackableProperty.NotedTypes);
     }
 
     public String getChosenNumber() {
@@ -449,6 +451,7 @@ public List<String> getChosenColors() {
     }
     void updateChosenColors(Card c) {
         set(TrackableProperty.ChosenColors, c.getChosenColors());
+        flagAsChanged(TrackableProperty.ChosenColors);
     }
     public boolean hasPaperFoil() {
         return get(TrackableProperty.PaperFoil);
@@ -621,13 +624,15 @@ void updateSprocket(Card c) {
     public List<String> getDraftAction() { return get(TrackableProperty.DraftAction); }
     void updateDraftAction(Card c) {
         set(TrackableProperty.DraftAction, c.getDraftActions());
+        flagAsChanged(TrackableProperty.DraftAction);
     }
 
     public List<String> getNamedCard() {
         return get(TrackableProperty.NamedCard);
     }
     void updateNamedCard(Card c) {
         set(TrackableProperty.NamedCard, c.getNamedCards());
+        flagAsChanged(TrackableProperty.NamedCard);
     }
     public boolean getMayPlayPlayers(PlayerView pv) {
         TrackableCollection<PlayerView> col = get(TrackableProperty.MayPlayPlayers);
@@ -995,7 +1000,7 @@ public boolean hasBackSide() {
     }
     public String getBackSideName() { return get(TrackableProperty.BackSideName); }
 
-    CardStateView createAlternateState(final CardStateName state0) {
+    public CardStateView createAlternateState(final CardStateName state0) {
         return new CardStateView(getId(), state0, tracker);
     }
 

forge-game/src/main/java/forge/game/combat/CombatView.java

@@ -17,10 +17,14 @@
 import forge.util.collect.FCollection;
 
 public class CombatView extends TrackableObject {
-    private static final long serialVersionUID = 68085618912864941L;
+    private static final long serialVersionUID = 68085618912864942L;
+
+    // Unique negative IDs so TrackableObject.equals() distinguishes instances.
+    // Negative IDs avoid tracker registration (only id >= 0 is registered).
+    private static int nextId = -2;
 
     public CombatView(final Tracker tracker) {
-        super(-1, tracker); //ID not needed
+        super(nextId--, tracker);
         set(TrackableProperty.AttackersWithDefenders, new ConcurrentHashMap<CardView, GameEntityView>());
         set(TrackableProperty.AttackersWithBlockers, new ConcurrentHashMap<CardView, FCollection<CardView>>());
         set(TrackableProperty.BandsWithDefenders, new ConcurrentHashMap<FCollection<CardView>, GameEntityView>());

forge-game/src/main/java/forge/game/player/PlayerView.java

@@ -192,6 +192,7 @@ public int getCounters(CounterType counterType) {
     }
     void updateCounters(Player p) {
         set(TrackableProperty.Counters, p.getCounters());
+        flagAsChanged(TrackableProperty.Counters);
     }
 
     public boolean getIsExtraTurn() {
@@ -390,18 +391,20 @@ void updateCommanderCast(Player p, Card c) {
         Map<Integer, Integer> map = get(TrackableProperty.CommanderCast);
         if (map == null) {
             map = Maps.newHashMap();
+            set(TrackableProperty.CommanderCast, map);
         }
         map.put(c.getId(), p.getCommanderCast(c));
-        set(TrackableProperty.CommanderCast, map);
+        flagAsChanged(TrackableProperty.CommanderCast);
     }
 
     void updateMergedCommanderCast(Player p, Card target, Card commander) {
         Map<Integer, Integer> map = get(TrackableProperty.CommanderCast);
         if (map == null) {
             map = Maps.newHashMap();
+            set(TrackableProperty.CommanderCast, map);
         }
         map.put(target.getId(), p.getCommanderCast(commander));
-        set(TrackableProperty.CommanderCast, map);
+        flagAsChanged(TrackableProperty.CommanderCast);
     }
 
     public PlayerView getMindSlaveMaster() {
@@ -448,7 +451,7 @@ public FCollectionView<CardView> getSideboard() {
     }
 
     public FCollectionView<CardView> getCards(final ZoneType zone) {
-        TrackableProperty prop = getZoneProp(zone);
+        TrackableProperty prop = zone.getTrackableProperty();
         if (prop != null) {
             return get(prop);
         }
@@ -460,7 +463,7 @@ private int getZoneSize(TrackableProperty zoneProp) {
     }
 
     public int getZoneSize(final ZoneType zone) {
-        TrackableProperty prop = getZoneProp(zone);
+        TrackableProperty prop = zone.getTrackableProperty();
         return prop == null ? 0 : getZoneSize(prop);
     }
 
@@ -481,27 +484,8 @@ public boolean hasDelirium() {
         return getZoneTypes(TrackableProperty.Graveyard) >= 4;
     }
 
-    private static TrackableProperty getZoneProp(final ZoneType zone) {
-        switch (zone) {
-            case Ante: return TrackableProperty.Ante;
-            case Battlefield: return TrackableProperty.Battlefield;
-            case Command: return TrackableProperty.Command;
-            case Exile: return TrackableProperty.Exile;
-            case Graveyard: return TrackableProperty.Graveyard;
-            case Hand: return TrackableProperty.Hand;
-            case Library: return TrackableProperty.Library;
-            case Flashback: return TrackableProperty.Flashback;
-            case Sideboard: return TrackableProperty.Sideboard;
-            case PlanarDeck: return TrackableProperty.PlanarDeck;
-            case SchemeDeck: return TrackableProperty.SchemeDeck;
-            case AttractionDeck: return TrackableProperty.AttractionDeck;
-            case ContraptionDeck: return TrackableProperty.ContraptionDeck;
-            case Junkyard: return TrackableProperty.Junkyard;
-            default: return null; //other zones not represented
-        }
-    }
     void updateZone(PlayerZone zone) {
-        TrackableProperty prop = getZoneProp(zone.getZoneType());
+        TrackableProperty prop = zone.getZoneType().getTrackableProperty();
         if (prop == null) { return; }
         set(prop, CardView.getCollection(zone.getCards(false)));
 

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

@@ -5,6 +5,7 @@
 import forge.game.player.PlayerView;
 import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableObject;
+import forge.trackable.Tracker;
 import forge.trackable.TrackableProperty;
 import forge.util.collect.FCollectionView;
 
@@ -41,6 +42,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 Tracker tracker) {
+        super(id0, tracker);
+    }
+
     public String getKey() {
         return get(TrackableProperty.Key);
     }

forge-game/src/main/java/forge/game/zone/ZoneType.java

@@ -1,5 +1,6 @@
 package forge.game.zone;
 
+import forge.trackable.TrackableProperty;
 import forge.util.ITranslatable;
 import forge.util.Localizer;
 
@@ -11,22 +12,22 @@
  * The Enum Zone.
  */
 public enum ZoneType implements ITranslatable {
-    Hand(true, "lblHandZone"),
-    Library(true, "lblLibraryZone"),
-    Graveyard(false, "lblGraveyardZone"),
-    Battlefield(false, "lblBattlefieldZone"),
-    Exile(false, "lblExileZone"),
-    Flashback(false, "lblFlashbackZone"),
-    Command(false, "lblCommandZone"),
+    Hand(true, "lblHandZone", TrackableProperty.Hand),
+    Library(true, "lblLibraryZone", TrackableProperty.Library),
+    Graveyard(false, "lblGraveyardZone", TrackableProperty.Graveyard),
+    Battlefield(false, "lblBattlefieldZone", TrackableProperty.Battlefield),
+    Exile(false, "lblExileZone", TrackableProperty.Exile),
+    Flashback(false, "lblFlashbackZone", TrackableProperty.Flashback),
+    Command(false, "lblCommandZone", TrackableProperty.Command),
     Stack(false, "lblStackZone"),
-    Sideboard(true, "lblSideboardZone"),
-    Ante(false, "lblAnteZone"),
+    Sideboard(true, "lblSideboardZone", TrackableProperty.Sideboard),
+    Ante(false, "lblAnteZone", TrackableProperty.Ante),
     Merged(false, "lblBattlefieldZone"),
-    SchemeDeck(true, "lblSchemeDeckZone"),
-    PlanarDeck(true, "lblPlanarDeckZone"),
-    AttractionDeck(true, "lblAttractionDeckZone"),
-    Junkyard(false, "lblJunkyardZone"),
-    ContraptionDeck(true, "lblContraptionDeckZone"),
+    SchemeDeck(true, "lblSchemeDeckZone", TrackableProperty.SchemeDeck),
+    PlanarDeck(true, "lblPlanarDeckZone", TrackableProperty.PlanarDeck),
+    AttractionDeck(true, "lblAttractionDeckZone", TrackableProperty.AttractionDeck),
+    Junkyard(false, "lblJunkyardZone", TrackableProperty.Junkyard),
+    ContraptionDeck(true, "lblContraptionDeckZone", TrackableProperty.ContraptionDeck),
     //Scrapyard is like the Junkyard but for contraptions; just going to recycle the Junkyard for this.
     Subgame(true, "lblSubgameZone"),
     // ExtraHand is used for Backup Plan for temporary extra hands
@@ -40,9 +41,20 @@ public enum ZoneType implements ITranslatable {
 
     private final boolean holdsHiddenInfo;
     private final String label;
+    private final TrackableProperty trackableProperty;
+
     ZoneType(boolean holdsHidden, String label) {
+        this(holdsHidden, label, null);
+    }
+    ZoneType(boolean holdsHidden, String label, TrackableProperty trackableProperty) {
         holdsHiddenInfo = holdsHidden;
         this.label = label;
+        this.trackableProperty = trackableProperty;
+    }
+
+    /** Returns the TrackableProperty that holds this zone's cards on PlayerView, or null. */
+    public TrackableProperty getTrackableProperty() {
+        return trackableProperty;
     }
 
     public static ZoneType smartValueOf(final String value) {