Clean up (Card-Forge#11215)

Author: tool4ever

forge-ai/src/main/java/forge/ai/AiController.java

@@ -1135,6 +1135,7 @@ public CardCollection getCardsToDiscard(int min, final int max, final CardCollec
             }
             if (prefCard == null) {
                 prefCard = ComputerUtil.getCardPreference(player, sourceCard, "DiscardCost", validCards);
+                // TODO use DiscardMe:0 instead so each card without is just treated as 1
                 if (prefCard != null && prefCard.hasSVar("DoNotDiscardIfAble")) {
                     prefCard = null;
                 }

forge-core/src/main/java/forge/deck/DeckSection.java

@@ -1,32 +1,34 @@
 package forge.deck;
 
+import forge.card.CardRulesPredicates;
 import forge.card.CardType;
 import forge.item.PaperCard;
+import forge.item.PaperCardPredicates;
 import forge.util.Localizer;
 
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 public enum DeckSection {
     Main("lblMainDeck", Validators.DECK_AND_SIDE_VALIDATOR),
     Sideboard("lblSideboard", Validators.DECK_AND_SIDE_VALIDATOR),
     Commander("lblCommander", Validators.COMMANDER_VALIDATOR),
-    Avatar("lblAvatar", Validators.AVATAR_VALIDATOR),
-    Planes("lblPlanarDeck", Validators.PLANES_VALIDATOR),
-    Schemes("lblSchemeDeck", Validators.SCHEME_VALIDATOR),
-    Conspiracy("lblConspiracies", Validators.CONSPIRACY_VALIDATOR),
-    Dungeon("lblDungeons", Validators.DUNGEON_VALIDATOR),
-    Attractions("lblAttractions", Validators.ATTRACTION_VALIDATOR),
-    Contraptions("lblContraptions", Validators.CONTRAPTION_VALIDATOR);
+    Avatar("lblAvatar", PaperCardPredicates.fromRules(CardRulesPredicates.IS_VANGUARD)),
+    Planes("lblPlanarDeck", PaperCardPredicates.fromRules(CardRulesPredicates.IS_PLANE_OR_PHENOMENON)),
+    Schemes("lblSchemeDeck", PaperCardPredicates.fromRules(CardRulesPredicates.IS_SCHEME)),
+    Conspiracy("lblConspiracies", PaperCardPredicates.fromRules(CardRulesPredicates.IS_CONSPIRACY)),
+    Dungeon("lblDungeons", PaperCardPredicates.fromRules(CardRulesPredicates.IS_DUNGEON)),
+    Attractions("lblAttractions", PaperCardPredicates.fromRules(CardRulesPredicates.IS_ATTRACTION)),
+    Contraptions("lblContraptions", PaperCardPredicates.fromRules(CardRulesPredicates.IS_CONTRAPTION));
 
     /**
      * Array of DeckSections that contain nontraditional cards.
      */
     public static final DeckSection[] NONTRADITIONAL_SECTIONS = new DeckSection[]{Avatar, Planes, Schemes, Conspiracy, Dungeon, Attractions, Contraptions};
 
     private final String nameLbl;
-    private final Function<PaperCard, Boolean> fnValidator;
+    private final Predicate<PaperCard> fnValidator;
 
-    DeckSection(String nameLbl, Function<PaperCard, Boolean> validator) {
+    DeckSection(String nameLbl, Predicate<PaperCard> validator) {
         this.nameLbl = nameLbl;
         fnValidator = validator;
     }
@@ -49,7 +51,7 @@ public String getLocalizedShortName() {
 
     public boolean validate(PaperCard card){
         if (fnValidator == null) return true;
-        return fnValidator.apply(card);
+        return fnValidator.test(card);
     }
 
     // Returns the matching section for "special"/supplementary core types.
@@ -84,53 +86,18 @@ public static DeckSection smartValueOf(String value) {
     }
 
     private static class Validators {
-        static final Function<PaperCard, Boolean> DECK_AND_SIDE_VALIDATOR = card -> {
+        static final Predicate<PaperCard> DECK_AND_SIDE_VALIDATOR = card -> {
             CardType t = card.getRules().getType();
             // NOTE: Same rules applies to both Deck and Side, despite "Conspiracy cards" are allowed
             // in the SideBoard (see Rule 313.2)
             // Those will be matched later, in case (see `Deck::normalizeDeferredSections`)
             return !t.isConspiracy() && !t.isDungeon() && !t.isPhenomenon() && !t.isPlane() && !t.isScheme() && !t.isVanguard();
         };
 
-        static final Function<PaperCard, Boolean> COMMANDER_VALIDATOR = card -> {
+        static final Predicate<PaperCard> COMMANDER_VALIDATOR = card -> {
             CardType t = card.getRules().getType();
             return card.getRules().canBeCommander() || t.isPlaneswalker() || card.getRules().canBeOathbreaker() || card.getRules().canBeSignatureSpell();
         };
 
-        static final Function<PaperCard, Boolean> PLANES_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isPlane() || t.isPhenomenon();
-        };
-
-        static final Function<PaperCard, Boolean> DUNGEON_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isDungeon();
-        };
-
-        static final Function<PaperCard, Boolean> SCHEME_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isScheme();
-        };
-
-        static final Function<PaperCard, Boolean> CONSPIRACY_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isConspiracy();
-        };
-
-        static final Function<PaperCard, Boolean> AVATAR_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isVanguard();
-        };
-
-        static final Function<PaperCard, Boolean> ATTRACTION_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isAttraction();
-        };
-
-        static final Function<PaperCard, Boolean> CONTRAPTION_VALIDATOR = card -> {
-            CardType t = card.getRules().getType();
-            return t.isContraption();
-        };
-
     }
 }

