Merge pull request #8418 from kevlahnota/master3

update SettingsScene, Settings page indent

forge-game/src/main/java/forge/game/card/CardView.java

@@ -1104,7 +1104,7 @@ public class CardView extends GameEntityView {
         currentState.getView().setOriginalColors(c); //set original Colors
 
         currentStateView.updateAttractionLights(currentState);
-        currentStateView.updateHasPrintedPT(c.getRules() != null && c.getRules().hasPrintedPT());
+        currentStateView.updateHasPrintedPT((currentStateView.isVehicle() || currentStateView.isSpaceCraft()) && c.getRules() != null && c.getRules().hasPrintedPT());
 
         CardState alternateState = isSplitCard && isFaceDown() ? c.getState(CardStateName.RightSplit) : c.getAlternateState();
 

forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java

@@ -293,8 +293,13 @@ public class SettingsScene extends UIScene {
             addLabel(Forge.getLocalizer().getMessage("lblBorderMaskOption"));
             settingGroup.add(borderMask).align(Align.right).pad(2);
 
-            addCheckBox(Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"), ForgePreferences.FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
             addCheckBox(Forge.getLocalizer().getMessage("lblAutoCacheSize"), ForgePreferences.FPref.UI_AUTO_CACHE_SIZE);
+            addCheckBox(Forge.getLocalizer().getMessage("lblEnableUnknownCards") + " (" +
+                Forge.getLocalizer().getMessage("lblRestartRequired") + ")", ForgePreferences.FPref.UI_LOAD_UNKNOWN_CARDS, this::restartForge);
+            addCheckBox(Forge.getLocalizer().getMessage("lblEnableNonLegalCards") + " (" +
+                Forge.getLocalizer().getMessage("lblRestartRequired") + ")", ForgePreferences.FPref.UI_LOAD_NONLEGAL_CARDS, this::restartForge);
+            addCheckBox(Forge.getLocalizer().getMessage("lblAllowCustomCardsInDecks") + " (" +
+                Forge.getLocalizer().getMessage("lblRestartRequired") + ")", ForgePreferences.FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE, this::restartForge);
             addCheckBox(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_ENABLE_DISPOSE_TEXTURES);
         }
 

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

@@ -53,7 +53,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
         lstSettings.addGroup(Forge.getLocalizer().getMessage("SoundOptions"));
         lstSettings.addGroup(Forge.getLocalizer().getMessage("ServerPreferences"));
 
-        //General Settings
+        // GENERAL SETTINGS TAB
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_LANGUAGE, Forge.getLocalizer().getMessage("cbpSelectLanguage"),
                 Forge.getLocalizer().getMessage("nlSelectLanguage"),
                 FLanguage.getAllLanguages()) {
@@ -61,8 +61,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             public void valueChanged(String newValue) {
                 // if the new locale needs to use CJK font, disallow change if UI_CJK_FONT is not set yet
                 ForgePreferences prefs = FModel.getPreferences();
-                if (prefs.getPref(FPref.UI_CJK_FONT).isEmpty() &&
+                if (prefs.getPref(FPref.UI_CJK_FONT).isEmpty() && (newValue.equals("zh-CN") || newValue.equals("ja-JP"))) {
-                        (newValue.equals("zh-CN") || newValue.equals("ja-JP"))) {
                     String message = "Please download CJK font (from \"Files\"), and set it before change language.";
                     if (newValue.equals("zh-CN")) {
                         message += "\nChinese please use \"SourceHanSansCN\".";
@@ -139,8 +138,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                 }, 0);
             /*lstSettings.addItem(new BooleanSetting(FPref.UI_ANDROID_MINIMIZE_ON_SCRLOCK,
                 Forge.getLocalizer().getMessage("lblMinimizeScreenLock"),
-                Forge.getLocalizer().getMessage("nlMinimizeScreenLock")),
+                Forge.getLocalizer().getMessage("nlMinimizeScreenLock")), 0);*/
-               0);*/
         } else {
             //fullscreen
             lstSettings.addItem(new BooleanSetting(FPref.UI_FULLSCREEN_MODE,
@@ -176,11 +174,11 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 0);
         lstSettings.addItem(new BooleanSetting(FPref.USE_SENTRY,
             Forge.getLocalizer().getMessage("lblAutomaticBugReports"),
-                        Forge.getLocalizer().getMessage("nlAutomaticBugReports")),
+            Forge.getLocalizer().getMessage("nlAutomaticBugReports")), 0);
-                0);
 
-        //Gameplay Options
+        // GAMEPLAY OPTIONS TAB
-        lstSettings.addItem(new CustomSelectSetting(FPref.MULLIGAN_RULE, Forge.getLocalizer().getMessage("cbpMulliganRule"),
+        lstSettings.addItem(new CustomSelectSetting(FPref.MULLIGAN_RULE,
+            Forge.getLocalizer().getMessage("cbpMulliganRule"),
             Forge.getLocalizer().getMessage("nlpMulliganRule"),
             MulliganDefs.getMulliganRuleNames()) {
                 @Override
@@ -192,46 +190,36 @@ public class SettingsPage extends TabPage<SettingsScreen> {
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_AI_PROFILE,
             Forge.getLocalizer().getMessage("cbpAiProfiles"),
             Forge.getLocalizer().getMessage("nlpAiProfiles"),
-                        AiProfileUtil.getProfilesArray()),
+            AiProfileUtil.getProfilesArray()), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ANTE,
             Forge.getLocalizer().getMessage("cbAnte"),
-                        Forge.getLocalizer().getMessage("nlAnte")),
+            Forge.getLocalizer().getMessage("nlAnte")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ANTE_MATCH_RARITY,
             Forge.getLocalizer().getMessage("cbAnteMatchRarity"),
-                        Forge.getLocalizer().getMessage("nlAnteMatchRarity")),
+            Forge.getLocalizer().getMessage("nlAnteMatchRarity")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.MATCH_HOT_SEAT_MODE,
             Forge.getLocalizer().getMessage("lblHotSeatMode"),
-                        Forge.getLocalizer().getMessage("nlHotSeatMode")),
+            Forge.getLocalizer().getMessage("nlHotSeatMode")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_AI_CHEATS,
             Forge.getLocalizer().getMessage("cbEnableAICheats"),
-                        Forge.getLocalizer().getMessage("nlEnableAICheats")),
+            Forge.getLocalizer().getMessage("nlEnableAICheats")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_MANABURN,
             Forge.getLocalizer().getMessage("cbManaBurn"),
-                        Forge.getLocalizer().getMessage("nlManaBurn")),
+            Forge.getLocalizer().getMessage("nlManaBurn")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.LEGACY_ORDER_COMBATANTS,
             Forge.getLocalizer().getMessage("cbOrderCombatants"),
