From d04e186deaee060b0534ea4a73f594806b51a90f Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 13 Aug 2017 01:44:36 +0000 Subject: [PATCH] more unused methods and imports removal --- .../src/main/java/forge/ai/PlayerControllerAi.java | 5 ++--- .../forge/deck/generation/DeckGenerator5Color.java | 4 ---- .../src/main/java/forge/game/cost/CostTapType.java | 2 -- forge-game/src/main/java/forge/game/phase/Untap.java | 11 ++++++----- .../forge/game/trigger/TriggerAttackersDeclared.java | 1 - .../forge/itemmanager/filters/CardFoilFilter.java | 1 - 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 1f8d90b1371..79c6aac3cc5 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -46,7 +46,6 @@ import forge.game.player.PlayerController; import forge.game.player.PlayerView; import forge.game.replacement.ReplacementEffect; import forge.game.spellability.*; -import forge.game.trigger.Trigger; import forge.game.trigger.WrappedAbility; import forge.game.zone.ZoneType; import forge.item.PaperCard; @@ -195,8 +194,8 @@ public class PlayerControllerAi extends PlayerController { @Override public boolean confirmTrigger(WrappedAbility wrapper, Map triggerParams, boolean isMandatory) { - final SpellAbility sa = wrapper.getWrappedAbility(); - final Trigger regtrig = wrapper.getTrigger(); + final SpellAbility sa = wrapper.getWrappedAbility(); + //final Trigger regtrig = wrapper.getTrigger(); if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Deathmist Raptor")) { return true; } diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java index 919b9cf0439..b17814ffa09 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java @@ -78,10 +78,6 @@ public class DeckGenerator5Color extends DeckGeneratorBase { colors = ColorSet.fromMask(0).inverse(); } - private void initialize(DeckFormat format0) { - format0.adjustCMCLevels(cmcLevels); - colors = ColorSet.fromMask(0).inverse(); - } @Override public final CardPool getDeck(final int size, final boolean forAi) { diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java index 26ab300d223..24a1fc84ccc 100644 --- a/forge-game/src/main/java/forge/game/cost/CostTapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java @@ -17,8 +17,6 @@ */ package forge.game.cost; -import com.google.common.base.Predicate; - import forge.game.card.Card; import forge.game.card.CardCollection; import forge.game.card.CardLists; diff --git a/forge-game/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java index 6a26563a428..fdc08f31644 100644 --- a/forge-game/src/main/java/forge/game/phase/Untap.java +++ b/forge-game/src/main/java/forge/game/phase/Untap.java @@ -17,6 +17,12 @@ */ package forge.game.phase; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; @@ -29,16 +35,11 @@ import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardCollection; import forge.game.card.CardLists; -import forge.game.card.CardPredicates; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; import forge.game.player.PlayerController.BinaryChoiceType; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; -import forge.util.collect.FCollection; - -import java.util.*; -import java.util.Map.Entry; /** *

diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java index 0cc2010e979..72f9649bba1 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -23,7 +23,6 @@ import forge.game.spellability.SpellAbility; import java.util.List; import java.util.Map; -import java.util.Set; /** * TODO Write javadoc for this type. diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFoilFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFoilFilter.java index 2b38a7f41c7..386b458bdbf 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFoilFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFoilFilter.java @@ -5,7 +5,6 @@ import com.google.common.base.Predicate; import forge.item.PaperCard; import forge.itemmanager.ItemManager; import forge.itemmanager.SFilterUtil; -import forge.itemmanager.SpellShopManager; import forge.itemmanager.SItemManagerUtil.StatTypes; import javax.swing.*;