forge-gui-ios/minlog-1.2.jar

@@ -656,7 +656,6 @@ else if (prop.containsKey("portalState")) {
                         //Flow continues into "shop" case with above data overriding base logic.
 
                     case "shop":
-
                         int restockPrice = 0;
                         String shopList = "";
 

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -60,12 +60,11 @@ static public Config instance() {
 
     private Config() {
         String path = resPath();
-        FilenameFilter planesFilter = (file, s) -> (!s.contains(".") && !s.equals(commonDirectoryName));
+        FilenameFilter planesFilter = (file, s) -> !s.contains(".") && !s.equals(commonDirectoryName);
 
         adventures = new File(GuiBase.isAndroid() ? ForgeConstants.ADVENTURE_DIR : path + "/res/adventure").list(planesFilter);
         try {
             settingsData = new Json().fromJson(SettingData.class, new FileHandle(ForgeConstants.USER_ADVENTURE_DIR + "settings.json"));
-
         } catch (Exception e) {
             settingsData = new SettingData();
         }
@@ -102,7 +101,6 @@ private Config() {
         if (settingsData.cardTooltipAdjLandscape == null || settingsData.cardTooltipAdjLandscape == 0f)
             settingsData.cardTooltipAdjLandscape = 1f;
 
-
         //prefix = "forge-gui/res/adventure/Shandalar/";
         prefix = getPlanePath(settingsData.plane);
         commonPrefix = resPath() + "/res/adventure/" + commonDirectoryName + "/";
@@ -120,11 +118,9 @@ private Config() {
             e.printStackTrace();
             configData = new ConfigData();
         }
-
     }
 
     private String resPath() {
-
         return GuiBase.isAndroid() ? ForgeConstants.ASSETS_DIR : Files.exists(Paths.get("./res")) ? "./" : Files.exists(Paths.get("./forge-gui/")) ? "./forge-gui/" : "../forge-gui";
     }
 
@@ -215,7 +211,6 @@ public FileHandle getFile(String path) {
         String langFile = fileName + "-" + Lang + ext;
 
         for (int iter = 1; iter <= 2; iter++) {
-
             if (Files.exists(Paths.get(langFile))) {
                 System.out.println("Found!");
                 Cache.put(path, new FileHandle(langFile));
@@ -238,17 +233,14 @@ public String getPlane() {
     }
 
     public String[] colorIdNames() {
-
         return configData.colorIdNames;
     }
 
     public String[] colorIds() {
-
         return configData.colorIds;
     }
 
     public String[] starterEditionNames() {
-
         return configData.starterEditionNames;
     }
 
@@ -403,11 +395,9 @@ public Array<String> getAllAdventures() {
     }
 
     public void saveSettings() {
-
         Json json = new Json(JsonWriter.OutputType.json);
         FileHandle handle = new FileHandle(ForgeProfileProperties.getUserDir() + "/adventure/settings.json");
         handle.writeString(json.prettyPrint(json.toJson(settingsData, SettingData.class)), false);
-
     }
 
     // --- Folder-backed starter deck support ---

forge-gui-mobile/src/forge/adventure/util/Config.java

@@ -474,7 +474,7 @@ public static Iterable<DeckProxy> getAllCommanderPreconDecks() {
         return getAllCommanderPreconDecks(null);
     }
     public static Iterable<DeckProxy> getAllCommanderPreconDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Commander Precon", GameType.Commander, result, "", FModel.getDecks().getCommanderPrecons(), filter);
         return result;
     }

forge-gui/src/main/java/forge/deck/DeckProxy.java

@@ -220,7 +220,7 @@ public static IStorage<PreconDeck> getPrecons() {
             // read with a special class, that will fill sell rules as it processes each PreconDeck
             preconManager = new StorageBase<>("Quest shop decks", new PreconDeck.Reader(new File(ForgeConstants.QUEST_PRECON_DIR)) {
                 @Override
-                protected PreconDeck getPreconDeckFromSections(java.util.Map<String, java.util.List<String>> sections) {
+                protected PreconDeck getPreconDeckFromSections(Map<String, List<String>> sections) {
                     PreconDeck result = super.getPreconDeckFromSections(sections);
                     preconDeals.put(result.getName(), new SellRules(sections.get("shop")));
                     return result;

forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java

@@ -151,7 +151,7 @@ public enum FPref implements PreferencesStore.IPref {
         UI_ALLOW_ORDER_GRAVEYARD_WHEN_NEEDED ("Never"),
         UI_DEFAULT_FONT_SIZE("12"),
         UI_CARD_ART_FORMAT("Full"),
-    	UI_SELECT_FROM_CARD_DISPLAYS("true"),
+        UI_SELECT_FROM_CARD_DISPLAYS("true"),
         UI_SWITCH_STATES_DECKVIEW("Switch back on hover"),
         UI_ORDER_HAND("false"),
         UI_HAND_MAX_CARDS_PER_ROW("0"),

forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java

@@ -75,8 +75,6 @@ public static void load(boolean isUsingAppDirectory) {
         decksDir    = getDir(props, DECKS_DIR_KEY, userDir + "decks" + File.separator);
         decksConstructedDir = getDir(props, DECKS_CONSTRUCTED_DIR_KEY, decksDir + "constructed" + File.separator);
 
-
-        //ensure directories exist
         FileUtil.ensureDirectoryExists(userDir);
         FileUtil.ensureDirectoryExists(cacheDir);
         FileUtil.ensureDirectoryExists(cardPicsDir);

forge-gui/src/main/java/forge/localinstance/properties/ForgeProfileProperties.java

@@ -128,7 +128,7 @@ public IStorage<Deck> getOathbreaker() {
 
     public IStorage<Deck> getCommanderPrecons() {
         if (commanderPrecons == null) {
-            commanderPrecons = new StorageImmediatelySerialized<Deck>("Commander Precon decks",
+            commanderPrecons = new StorageImmediatelySerialized<>("Commander Precon decks",
                     new DeckStorage(new File(ForgeConstants.COMMANDER_PRECON_DIR), ForgeConstants.QUEST_PRECON_DIR));
         }
         return commanderPrecons;