-                        Forge.getLocalizer().getMessage("nlOrderCombatants")),
+            Forge.getLocalizer().getMessage("nlOrderCombatants")), 1);
-                1);
-
         lstSettings.addItem(new BooleanSetting(FPref.UI_MANA_LOST_PROMPT,
             Forge.getLocalizer().getMessage("cbManaLostPrompt"),
-                        Forge.getLocalizer().getMessage("nlManaLostPrompt")),
+            Forge.getLocalizer().getMessage("nlManaLostPrompt")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.ENFORCE_DECK_LEGALITY,
             Forge.getLocalizer().getMessage("cbEnforceDeckLegality"),
-                        Forge.getLocalizer().getMessage("nlEnforceDeckLegality")),
+            Forge.getLocalizer().getMessage("nlEnforceDeckLegality")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.PERFORMANCE_MODE,
             Forge.getLocalizer().getMessage("cbPerformanceMode"),
-                        Forge.getLocalizer().getMessage("nlPerformanceMode")),
+            Forge.getLocalizer().getMessage("nlPerformanceMode")), 1);
-                1);
+        lstSettings.addItem(new CustomSelectSetting(FPref.MATCH_AI_SIDEBOARDING_MODE,
-        lstSettings.addItem(new CustomSelectSetting(FPref.MATCH_AI_SIDEBOARDING_MODE, Forge.getLocalizer().getMessage("cbpAiSideboardingMode"),
+            Forge.getLocalizer().getMessage("cbpAiSideboardingMode"),
             Forge.getLocalizer().getMessage("nlpAiSideboardingMode"),
             Lists.newArrayList("Off", "AI", "Human For AI")) {
                 @Override
@@ -242,56 +230,45 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 1);
         lstSettings.addItem(new BooleanSetting(FPref.MATCH_EXPERIMENTAL_RESTORE,
             Forge.getLocalizer().getMessage("cbExperimentalRestore"),
-                        Forge.getLocalizer().getMessage("nlExperimentalRestore")),
+            Forge.getLocalizer().getMessage("nlExperimentalRestore")), 1);
-                1);
         lstSettings.addItem(new CustomSelectSetting(FPref.MATCH_AI_TIMEOUT, Forge.getLocalizer().getMessage("cbAITimeout"),
             Forge.getLocalizer().getMessage("nlAITimeout"),
-                        Lists.newArrayList("5", "10", "60", "120", "240", "300", "600")),
+            Lists.newArrayList("5", "10", "60", "120", "240", "300", "600")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ORDER_HAND,
             Forge.getLocalizer().getMessage("cbOrderHand"),
-                        Forge.getLocalizer().getMessage("nlOrderHand")),
+            Forge.getLocalizer().getMessage("nlOrderHand")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.FILTERED_HANDS,
             Forge.getLocalizer().getMessage("cbFilteredHands"),
-                        Forge.getLocalizer().getMessage("nlFilteredHands")),
+            Forge.getLocalizer().getMessage("nlFilteredHands")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_CLONE_MODE_SOURCE,
             Forge.getLocalizer().getMessage("cbCloneImgSource"),
