Remove UI_NETPLAY_COMPAT and unify the network codec

The pref gated two outer-codec branches that had been functionally
equivalent for production traffic since 2020. Reference compression
runs at the inner layer (DeltaSyncManager.toNetworkValue, wrapEvents)
regardless of the outer codec, and a pref-mismatch between endpoints
could corrupt the stream on the first class descriptor.

Apply tracker-aware IdRef substitution from <!-- -->Card-Forge#10644 on the
surviving codec, gated on per-client DeltaSyncManager consumerId
rather than server-tracker presence: the server's tracker holds
CardViews that never reach the client (Card.fromPaperCard choice
copies registered as a side effect of SpellAbilityView.updateHostCard
during buildAbilities), so trackable.hasConsumer(consumerId) is the
correct "client knows" predicate. Ephemerals fall through to inline.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: MostCromulent

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

@@ -144,6 +144,20 @@ public int getVersion() {
         return version;
     }
 
+    /**
+     * Check whether a consumer is currently registered on this object.
+     * <p>
+     * Used by network serialization to gate IdRef substitution: the server
+     * registers a consumer on every TrackableObject it has included in a
+     * delta packet for a given client. An object without that consumer is
+     * one the client hasn't been told about (typically an ephemeral such as
+     * a {@code Card.fromPaperCard} choice copy that never enters a tracked
+     * zone), and protocol-method args holding it must serialize inline.
+     */
+    public boolean hasConsumer(int consumerId) {
+        return consumers != null && consumers.containsKey(consumerId);
+    }
+
     /**
      * Register a consumer for per-consumer dirty tracking.
      */

forge-gui-android/src/forge/app/Main.java

