diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index 1ce0957a6b0..c7f0e055126 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -32,7 +32,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.util.Aggregates; import forge.util.Iterables; -import forge.util.Predicates; import forge.util.TextUtil; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/forge-core/src/main/java/forge/item/IPaperCard.java b/forge-core/src/main/java/forge/item/IPaperCard.java index 762186dd2f6..e30a3535a59 100644 --- a/forge-core/src/main/java/forge/item/IPaperCard.java +++ b/forge-core/src/main/java/forge/item/IPaperCard.java @@ -1,20 +1,10 @@ package forge.item; -import com.google.common.collect.Lists; import forge.card.CardRarity; import forge.card.CardRules; -import forge.card.CardType.CoreType; import forge.card.ICardFace; -import forge.card.MagicColor; -import forge.util.PredicateCard; -import forge.util.PredicateString; -import org.apache.commons.lang3.StringUtils; import java.io.Serializable; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.function.Predicate; public interface IPaperCard extends InventoryItem, Serializable { diff --git a/forge-core/src/main/java/forge/item/SealedProduct.java b/forge-core/src/main/java/forge/item/SealedProduct.java index 3cb69e379c1..4cddf19bb25 100644 --- a/forge-core/src/main/java/forge/item/SealedProduct.java +++ b/forge-core/src/main/java/forge/item/SealedProduct.java @@ -23,7 +23,6 @@ import forge.card.CardRulesPredicates; import forge.item.generation.BoosterGenerator; import forge.util.Aggregates; import forge.util.Iterables; -import forge.util.Predicates; import java.util.ArrayList; import java.util.List; diff --git a/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java index 6bd22dc454e..57333585a91 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java @@ -26,7 +26,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.util.Localizer; import forge.util.PredicateString.StringOp; -import forge.util.Predicates; public class VentureEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java index 2f5e50d54cd..c179409b05f 100644 --- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java +++ b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java @@ -10,7 +10,6 @@ import java.util.Set; import java.util.function.Predicate; import forge.util.Iterables; -import forge.util.Predicates; import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Collections2; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java index c06c56995cc..33c1e432737 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java index 5ace0d2a6e8..6d3c35c1567 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java index 1986379fb13..8a31412a9bb 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java index b857f2875d9..c271be9c13a 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java @@ -18,7 +18,6 @@ import forge.toolbox.FLabel; import forge.toolbox.FSkin; import forge.util.ItemPool; import forge.util.Localizer; -import forge.util.Predicates; public abstract class StatTypeFilter extends ToggleButtonsFilter { protected final Map buttonMap; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java index 1e18eebcfca..fb548eb6aa0 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java @@ -24,7 +24,6 @@ import forge.screens.deckeditor.SEditorIO; import forge.screens.deckeditor.views.VDeckgen; import forge.util.Aggregates; import forge.util.Iterables; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java index 35182542874..82483978ffc 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java @@ -39,7 +39,6 @@ import forge.screens.deckeditor.views.VDeckgen; import forge.screens.match.controllers.CDetailPicture; import forge.toolbox.FComboBox; import forge.util.ItemPool; -import forge.util.Predicates; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index f466923466a..fdd45ac3da2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java @@ -60,7 +60,6 @@ import forge.screens.home.quest.CSubmenuQuestDecks; import forge.screens.match.controllers.CDetailPicture; import forge.toolbox.FComboBox; import forge.util.ItemPool; -import forge.util.Predicates; /** * Child controller for quest deck editor UI. diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java index a4284504642..3785f9ed157 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java @@ -18,7 +18,6 @@ import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.views.VStatistics; import forge.util.ItemPool; import forge.util.Localizer; -import forge.util.Predicates; /** * Controls the "analysis" panel in the deck editor UI. diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatisticsImporter.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatisticsImporter.java index 085b138dcb7..6663ac0dbd1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatisticsImporter.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatisticsImporter.java @@ -12,7 +12,6 @@ import forge.itemmanager.SItemManagerUtil; import forge.screens.deckeditor.views.VStatisticsImporter; import forge.util.ItemPool; import forge.util.Localizer; -import forge.util.Predicates; import javax.swing.*; import java.util.AbstractMap; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java index 76f5a818c68..8dfef11ac4a 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java @@ -25,7 +25,6 @@ import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.util.Iterables; -import forge.util.Predicates; public class PlanarConquestCommanderGeneraterGA extends PlanarConquestGeneraterGA { diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java index 5b52f66fffa..c49fece3438 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestTribalGeneraterGA.java @@ -24,7 +24,6 @@ import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.util.Iterables; -import forge.util.Predicates; public class PlanarConquestTribalGeneraterGA extends PlanarConquestGeneraterGA { diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java index 7e23935c7d2..b8ad177eef1 100644 --- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java @@ -33,7 +33,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.util.Aggregates; import forge.util.MyRandom; -import forge.util.Predicates; import java.util.ArrayList; import java.util.LinkedList; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java index 67c84b3d7bc..e40f9dedfa7 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java index 13990b86ffe..feea1f172a9 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java index 42328d7beb0..476f26c489d 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java index 5722707c899..04930ad6630 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java @@ -5,7 +5,6 @@ import forge.card.CardRulesPredicates; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.itemmanager.ItemManager; -import forge.util.Predicates; import java.util.function.Predicate; diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java index 1834057e410..06ee1d63bfb 100644 --- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java @@ -12,7 +12,6 @@ import java.util.Map; import forge.item.PaperCardPredicates; import forge.util.Iterables; -import forge.util.Predicates; import org.apache.commons.lang3.ArrayUtils; import com.google.common.collect.Lists; diff --git a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java index ea55de9b273..faa53cdbcf2 100644 --- a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java @@ -14,7 +14,6 @@ import forge.item.PaperCardPredicates; import forge.model.FModel; import forge.util.ItemPool; import forge.util.Iterables; -import forge.util.Predicates; /** * Created by maustin on 09/05/2017. diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedCommanderDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedCommanderDeckBuilder.java index da9113f070a..33242ff86b1 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedCommanderDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedCommanderDeckBuilder.java @@ -12,7 +12,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.model.FModel; import forge.util.Iterables; -import forge.util.Predicates; /** * Created by maustin on 28/02/2018. diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedConquestDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedConquestDeckBuilder.java index a0358811826..214d68ab8b3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedConquestDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedConquestDeckBuilder.java @@ -13,7 +13,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.model.FModel; import forge.util.Iterables; -import forge.util.Predicates; /** * Created by maustin on 28/02/2018. diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java index f1ada5f12a2..64bbf3e007d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java @@ -35,7 +35,6 @@ import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.util.Iterables; import forge.util.MyRandom; -import forge.util.Predicates; /** * Limited format deck. diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java index 1d079402812..0662361e285 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java @@ -30,7 +30,6 @@ import forge.item.PaperCardPredicates; import forge.model.FModel; import forge.util.Iterables; import forge.util.MyRandom; -import forge.util.Predicates; /** * Limited format deck. diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayerAI.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayerAI.java index 7154c78b7a4..52057254f13 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayerAI.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayerAI.java @@ -11,7 +11,6 @@ import forge.item.PaperCardPredicates; import forge.localinstance.properties.ForgePreferences; import forge.util.Iterables; import forge.util.MyRandom; -import forge.util.Predicates; import org.apache.commons.lang3.tuple.Pair; import java.util.Collections; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java index 01141e6a197..616c6ed7d5d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java +++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java @@ -15,7 +15,6 @@ import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.localinstance.skin.ISkinImage; import forge.model.FModel; -import forge.util.Predicates; import forge.util.collect.FCollection; import forge.util.collect.FCollectionReader; import forge.util.collect.FCollectionView; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestRewardCard.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestRewardCard.java index fbfd8a5e37f..1d28040ea4e 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestRewardCard.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestRewardCard.java @@ -8,7 +8,6 @@ import forge.card.CardRules; import forge.item.PaperCard; import forge.item.PaperCardPredicates; import forge.model.FModel; -import forge.util.Predicates; public abstract class QuestRewardCard implements IQuestRewardCard { diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java index f06dc93c3e5..7a72efbf537 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java @@ -17,12 +17,6 @@ */ package forge.gamemodes.quest; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import forge.card.CardEdition; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java index 3cc2a52c06a..f6d448ab988 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestWinLoseController.java @@ -18,7 +18,6 @@ import forge.gui.interfaces.IButton; import forge.gui.interfaces.IWinLoseView; import forge.gui.util.SGuiChoose; import forge.item.*; -import forge.item.PaperCardPredicates; import forge.item.generation.BoosterSlots; import forge.item.generation.IUnOpenedProduct; import forge.item.generation.UnOpenedProduct; diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java index 8c2ed08fd73..070f476b399 100644 --- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java +++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java @@ -20,7 +20,6 @@ import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.util.Iterables; -import forge.util.Predicates; import forge.util.storage.IStorage; import forge.util.storage.StorageImmediatelySerialized; import org.apache.commons.lang3.ArrayUtils;