-                        Forge.getLocalizer().getMessage("nlCloneImgSource")),
+            Forge.getLocalizer().getMessage("nlCloneImgSource")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_DETAILED_SPELLDESC_IN_PROMPT,
             Forge.getLocalizer().getMessage("cbDetailedPaymentDesc"),
-                        Forge.getLocalizer().getMessage("nlDetailedPaymentDesc")),
+            Forge.getLocalizer().getMessage("nlDetailedPaymentDesc")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_GRAY_INACTIVE_TEXT,
             Forge.getLocalizer().getMessage("cbGrayText"),
-                        Forge.getLocalizer().getMessage("nlGrayText")),
+            Forge.getLocalizer().getMessage("nlGrayText")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_STORM_COUNT_IN_PROMPT,
             Forge.getLocalizer().getMessage("cbShowStormCount"),
-                        Forge.getLocalizer().getMessage("nlShowStormCount")),
+            Forge.getLocalizer().getMessage("nlShowStormCount")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_PRESELECT_PREVIOUS_ABILITY_ORDER,
             Forge.getLocalizer().getMessage("cbPreselectPrevAbOrder"),
-                        Forge.getLocalizer().getMessage("nlPreselectPrevAbOrder")),
+            Forge.getLocalizer().getMessage("nlPreselectPrevAbOrder")), 1);
-                1);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_ALLOW_ORDER_GRAVEYARD_WHEN_NEEDED,
             Forge.getLocalizer().getMessage("lblOrderGraveyard"),
             Forge.getLocalizer().getMessage("nlOrderGraveyard"),
             new String[] {
                 ForgeConstants.GRAVEYARD_ORDERING_NEVER, ForgeConstants.GRAVEYARD_ORDERING_OWN_CARDS,
-                                ForgeConstants.GRAVEYARD_ORDERING_ALWAYS}),
+                ForgeConstants.GRAVEYARD_ORDERING_ALWAYS
-                1);
+            }), 1);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_AUTO_YIELD_MODE,
             Forge.getLocalizer().getMessage("lblAutoYields"),
             Forge.getLocalizer().getMessage("nlpAutoYieldMode"),
-                        new String[]{ForgeConstants.AUTO_YIELD_PER_ABILITY, ForgeConstants.AUTO_YIELD_PER_CARD}),
+            new String[] { ForgeConstants.AUTO_YIELD_PER_ABILITY, ForgeConstants.AUTO_YIELD_PER_CARD }), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ALLOW_ESC_TO_END_TURN,
             Forge.getLocalizer().getMessage("cbEscapeEndsTurn"),
