diff --git a/src/main/java/forge/control/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java index df34b6f487a..090388873cd 100644 --- a/src/main/java/forge/control/input/InputAttack.java +++ b/src/main/java/forge/control/input/InputAttack.java @@ -31,8 +31,6 @@ import forge.game.phase.CombatUtil; import forge.game.player.Player; import forge.game.zone.Zone; import forge.game.zone.ZoneType; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.views.VMessage; import forge.util.MyObservable; import forge.view.ButtonUtil; @@ -109,7 +107,7 @@ public class InputAttack extends InputBase { if(defenders.contains(selected)) setCurrentDefender(selected); else - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); // cannot attack that player + flashIncorrectAction(); // cannot attack that player } /** {@inheritDoc} */ @@ -142,7 +140,7 @@ public class InputAttack extends InputBase { showCombat(); } else { - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + flashIncorrectAction(); } } // selectCard() diff --git a/src/main/java/forge/control/input/InputBase.java b/src/main/java/forge/control/input/InputBase.java index eb604ce3e0c..679adf8b08c 100644 --- a/src/main/java/forge/control/input/InputBase.java +++ b/src/main/java/forge/control/input/InputBase.java @@ -20,7 +20,9 @@ package forge.control.input; import forge.Card; import forge.FThreads; import forge.game.player.Player; +import forge.gui.framework.SDisplayUtil; import forge.gui.match.CMatchUI; +import forge.gui.match.views.VMessage; /** *
@@ -76,4 +78,9 @@ public abstract class InputBase implements java.io.Serializable, Input { else pass.run(); } + + + protected final void flashIncorrectAction() { + SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + } } \ No newline at end of file diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 40bec74bd95..82584f3401a 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -27,8 +27,6 @@ import forge.game.phase.CombatUtil; import forge.game.player.Player; import forge.game.zone.Zone; import forge.game.zone.ZoneType; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.views.VMessage; import forge.view.ButtonUtil; /** @@ -139,7 +137,7 @@ public class InputBlock extends InputBase { } if (reminder) { - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + flashIncorrectAction(); } this.showMessage(); diff --git a/src/main/java/forge/control/input/InputConfirmMulligan.java b/src/main/java/forge/control/input/InputConfirmMulligan.java index 38e61cb2147..38936142ce1 100644 --- a/src/main/java/forge/control/input/InputConfirmMulligan.java +++ b/src/main/java/forge/control/input/InputConfirmMulligan.java @@ -25,8 +25,6 @@ import forge.game.GameState; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.views.VMessage; import forge.util.Lang; import forge.view.ButtonUtil; /** @@ -104,7 +102,7 @@ public class InputConfirmMulligan extends InputSyncronizedBase { boolean isSerumPowder = c0.getName().equals("Serum Powder"); boolean isLegalChoice = fromHand && (isCommander || isSerumPowder); if ( !isLegalChoice ) { - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + flashIncorrectAction(); return; } diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index 6e5ef9f91b0..200a968c242 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -23,8 +23,6 @@ import forge.game.phase.PhaseHandler; import forge.game.player.HumanPlay; import forge.game.player.Player; import forge.gui.GuiDisplayUtil; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.views.VMessage; import forge.view.ButtonUtil; /** @@ -92,7 +90,7 @@ public class InputPassPriority extends InputBase { player.getGame().getInputQueue().LockAndInvokeGameAction(execAbility); } else { - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + flashIncorrectAction(); } } // selectCard() } diff --git a/src/main/java/forge/control/input/InputPayManaBase.java b/src/main/java/forge/control/input/InputPayManaBase.java index 03e6b2429e2..5edd4c28430 100644 --- a/src/main/java/forge/control/input/InputPayManaBase.java +++ b/src/main/java/forge/control/input/InputPayManaBase.java @@ -18,8 +18,6 @@ import forge.game.GameState; import forge.game.player.HumanPlay; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.views.VMessage; /** * TODO: Write javadoc for this type. @@ -48,7 +46,7 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I @Override protected void onCardSelected(Card card) { if (card.getManaAbility().isEmpty() || card.isInZone(ZoneType.Hand)) { - SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); + flashIncorrectAction(); return; } // only tap card if the mana is needed