@@ -385,7 +385,7 @@ private void loadGame(final HWInfo hwInfo, final String title, final String step
             forgeLogo = findViewById(resId("id", "logo_id"));
             activeView = findViewById(resId("id", "mainview"));
             activeView.setBackgroundColor(Color.WHITE);
-            forgeView = initializeForView(Forge.getApp(hwInfo, getAndroidClipboard(), adapter, ASSETS_DIR, false, !isLandscape, isTabletDevice, Build.VERSION.SDK_INT), config);
+            forgeView = initializeForView(Forge.getApp(hwInfo, getAndroidClipboard(), adapter, ASSETS_DIR, !isLandscape, isTabletDevice, Build.VERSION.SDK_INT), config);
 
             getAnimator(ObjectAnimator.ofFloat(forgeLogo, "alpha", 1f, 1f).setDuration(800), ObjectAnimator.ofObject(activeView, "backgroundColor", new ArgbEvaluator(), Color.WHITE, Color.BLACK).setDuration(1600), new AnimatorListenerAdapter() {
                 @Override

forge-gui-desktop/src/main/java/forge/control/FControl.java

@@ -45,7 +45,6 @@
 import forge.gamemodes.match.HostedMatch;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gamemodes.quest.io.QuestDataIO;
-import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.InvalidLayoutFileException;
@@ -261,10 +260,6 @@ public void initialize() {
 
         display = FView.SINGLETON_INSTANCE.getLpnDocument();
 
-        //set ExperimentalNetworkOption from preference
-        boolean propertyConfig = prefs != null && prefs.getPrefBoolean(ForgePreferences.FPref.UI_NETPLAY_COMPAT);
-        GuiBase.enablePropertyConfig(propertyConfig);
-
         closeAction = CloseAction.valueOf(prefs.getPref(FPref.UI_CLOSE_ACTION));
 
         FView.SINGLETON_INSTANCE.setSplashProgessBarMessage(getLocalizer().getMessage("lblLoadingQuest"));

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java

@@ -101,16 +101,6 @@ public void initialize() {
             SoundSystem.instance.changeBackgroundTrack();
         });
 
-        // This updates Experimental Network Option
-        view.getCbUseExperimentalNetworkStream().addItemListener(arg0 -> {
-            if (updating) { return; }
-
-            final boolean toggle = view.getCbUseExperimentalNetworkStream().isSelected();
-            GuiBase.enablePropertyConfig(toggle);
-            prefs.setPref(FPref.UI_NETPLAY_COMPAT, String.valueOf(toggle));
-            prefs.save();
-        });
-
         lstControls.clear(); // just in case
         lstControls.add(Pair.of(view.getCbAnte(), FPref.UI_ANTE));
         lstControls.add(Pair.of(view.getCbAnteMatchRarity(), FPref.UI_ANTE_MATCH_RARITY));
@@ -136,7 +126,6 @@ public void initialize() {
         lstControls.add(Pair.of(view.getCbEnableUnknownCards(), FPref.UI_LOAD_UNKNOWN_CARDS));
         lstControls.add(Pair.of(view.getCbEnableNonLegalCards(), FPref.UI_LOAD_NONLEGAL_CARDS));
         lstControls.add(Pair.of(view.getCbAllowCustomCardsDeckConformance(), FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE));
-        lstControls.add(Pair.of(view.getCbUseExperimentalNetworkStream(), FPref.UI_NETPLAY_COMPAT));
         lstControls.add(Pair.of(view.getCbImageFetcher(), FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER));
         lstControls.add(Pair.of(view.getCbDisableCardImages(), FPref.UI_DISABLE_CARD_IMAGES));
         lstControls.add(Pair.of(view.getCbDisplayFoil(), FPref.UI_OVERLAY_FOIL_EFFECT));
@@ -254,7 +243,6 @@ public void update() {
         setPlayerNameButtonText();
         view.getCbDevMode().setSelected(ForgePreferences.DEV_MODE);
         view.getCbEnableMusic().setSelected(prefs.getPrefBoolean(FPref.UI_ENABLE_MUSIC));
-        view.getCbUseExperimentalNetworkStream().setSelected(prefs.getPrefBoolean(FPref.UI_NETPLAY_COMPAT));
 
         for(final Pair<JCheckBox, FPref> kv: lstControls) {
             kv.getKey().setSelected(prefs.getPrefBoolean(kv.getValue()));

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java

@@ -121,7 +121,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     private final JCheckBox cbEnableUnknownCards = new OptionsCheckBox(localizer.getMessage("lblEnableUnknownCards"));
     private final JCheckBox cbEnableNonLegalCards = new OptionsCheckBox(localizer.getMessage("lblEnableNonLegalCards"));
     private final JCheckBox cbAllowCustomCardsDeckConformance = new OptionsCheckBox(localizer.getMessage("lblAllowCustomCardsInDecks"));
-    private final JCheckBox cbUseExperimentalNetworkStream = new OptionsCheckBox(localizer.getMessage("lblExperimentalNetworkCompatibility"));
     private final JCheckBox cbAiPicker = new OptionsCheckBox(localizer.getMessage("lblAiPickerSettings"));
     private final JCheckBox cbCardArtCoreExpansionsOnlyOpt = new OptionsCheckBox(localizer.getMessage("lblPrefArtExpansionOnly"));
     private final JCheckBox cbSmartCardArtSelectionOpt = new OptionsCheckBox(localizer.getMessage("lblSmartCardArtOpt"));
@@ -382,9 +381,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
         pnlPrefs.add(cbAllowCustomCardsDeckConformance, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlAllowCustomCardsInDecks")), descriptionConstraints);
 
-        pnlPrefs.add(cbUseExperimentalNetworkStream, titleConstraints);
-        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlExperimentalNetworkCompatibility")), descriptionConstraints);
-
         pnlPrefs.add(cbAiPicker, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlAiPickerSettings")), descriptionConstraints);
 
@@ -749,11 +745,6 @@ public JCheckBox getCbAllowCustomCardsDeckConformance() {
         return cbAllowCustomCardsDeckConformance;
     }
 
-    /** @return {@link javax.swing.JCheckBox} */
-    public JCheckBox getCbUseExperimentalNetworkStream() {
-        return cbUseExperimentalNetworkStream;
-    }
-
     /** @return {@link javax.swing.JCheckBox} */
     public JCheckBox getCbImageFetcher() {
         return cbImageFetcher;

forge-gui-ios/src/forge/ios/Main.java

@@ -30,7 +30,7 @@ protected IOSApplication createApplication() {
         final IOSApplicationConfiguration config = new IOSApplicationConfiguration();
         config.useAccelerometer = false;
         config.useCompass = false;
-        final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, false, 0);
+        final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, 0);
         final IOSApplication iosApp = new IOSApplication(app, config);
         return iosApp;
     }

forge-gui-mobile-dev/src/forge/app/GameLauncher.java

@@ -80,7 +80,7 @@ public GameLauncher(final String versionString, final String[] args) {
         else if (hasBothDims) isPortrait = heightArg > widthArg;
 
         ApplicationListener start = Forge.getApp(hw, new Lwjgl3Clipboard(), new Main.DesktopAdapter(switchOrientationFile),
-            assetsDir, false, isPortrait, false, 0);
+            assetsDir, isPortrait, false, 0);
 
         // Initialize window size
         int windowWidth, windowHeight;

forge-gui-mobile/src/forge/Forge.java

@@ -131,7 +131,7 @@ public class Forge implements ApplicationListener {
     private static Localizer localizer;
     private static boolean desktopAutoOrientation = true;
 
-    public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean propertyConfig, boolean androidOrientation, boolean isTablet, int AndroidAPI) {
+    public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean androidOrientation, boolean isTablet, int AndroidAPI) {
         if (app == null) {
             app = new Forge();
             if (GuiBase.getInterface() == null) {
@@ -140,7 +140,6 @@ public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, ID
                 //obb directory on android uses the package name as entrypoint
                 GuiBase.setUsingAppDirectory(assetDir0.contains("forge.app"));
                 GuiBase.setInterface(new GuiMobile(assetDir0));
-                GuiBase.enablePropertyConfig(propertyConfig);
                 isPortraitMode = androidOrientation;
                 isTabletDevice = isTablet;
                 androidVersion = AndroidAPI;

forge-gui-mobile/src/forge/screens/settings/SettingsPage.java

@@ -448,15 +448,6 @@ public void select() {
                     );
                }
             }, 3);
-        lstSettings.addItem(new BooleanSetting(FPref.UI_NETPLAY_COMPAT,
-            Forge.getLocalizer().getMessage("lblExperimentalNetworkCompatibility"),
-            Forge.getLocalizer().getMessage("nlExperimentalNetworkCompatibility")) {
-                @Override
-                public void select() {
-                    super.select();
-                    GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(FPref.UI_NETPLAY_COMPAT));
-                }
-            }, 3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_DISPOSE_TEXTURES,
             Forge.getLocalizer().getMessage("lblDisposeTextures"),
             Forge.getLocalizer().getMessage("nlDisposeTextures")) {

forge-gui/res/languages/de-DE.properties

@@ -1137,8 +1137,6 @@ lblAllowCustomCardsInDecks=Erlaube benutzerdefinierte Karten
 nlAllowCustomCardsInDecks=Erlaubt die Verwendung von benutzerdefinierten Karten in Decks. (Erfordert Neustart)
 lblDisableCardImages=Kartenbilder abschalten
 nlDisableCardImages=Wenn aktiviert, zeigt Forge keine Kartenbilder mehr.
-lblExperimentalNetworkCompatibility=Experimentelle Netzwerkkompatibilität
-nlExperimentalNetworkCompatibility=Forge wechselt auf kompatiblen Netzwerk-Stream. (Im Zweifel bitte ausschalten)
 lblDisposeTextures=Bildspeicher reorganisieren
 nlDisposeTextures=Wenn aktiviert, wird der Kartenbildspeicher zwischen einzelnen Spiele entleert um RAM zu sparen. (Im Zweifel bitte ausschalten)
 lblAutoCacheSize=Aktiviere automatische Cache-Größe