-                        Forge.getLocalizer().getMessage("nlEscapeEndsTurn")),
+            Forge.getLocalizer().getMessage("nlEscapeEndsTurn")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_PLAYERINFOLAYOUT,
             Forge.getLocalizer().getMessage("lblAltLifeDisplay"),
             Forge.getLocalizer().getMessage("nlAltLifeDisplay")) {
@@ -328,8 +305,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_STACK_CREATURES,
             Forge.getLocalizer().getMessage("cbStackCreatures"),
-                        Forge.getLocalizer().getMessage("nlStackCreatures")),
+            Forge.getLocalizer().getMessage("nlStackCreatures")), 1);
-                1);
         lstSettings.addItem(new BooleanSetting(FPref.UI_AUTO_AIDECK_SELECTION,
             Forge.getLocalizer().getMessage("lblAutoAIDeck"),
             Forge.getLocalizer().getMessage("nlAutoAIDeck")) {
@@ -351,25 +327,22 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     Forge.reversedPrompt = FModel.getPreferences().getPrefBoolean(FPref.UI_REVERSE_PROMPT_BUTTON);
                 }
             }, 1);
-        //Random Deck Generation
+
+        // RANDOM DECK GENERATION TAB
         lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_NOSMALL,
             Forge.getLocalizer().getMessage("cbRemoveSmall"),
-                        Forge.getLocalizer().getMessage("nlRemoveSmall")),
+            Forge.getLocalizer().getMessage("nlRemoveSmall")), 2);
-                2);
         lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_CARDBASED,
             Forge.getLocalizer().getMessage("cbCardBased"),
-                        Forge.getLocalizer().getMessage("nlCardBased")),
+            Forge.getLocalizer().getMessage("nlCardBased")), 2);
-                2);
         lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_SINGLETONS,
             Forge.getLocalizer().getMessage("cbSingletons"),
-                        Forge.getLocalizer().getMessage("nlSingletons")),
+            Forge.getLocalizer().getMessage("nlSingletons")), 2);
-                2);
         lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_ARTIFACTS,
             Forge.getLocalizer().getMessage("cbRemoveArtifacts"),
-                        Forge.getLocalizer().getMessage("nlRemoveArtifacts")),
+            Forge.getLocalizer().getMessage("nlRemoveArtifacts")), 2);
-                2);
 
-        //Advanced Settings
+        // ADVANCED SETTINGS TAB
         lstSettings.addItem(new BooleanSetting(FPref.DEV_MODE_ENABLED,
             Forge.getLocalizer().getMessage("cbDevMode"),
             Forge.getLocalizer().getMessage("nlDevMode")) {
@@ -383,20 +356,16 @@ public class SettingsPage extends TabPage<SettingsScreen> {
         lstSettings.addItem(new CustomSelectSetting(FPref.DEV_LOG_ENTRY_TYPE,
             Forge.getLocalizer().getMessage("cbpGameLogEntryType"),
             Forge.getLocalizer().getMessage("nlGameLogEntryType"),
-                        GameLogEntryType.class),
+            GameLogEntryType.class), 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.LOAD_CARD_SCRIPTS_LAZILY,
             Forge.getLocalizer().getMessage("cbLoadCardsLazily"),
-                        Forge.getLocalizer().getMessage("nlLoadCardsLazily")),
+            Forge.getLocalizer().getMessage("nlLoadCardsLazily")), 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.LOAD_ARCHIVED_FORMATS,
             Forge.getLocalizer().getMessage("cbLoadArchivedFormats"),
-                        Forge.getLocalizer().getMessage("nlLoadArchivedFormats")),
+            Forge.getLocalizer().getMessage("nlLoadArchivedFormats")), 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.PRELOAD_CUSTOM_DRAFTS,
             Forge.getLocalizer().getMessage("cbPreloadCustomDrafts"),
-                        Forge.getLocalizer().getMessage("nlPreloadCustomDrafts")),
+            Forge.getLocalizer().getMessage("nlPreloadCustomDrafts")), 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS,
             Forge.getLocalizer().getMessage("lblEnableUnknownCards"),
             Forge.getLocalizer().getMessage("nlEnableUnknownCards")) {
@@ -417,8 +386,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                             }
                         );
                 }
-                            },
+            }, 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_NONLEGAL_CARDS,
             Forge.getLocalizer().getMessage("lblEnableNonLegalCards"),
             Forge.getLocalizer().getMessage("nlEnableNonLegalCards")) {
@@ -439,8 +407,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         }
                     );
                 }
-                            },
+            }, 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE,
             Forge.getLocalizer().getMessage("lblAllowCustomCardsInDecks"),
             Forge.getLocalizer().getMessage("nlAllowCustomCardsInDecks")) {
@@ -461,8 +428,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         }
                     );
                }
