From 0a6fc95203ae18f550aae66039bc9129fcf76c0f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 26 Oct 2023 16:41:10 +0800 Subject: [PATCH] remove UI_CLONE_MODE_SOURCE preference - clone effect was updated last 2019 and this isn't used anymore, free up some space for options --- forge-game/src/main/java/forge/game/GameRules.java | 2 -- .../forge/screens/home/settings/CSubmenuPreferences.java | 1 - .../forge/screens/home/settings/VSubmenuPreferences.java | 5 ----- .../src/forge/screens/settings/SettingsPage.java | 4 ---- .../src/main/java/forge/gamemodes/match/HostedMatch.java | 1 - .../forge/gamemodes/planarconquest/ConquestController.java | 1 - .../src/main/java/forge/gamemodes/quest/QuestDraftUtils.java | 1 - forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java | 1 - .../forge/localinstance/properties/ForgePreferences.java | 1 - 9 files changed, 17 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameRules.java b/forge-game/src/main/java/forge/game/GameRules.java index 71f0b94bc4e..3f0d72b990e 100644 --- a/forge-game/src/main/java/forge/game/GameRules.java +++ b/forge-game/src/main/java/forge/game/GameRules.java @@ -15,8 +15,6 @@ public class GameRules { private final Set appliedVariants = EnumSet.noneOf(GameType.class); // it's a preference, not rule... but I could hardly find a better place for it - private boolean canCloneUseTargetsImage; - // same for me private boolean useGrayText; // whether to warn about cards AI can't play well diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index b9caefe73ef..fb49c525b1d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -125,7 +125,6 @@ public enum CSubmenuPreferences implements ICDoc { lstControls.add(Pair.of(view.getCbPerformanceMode(), FPref.PERFORMANCE_MODE)); lstControls.add(Pair.of(view.getCbSideboardForAI(), FPref.MATCH_SIDEBOARD_FOR_AI)); lstControls.add(Pair.of(view.getCbFilteredHands(), FPref.FILTERED_HANDS)); - lstControls.add(Pair.of(view.getCbCloneImgSource(), FPref.UI_CLONE_MODE_SOURCE)); lstControls.add(Pair.of(view.getCbRemoveSmall(), FPref.DECKGEN_NOSMALL)); lstControls.add(Pair.of(view.getCbCardBased(), FPref.DECKGEN_CARDBASED)); lstControls.add(Pair.of(view.getCbRemoveArtifacts(), FPref.DECKGEN_ARTIFACTS)); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java index 0ca149a8395..219d6793018 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java @@ -846,11 +846,6 @@ public enum VSubmenuPreferences implements IVSubmenu { return cbFilteredHands; } - /** @return {@link javax.swing.JCheckBox} */ - public JCheckBox getCbCloneImgSource() { - return cbCloneImgSource; - } - /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getCbPromptFreeBlocks() { return cbPromptFreeBlocks; diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 17f46f28b7b..409ddaf4146 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -233,10 +233,6 @@ public class SettingsPage extends TabPage { Forge.getLocalizer().getMessage("cbFilteredHands"), Forge.getLocalizer().getMessage("nlFilteredHands")), 1); - lstSettings.addItem(new BooleanSetting(FPref.UI_CLONE_MODE_SOURCE, - Forge.getLocalizer().getMessage("cbCloneImgSource"), - Forge.getLocalizer().getMessage("nlCloneImgSource")), - 1); lstSettings.addItem(new BooleanSetting(FPref.MATCHPREF_PROMPT_FREE_BLOCKS, Forge.getLocalizer().getMessage("cbPromptFreeBlocks"), Forge.getLocalizer().getMessage("nlPromptFreeBlocks")), diff --git a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java index d4f08e1c143..67125d88a92 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java @@ -89,7 +89,6 @@ public class HostedMatch { gameRules.setMatchAnteRarity(FModel.getPreferences().getPrefBoolean(FPref.UI_ANTE_MATCH_RARITY)); gameRules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN)); gameRules.setSideboardForAI(FModel.getPreferences().getPrefBoolean(FPref.MATCH_SIDEBOARD_FOR_AI)); - gameRules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE)); gameRules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT)); gameRules.setGamesPerMatch(FModel.getPreferences().getPrefInt(FPref.UI_MATCHES_PER_GAME)); return gameRules; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java index 1984c2a3d1d..38296bb25c1 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java @@ -138,7 +138,6 @@ public class ConquestController { final GameRules rules = new GameRules(GameType.PlanarConquest); rules.setGamesPerMatch(battle.gamesPerMatch()); rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN)); - rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE)); final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch(); FThreads.invokeInEdtNowOrLater(new Runnable(){ @Override diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java index 0c2fccb8eef..5586eeff3de 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java @@ -250,7 +250,6 @@ public class QuestDraftUtils { rules.setMatchAnteRarity(false); rules.setGamesPerMatch(3); rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN)); - rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE)); rules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT)); return rules; } diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java index 26bbf0fe0b9..7b6241a42ed 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java @@ -598,7 +598,6 @@ public class QuestUtil { rules.setMatchAnteRarity(matchAnteRarity); rules.setGamesPerMatch(qData.getMatchLength()); rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN)); - rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE)); rules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT)); final TreeSet variant = new TreeSet<>(); diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java index 9c2dfcd5dd3..b12da713ad0 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java @@ -128,7 +128,6 @@ public class ForgePreferences extends PreferencesStore { UI_CURRENT_SOUND_SET("Default"), UI_CURRENT_MUSIC_SET("Default"), UI_CURRENT_AI_PROFILE ("Default"), - UI_CLONE_MODE_SOURCE ("false"), UI_MATCH_IMAGE_VISIBLE ("true"), UI_THEMED_COMBOBOX ("true"), // Now applies to all theme settings, not just Combo. UI_LOCK_TITLE_BAR ("false"),