-                            },
+            }, 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_NETPLAY_COMPAT,
             Forge.getLocalizer().getMessage("lblExperimentalNetworkCompatibility"),
             Forge.getLocalizer().getMessage("nlExperimentalNetworkCompatibility")) {
@@ -471,8 +437,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     super.select();
                     GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(FPref.UI_NETPLAY_COMPAT));
                 }
-                            },
+            }, 3);
-                3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_DISPOSE_TEXTURES,
             Forge.getLocalizer().getMessage("lblDisposeTextures"),
             Forge.getLocalizer().getMessage("nlDisposeTextures")) {
@@ -481,8 +446,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         super.select();
                         Forge.disposeTextures = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_DISPOSE_TEXTURES);
                     }
-                            },
+                }, 3);
-                3);
         if (GuiBase.isAndroid()) { //this option does nothing except on Android
             lstSettings.addItem(new BooleanSetting(FPref.UI_AUTO_CACHE_SIZE,
                 Forge.getLocalizer().getMessage("lblAutoCacheSize"),
@@ -504,10 +468,10 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                             }
                         );
                     }
-                                },
+                }, 3);
-                    3);
         }
-        //Graphic Options
+
+        // GRAPHICS OPTIONS TAB
         lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_CARD_IMAGES,
             Forge.getLocalizer().getMessage("lblDisableCardImages"),
             Forge.getLocalizer().getMessage("nlDisableCardImages")) {
@@ -516,12 +480,10 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     super.select();
                     ImageCache.getInstance().disposeTextures();
                 }
-                            },
+            }, 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER,
             Forge.getLocalizer().getMessage("cbImageFetcher"),
-                        Forge.getLocalizer().getMessage("nlImageFetcher")),
+            Forge.getLocalizer().getMessage("nlImageFetcher")), 4);
-                4);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_PREFERRED_ART,
             Forge.getLocalizer().getMessage("lblPreferredArt"),
             Forge.getLocalizer().getMessage("nlPreferredArt"),
@@ -543,25 +505,20 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         }
                     );
                 }
-                            },
+            }, 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_SMART_CARD_ART,
             Forge.getLocalizer().getMessage("lblSmartCardArtOpt"),
-                        Forge.getLocalizer().getMessage("nlSmartCardArtOpt") + "\n"
+            Forge.getLocalizer().getMessage("nlSmartCardArtOpt") + "\n" +
-                                + Forge.getLocalizer().getMessage("nlSmartCardArtOptNote")),
+            Forge.getLocalizer().getMessage("nlSmartCardArtOptNote")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_FOIL_EFFECT,
             Forge.getLocalizer().getMessage("cbDisplayFoil"),
-                        Forge.getLocalizer().getMessage("nlDisplayFoil")),
+            Forge.getLocalizer().getMessage("nlDisplayFoil")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_RANDOM_FOIL,
             Forge.getLocalizer().getMessage("cbRandomFoil"),
-                        Forge.getLocalizer().getMessage("nlRandomFoil")),
+            Forge.getLocalizer().getMessage("nlRandomFoil")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_RANDOM_ART_IN_POOLS,
             Forge.getLocalizer().getMessage("cbRandomArtInPools"),
-                        Forge.getLocalizer().getMessage("nlRandomArtInPools")),
+            Forge.getLocalizer().getMessage("nlRandomArtInPools")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_COMPACT_TABS,
             Forge.getLocalizer().getMessage("lblCompactTabs"),
             Forge.getLocalizer().getMessage("nlCompactTabs")) {
@@ -575,40 +532,32 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_COMPACT_LIST_ITEMS,
             Forge.getLocalizer().getMessage("lblCompactListItems"),
-                        Forge.getLocalizer().getMessage("nlCompactListItems")),
+            Forge.getLocalizer().getMessage("nlCompactListItems")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_HIDE_REMINDER_TEXT,
             Forge.getLocalizer().getMessage("cbHideReminderText"),
-                        Forge.getLocalizer().getMessage("nlHideReminderText")),
+            Forge.getLocalizer().getMessage("nlHideReminderText")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_MATCH_IMAGE_VISIBLE,
             Forge.getLocalizer().getMessage("lblShowMatchBackground"),
-                        Forge.getLocalizer().getMessage("nlShowMatchBackground")),
+            Forge.getLocalizer().getMessage("nlShowMatchBackground")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_LIBGDX_TEXTURE_FILTERING,
             Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"),
-                        Forge.getLocalizer().getMessage("nlBattlefieldTextureFiltering")),
+            Forge.getLocalizer().getMessage("nlBattlefieldTextureFiltering")), 4);
-                4);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_DISPLAY_CURRENT_COLORS,
             Forge.getLocalizer().getMessage("cbpDisplayCurrentCardColors"),
             Forge.getLocalizer().getMessage("nlDisplayCurrentCardColors"),
             new String[] {
                 ForgeConstants.DISP_CURRENT_COLORS_NEVER, ForgeConstants.DISP_CURRENT_COLORS_MULTICOLOR,
                 ForgeConstants.DISP_CURRENT_COLORS_CHANGED, ForgeConstants.DISP_CURRENT_COLORS_MULTI_OR_CHANGED,
-                                ForgeConstants.DISP_CURRENT_COLORS_ALWAYS}),
+                ForgeConstants.DISP_CURRENT_COLORS_ALWAYS}), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_SPLIT_CARDS,
             Forge.getLocalizer().getMessage("lblRotateZoomSplit"),
-                        Forge.getLocalizer().getMessage("nlRotateZoomSplit")),
+            Forge.getLocalizer().getMessage("nlRotateZoomSplit")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_PLANE_OR_PHENOMENON,
             Forge.getLocalizer().getMessage("lblRotateZoomPlanesPhenomena"),
-                        Forge.getLocalizer().getMessage("nlRotateZoomPlanesPhenomena")),
+            Forge.getLocalizer().getMessage("nlRotateZoomPlanesPhenomena")), 4);
-                4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_IMAGES_EFFECT_CARDS,
             Forge.getLocalizer().getMessage("lblDisableCardEffect"),
-                        Forge.getLocalizer().getMessage("nlDisableCardEffect")),
+            Forge.getLocalizer().getMessage("nlDisableCardEffect")), 4);
-                4);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_ENABLE_BORDER_MASKING,
             Forge.getLocalizer().getMessage("lblBorderMaskOption"),
             Forge.getLocalizer().getMessage("nlBorderMaskOption"),
@@ -622,8 +571,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR,
             Forge.getLocalizer().getMessage("lblMatchScrollIndicator"),
-                        Forge.getLocalizer().getMessage("nlMatchScrollIndicator")),
+            Forge.getLocalizer().getMessage("nlMatchScrollIndicator")), 4);
-                4);
         if (!GuiBase.isAndroid()) {
             lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MAGNIFIER,
                 Forge.getLocalizer().getMessage("lblEnableMagnifier"),
@@ -653,51 +601,44 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             Forge.getLocalizer().getMessage("nlCounterDisplayType"),
             new String[] {
                 ForgeConstants.CounterDisplayType.TEXT.getName(), ForgeConstants.CounterDisplayType.IMAGE.getName(),
-                                ForgeConstants.CounterDisplayType.HYBRID.getName(), ForgeConstants.CounterDisplayType.OLD_WHEN_SMALL.getName()}),
+                ForgeConstants.CounterDisplayType.HYBRID.getName(), ForgeConstants.CounterDisplayType.OLD_WHEN_SMALL.getName()
-                4);
+            }), 4);
-        //Card Overlays
+
+        // CARD OVERLAYS TAB
         lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_CARD_OVERLAYS,
             Forge.getLocalizer().getMessage("lblShowCardOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowCardOverlays")),
+            Forge.getLocalizer().getMessage("nlShowCardOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_NAME,
             Forge.getLocalizer().getMessage("lblShowCardNameOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowCardNameOverlays")),
+            Forge.getLocalizer().getMessage("nlShowCardNameOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_MANA_COST,
             Forge.getLocalizer().getMessage("lblShowCardManaCostOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowCardManaCostOverlays")),
+            Forge.getLocalizer().getMessage("nlShowCardManaCostOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_POWER,
             Forge.getLocalizer().getMessage("lblShowCardPTOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowCardPTOverlays")),
+            Forge.getLocalizer().getMessage("nlShowCardPTOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_ID,
             Forge.getLocalizer().getMessage("lblShowCardIDOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowCardIDOverlays")),
+            Forge.getLocalizer().getMessage("nlShowCardIDOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_DRAFT_RANKING,
             Forge.getLocalizer().getMessage("lblShowDraftRankingOverlay"),
-                        Forge.getLocalizer().getMessage("nlShowDraftRankingOverlay")),
+            Forge.getLocalizer().getMessage("nlShowDraftRankingOverlay")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_ABILITY_ICONS,
             Forge.getLocalizer().getMessage("lblShowAbilityIconsOverlays"),
-                        Forge.getLocalizer().getMessage("nlShowAbilityIconsOverlays")),
+            Forge.getLocalizer().getMessage("nlShowAbilityIconsOverlays")), 5);
-                5);
         lstSettings.addItem(new BooleanSetting(FPref.UI_USE_LASER_ARROWS,
             Forge.getLocalizer().getMessage("lblUseLaserArrows"),
-                        Forge.getLocalizer().getMessage("nlUseLaserArrows")),
+            Forge.getLocalizer().getMessage("nlUseLaserArrows")), 5);
-                5);
+
-        //Vibration Options
+        // VIBRATION OPTIONS TAB
         lstSettings.addItem(new BooleanSetting(FPref.UI_VIBRATE_ON_LIFE_LOSS,
             Forge.getLocalizer().getMessage("lblVibrateWhenLosingLife"),
-                        Forge.getLocalizer().getMessage("nlVibrateWhenLosingLife")),
+            Forge.getLocalizer().getMessage("nlVibrateWhenLosingLife")), 6);
-                6);
         lstSettings.addItem(new BooleanSetting(FPref.UI_VIBRATE_ON_LONG_PRESS,
             Forge.getLocalizer().getMessage("lblVibrateAfterLongPress"),
-                        Forge.getLocalizer().getMessage("nlVibrateAfterLongPress")),
+            Forge.getLocalizer().getMessage("nlVibrateAfterLongPress")), 6);
-                6);
+
-        //Sound Options
+        // SOUND OPTIONS TAB
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_SOUND_SET,
             Forge.getLocalizer().getMessage("cbpSoundSets"),
             Forge.getLocalizer().getMessage("nlpSoundSets"),
@@ -707,8 +648,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     super.valueChanged(newValue);
                     SoundSystem.instance.invalidateSoundCache();
                 }
-                            },
+            }, 7);
-                7);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_MUSIC_SET,
             Forge.getLocalizer().getMessage("cbpMusicSets"),
             Forge.getLocalizer().getMessage("nlpMusicSets"),
@@ -719,13 +659,11 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                             MusicPlaylist.invalidateMusicPlaylist();
                             SoundSystem.instance.changeBackgroundTrack();
                         }
-                            },
+                    }, 7);
-                7);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_SOUNDS,
             Forge.getLocalizer().getMessage("cbAdjustSoundsVolume"),
             Forge.getLocalizer().getMessage("nlAdjustSoundsVolume"),
-                        new String[]{"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}),
+            new String[] { "0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100" }), 7);
-                7);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_MUSIC,
             Forge.getLocalizer().getMessage("cbAdjustMusicVolume"),
             Forge.getLocalizer().getMessage("nlAdjustMusicVolume"),
@@ -739,25 +677,16 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             }, 7);
         /*lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_SOUND_SYSTEM,
             "Use Alternate Sound System",
-                "Use the alternate sound system (only use if you have issues with sound not playing or disappearing)."),
+            "Use the alternate sound system (only use if you have issues with sound not playing or disappearing)."), 7);*/
-                7);*/
+        lstSettings.addItem(new IntegerSelectSetting(
-        lstSettings.addItem(
-                new IntegerSelectSetting(
             ForgeNetPreferences.FNetPref.NET_PORT,
             Forge.getLocalizer().getMessage("lblServerPort"),
-                        Forge.getLocalizer().getMessage("nlServerPort"),
+            Forge.getLocalizer().getMessage("nlServerPort"), 1024, 65535), 8);
-                        1024, 65535 // min and max port values
-                ),
-                8
-        );
         lstSettings.addItem(new LocalizedSelectSetting(
             ForgeNetPreferences.FNetPref.UPnP,
             Forge.getLocalizer().getMessage("lblUPnPTitle"),
             Forge.getLocalizer().getMessage("nlServerUPnPOptions"),
-                ForgeConstants.getUPnPPreferenceMapping()
+            ForgeConstants.getUPnPPreferenceMapping()), 8);
-        ), 8);
-
-
     }
 
     public void refreshSkinsList() {