external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

setInputAndWait - moved to InputQueue, the latter belongs to game now, all calls re-routed

Browse Source
This commit is contained in:
Maxmtg
2013-05-22 21:28:53 +00:00
parent c99fdc6e24
commit 1268ed7249
40 changed files with 113 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/FThreads.java
View File

@@ -9,8 +9,6 @@ import java.util.concurrent.TimeUnit;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import forge.control.input.InputSynchronized;
/** /**
* TODO: Write javadoc for this type. * TODO: Write javadoc for this type.
* *
@@ -114,10 +112,6 @@ public class FThreads {
} }
} }
public static void setInputAndWait(InputSynchronized input) {
Singletons.getControl().getMatch().getInput().setInput(input);
input.awaitLatchRelease();
}
/** /**
* TODO: Write javadoc for this method. * TODO: Write javadoc for this method.

3
src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
View File

@@ -10,7 +10,6 @@ import forge.Card;
import forge.CardCharacteristicName; import forge.CardCharacteristicName;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.GameEntity; import forge.GameEntity;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.ability.SpellAbilityEffect; import forge.card.ability.SpellAbilityEffect;
@@ -747,7 +746,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
InputSelectCardsFromList inp = new InputSelectCardsFromList(1, 1, fetchList); InputSelectCardsFromList inp = new InputSelectCardsFromList(1, 1, fetchList);
inp.setCancelAllowed(!mustChoose); inp.setCancelAllowed(!mustChoose);
inp.setMessage(selectPrompt); inp.setMessage(selectPrompt);
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
c = inp.hasCancelled() ? null : inp.getSelected().get(0); c = inp.hasCancelled() ? null : inp.getSelected().get(0);
} }
else { else {

3
src/main/java/forge/card/ability/effects/CountersProliferateEffect.java
View File

@@ -8,7 +8,6 @@ import com.google.common.base.Predicate;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CounterType; import forge.CounterType;
import forge.FThreads;
import forge.GameEntity; import forge.GameEntity;
import forge.card.ability.SpellAbilityEffect; import forge.card.ability.SpellAbilityEffect;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
@@ -33,7 +32,7 @@ public class CountersProliferateEffect extends SpellAbilityEffect {
if (controller.isHuman()) { if (controller.isHuman()) {
InputProliferate inp = new InputProliferate(); InputProliferate inp = new InputProliferate();
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); controller.getGame().getInputQueue().setInputAndWait(inp);
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return; return;

4
src/main/java/forge/card/ability/effects/RestartGameEffect.java
View File

@@ -48,8 +48,8 @@ public class RestartGameEffect extends SpellAbilityEffect {
playerLibraries.put(p, newLibrary); playerLibraries.put(p, newLibrary);
} }
GameNew.restartGame(game.getMatch(), game, sa.getActivatingPlayer(), playerLibraries); GameNew.restartGame(game, sa.getActivatingPlayer(), playerLibraries);
game.getMatch().getInput().lock(); // restore the 'locked' state of the input, game.getInputQueue().lock(); // restore the 'locked' state of the input,
// because the caller method (invokeInNewThread) will try to unlock input. Restart has removed that input state. // because the caller method (invokeInNewThread) will try to unlock input. Restart has removed that input state.
} }

3
src/main/java/forge/card/ability/effects/UntapEffect.java
View File

@@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.ability.SpellAbilityEffect; import forge.card.ability.SpellAbilityEffect;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
@@ -83,7 +82,7 @@ public class UntapEffect extends SpellAbilityEffect {
if (p.isHuman()) { if (p.isHuman()) {
InputSelectCards sc = new InputSelectCardsFromList(0, num, list); InputSelectCards sc = new InputSelectCardsFromList(0, num, list);
FThreads.setInputAndWait(sc); p.getGame().getInputQueue().setInputAndWait(sc);
if( !sc.hasCancelled() ) if( !sc.hasCancelled() )
for( Card c : sc.getSelected() ) for( Card c : sc.getSelected() )
c.untap(); c.untap();

5
src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
View File

@@ -27,7 +27,6 @@ import com.google.common.collect.Iterables;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.Command; import forge.Command;
import forge.CounterType; import forge.CounterType;
@@ -195,7 +194,7 @@ public class CardFactoryCreatures {
for (int x = 0; x < netAttack; x++) { for (int x = 0; x < netAttack; x++) {
InputSelectCards inp = new InputSelectCardsFromList(1,1,wolves); InputSelectCards inp = new InputSelectCardsFromList(1,1,wolves);
inp.setMessage("Select target wolf to damage for " + getSourceCard()); inp.setMessage("Select target wolf to damage for " + getSourceCard());
FThreads.setInputAndWait(inp); target.getGame().getInputQueue().setInputAndWait(inp);
inp.getSelected().get(0).addDamage(1, target); inp.getSelected().get(0).addDamage(1, target);
} }
} else { // AI Choose spread Damage } else { // AI Choose spread Damage
@@ -348,7 +347,7 @@ public class CardFactoryCreatures {
"Currently, (%d) selected with a total power of: %d\n\n" + "Click OK when Done."; "Currently, (%d) selected with a total power of: %d\n\n" + "Click OK when Done.";
target.setMessage(toDisplay); target.setMessage(toDisplay);
target.setCancelAllowed(true); target.setCancelAllowed(true);
FThreads.setInputAndWait(target); player.getGame().getInputQueue().setInputAndWait(target);
if(!target.hasCancelled()) { if(!target.hasCancelled()) {
for (final Card sac : target.getSelected()) { for (final Card sac : target.getSelected()) {
game.getAction().sacrifice(sac, null); game.getAction().sacrifice(sac, null);

9
src/main/java/forge/card/cardfactory/CardFactorySorceries.java
View File

@@ -24,7 +24,6 @@ import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -81,7 +80,7 @@ public class CardFactorySorceries {
InputSelectCards inp = new InputSelectCardsFromList(sac, sac, list); InputSelectCards inp = new InputSelectCardsFromList(sac, sac, list);
inp.setMessage("Select %d more land(s) to sacrifice"); inp.setMessage("Select %d more land(s) to sacrifice");
FThreads.setInputAndWait(inp); p.getGame().getInputQueue().setInputAndWait(inp);
for( Card crd : inp.getSelected() ) for( Card crd : inp.getSelected() )
p.getGame().getAction().sacrifice(crd, card); p.getGame().getAction().sacrifice(crd, card);
} }
@@ -103,7 +102,7 @@ public class CardFactorySorceries {
if (p.isHuman()) { if (p.isHuman()) {
InputSelectCards sc = new InputSelectCardsFromList(sac, sac, hand); InputSelectCards sc = new InputSelectCardsFromList(sac, sac, hand);
sc.setMessage("Select %d more card(s) to discard"); sc.setMessage("Select %d more card(s) to discard");
FThreads.setInputAndWait(sc); p.getGame().getInputQueue().setInputAndWait(sc);
for( Card c : sc.getSelected()) for( Card c : sc.getSelected())
p.discard(c, spell); p.discard(c, spell);
} else { } else {
@@ -146,7 +145,7 @@ public class CardFactorySorceries {
final List<Card> list = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), "Creature"); final List<Card> list = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), "Creature");
InputSelectCards inp = new InputSelectCardsFromList(sac, sac, list); InputSelectCards inp = new InputSelectCardsFromList(sac, sac, list);
inp.setMessage("Select %d more creature(s) to sacrifice"); inp.setMessage("Select %d more creature(s) to sacrifice");
FThreads.setInputAndWait(inp); p.getGame().getInputQueue().setInputAndWait(inp);
for( Card crd : inp.getSelected() ) for( Card crd : inp.getSelected() )
p.getGame().getAction().sacrifice(crd, card); p.getGame().getAction().sacrifice(crd, card);
@@ -245,7 +244,7 @@ public class CardFactorySorceries {
} else { } else {
final int diffCost = newCMC - baseCMC; final int diffCost = newCMC - baseCMC;
InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(p, "Pay difference in artifacts CMC", ManaCost.get(diffCost)); InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(p, "Pay difference in artifacts CMC", ManaCost.get(diffCost));
FThreads.setInputAndWait(inp); p.getGame().getInputQueue().setInputAndWait(inp);
if ( inp.isPaid() ) if ( inp.isPaid() )
game.getAction().moveToPlay(newArtifact[0]); game.getAction().moveToPlay(newArtifact[0]);
else else

5
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -38,7 +38,6 @@ import forge.CardUtil;
import forge.Command; import forge.Command;
import forge.Constant; import forge.Constant;
import forge.CounterType; import forge.CounterType;
import forge.FThreads;
import forge.GameEntity; import forge.GameEntity;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
@@ -2764,7 +2763,7 @@ public class CardFactoryUtil {
}; };
target.setMessage("Choose target creature to haunt."); target.setMessage("Choose target creature to haunt.");
FThreads.setInputAndWait(target); card.getGame().getInputQueue().setInputAndWait(target);
if (!target.hasCancelled()) { if (!target.hasCancelled()) {
haunterDiesWork.setTargetCard(target.getSelected().get(0)); haunterDiesWork.setTargetCard(target.getSelected().get(0));
game.getStack().add(haunterDiesWork); game.getStack().add(haunterDiesWork);
@@ -3231,7 +3230,7 @@ public class CardFactoryUtil {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, choices); InputSelectCards inp = new InputSelectCardsFromList(1, 1, choices);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
inp.setMessage("Select target artifact creature to give it +1/+1 counters from the dead " + card); inp.setMessage("Select target artifact creature to give it +1/+1 counters from the dead " + card);
FThreads.setInputAndWait(inp); modularPlayer.getGame().getInputQueue().setInputAndWait(inp);
if( !inp.hasCancelled() ) { if( !inp.hasCancelled() ) {
card2 = inp.getSelected().get(0); card2 = inp.getSelected().get(0);
} }

3
src/main/java/forge/card/cost/CostDiscard.java
View File

@@ -24,7 +24,6 @@ import com.google.common.base.Predicate;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -230,7 +229,7 @@ public class CostDiscard extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, handList); InputSelectCards inp = new InputSelectCardsFromList(c, c, handList);
inp.setMessage("Select %d more " + getDescriptiveType() + " to discard."); inp.setMessage("Select %d more " + getDescriptiveType() + " to discard.");
//InputPayment inp = new InputPayCostDiscard(ability, handList, this, c, discardType); //InputPayment inp = new InputPayCostDiscard(ability, handList, this, c, discardType);
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if( inp.hasCancelled() || inp.getSelected().size() != c) if( inp.hasCancelled() || inp.getSelected().size() != c)
return false; return false;

3
src/main/java/forge/card/cost/CostExile.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityStackInstance; import forge.card.spellability.SpellAbilityStackInstance;
@@ -246,7 +245,7 @@ public class CostExile extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards); InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards);
inp.setMessage("Exile %d card(s) from your" + from ); inp.setMessage("Exile %d card(s) from your" + from );
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
return !inp.hasCancelled() && executePayment(ability, inp.getSelected()); return !inp.hasCancelled() && executePayment(ability, inp.getSelected());
} }

5
src/main/java/forge/card/cost/CostPartMana.java
View File

@@ -18,7 +18,6 @@
package forge.card.cost; package forge.card.cost;
import forge.Card; import forge.Card;
import forge.FThreads;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -130,7 +129,7 @@ public class CostPartMana extends CostPart {
toPay.applySpellCostChange(ability); toPay.applySpellCostChange(ability);
if (!toPay.isPaid()) { if (!toPay.isPaid()) {
InputPayment inpPayment = new InputPayManaOfCostPayment(toPay, ability); InputPayment inpPayment = new InputPayManaOfCostPayment(toPay, ability);
FThreads.setInputAndWait(inpPayment); game.getInputQueue().setInputAndWait(inpPayment);
if(!inpPayment.isPaid()) if(!inpPayment.isPaid())
return false; return false;
@@ -141,7 +140,7 @@ public class CostPartMana extends CostPart {
if( !ability.isAnnouncing("X") && !xWasBilled) { if( !ability.isAnnouncing("X") && !xWasBilled) {
source.setXManaCostPaid(0); source.setXManaCostPaid(0);
InputPayment inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0()); InputPayment inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0());
FThreads.setInputAndWait(inpPayment); game.getInputQueue().setInputAndWait(inpPayment);
if(!inpPayment.isPaid()) if(!inpPayment.isPaid())
return false; return false;
} else { } else {

3
src/main/java/forge/card/cost/CostPutCounter.java
View File

@@ -24,7 +24,6 @@ import java.util.Map;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CounterType; import forge.CounterType;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -264,7 +263,7 @@ public class CostPutCounter extends CostPartWithList {
InputSelectCardToPutCounter inp = new InputSelectCardToPutCounter(c, typeList); InputSelectCardToPutCounter inp = new InputSelectCardToPutCounter(c, typeList);
inp.setMessage("Put %d " + getCounter().getName() + " counter on " + getDescriptiveType()); inp.setMessage("Put %d " + getCounter().getName() + " counter on " + getDescriptiveType());
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); actor.getGame().getInputQueue().setInputAndWait(inp);
if(inp.hasCancelled()) if(inp.hasCancelled())
return false; return false;

3
src/main/java/forge/card/cost/CostRemoveCounter.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CounterType; import forge.CounterType;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -150,7 +149,7 @@ public class CostRemoveCounter extends CostPartWithList {
final InputSelectCardToRemoveCounter inp = new InputSelectCardToRemoveCounter(cntRemoved, getCounter(), validCards); final InputSelectCardToRemoveCounter inp = new InputSelectCardToRemoveCounter(cntRemoved, getCounter(), validCards);
inp.setMessage("Remove %d " + getCounter().getName() + " counters from " + getDescriptiveType()); inp.setMessage("Remove %d " + getCounter().getName() + " counters from " + getDescriptiveType());
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); ability.getActivatingPlayer().getGame().getInputQueue().setInputAndWait(inp);
if(inp.hasCancelled()) if(inp.hasCancelled())
return false; return false;

3
src/main/java/forge/card/cost/CostReturn.java
View File

@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -149,7 +148,7 @@ public class CostReturn extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards); InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards);
inp.setMessage("Return %d " + this.getType() + " " + this.getType() + " card(s) to hand"); inp.setMessage("Return %d " + this.getType() + " " + this.getType() + " card(s) to hand");
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if (inp.hasCancelled()) if (inp.hasCancelled())
return false; return false;

3
src/main/java/forge/card/cost/CostReveal.java
View File

@@ -24,7 +24,6 @@ import com.google.common.collect.Lists;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -169,7 +168,7 @@ public class CostReveal extends CostPartWithList {
if ( num == 0 ) return true; if ( num == 0 ) return true;
InputSelectCards inp = new InputSelectCardsFromList(num, num, handList); InputSelectCards inp = new InputSelectCardsFromList(num, num, handList);
inp.setMessage("Select %d more " + getDescriptiveType() + " card(s) to reveal."); inp.setMessage("Select %d more " + getDescriptiveType() + " card(s) to reveal.");
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

3
src/main/java/forge/card/cost/CostSacrifice.java
View File

@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -164,7 +163,7 @@ public class CostSacrifice extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, list); InputSelectCards inp = new InputSelectCardsFromList(c, c, list);
inp.setMessage("Select a " + this.getDescriptiveType() + " to sacrifice (%d left)"); inp.setMessage("Select a " + this.getDescriptiveType() + " to sacrifice (%d left)");
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

3
src/main/java/forge/card/cost/CostTapType.java
View File

@@ -25,7 +25,6 @@ import com.google.common.base.Predicate;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -199,7 +198,7 @@ public class CostTapType extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList); InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList);
inp.setMessage("Select a " + getDescriptiveType() + " to tap (%d left)"); inp.setMessage("Select a " + getDescriptiveType() + " to tap (%d left)");
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

3
src/main/java/forge/card/cost/CostUntapType.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
@@ -153,7 +152,7 @@ public class CostUntapType extends CostPartWithList {
} }
InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList); InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList);
inp.setMessage("Select a " + getDescriptiveType() + " to untap (%d left)"); inp.setMessage("Select a " + getDescriptiveType() + " to untap (%d left)");
FThreads.setInputAndWait(inp); game.getInputQueue().setInputAndWait(inp);
if( inp.hasCancelled() || inp.getSelected().size() != c ) if( inp.hasCancelled() || inp.getSelected().size() != c )
return false; return false;

6
src/main/java/forge/card/spellability/HumanPlaySpellAbility.java
View File

@@ -63,7 +63,7 @@ public class HumanPlaySpellAbility {
// freeze Stack. No abilities should go onto the stack while I'm filling requirements. // freeze Stack. No abilities should go onto the stack while I'm filling requirements.
game.getStack().freezeStack(); game.getStack().freezeStack();
game.getMatch().getInput().lock(); game.getInputQueue().lock();
// Announce things like how many times you want to Multikick or the value of X // Announce things like how many times you want to Multikick or the value of X
if (!this.announceRequirements()) { if (!this.announceRequirements()) {
@@ -104,7 +104,7 @@ public class HumanPlaySpellAbility {
return; return;
} }
else { else {
game.getMatch().getInput().unlock(); game.getInputQueue().unlock();
if (isFree || this.payment.isFullyPaid()) { if (isFree || this.payment.isFullyPaid()) {
if (skipStack) { if (skipStack) {
AbilityUtils.resolve(this.ability, false); AbilityUtils.resolve(this.ability, false);
@@ -149,7 +149,7 @@ public class HumanPlaySpellAbility {
this.ability.resetOnceResolved(); this.ability.resetOnceResolved();
this.payment.refundPayment(); this.payment.refundPayment();
game.getStack().clearFrozen(); game.getStack().clearFrozen();
game.getMatch().getInput().unlock(); game.getInputQueue().unlock();
// Singletons.getModel().getGame().getStack().removeFromFrozenStack(this.ability); // Singletons.getModel().getGame().getStack().removeFromFrozenStack(this.ability);
} }

3
src/main/java/forge/card/spellability/TargetSelection.java
View File

@@ -24,7 +24,6 @@ import com.google.common.base.Predicate;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.FThreads;
import forge.card.ability.AbilityUtils; import forge.card.ability.AbilityUtils;
import forge.control.input.InputSelectTargets; import forge.control.input.InputSelectTargets;
import forge.game.GameState; import forge.game.GameState;
@@ -107,7 +106,7 @@ public class TargetSelection {
List<Card> validTargets = this.getValidCardsToTarget(); List<Card> validTargets = this.getValidCardsToTarget();
if (zone.size() == 1 && zone.get(0) == ZoneType.Battlefield) { if (zone.size() == 1 && zone.get(0) == ZoneType.Battlefield) {
InputSelectTargets inp = new InputSelectTargets(validTargets, ability, mandatory); InputSelectTargets inp = new InputSelectTargets(validTargets, ability, mandatory);
FThreads.setInputAndWait(inp); ability.getActivatingPlayer().getGame().getInputQueue().setInputAndWait(inp);
choiceResult = !inp.hasCancelled(); choiceResult = !inp.hasCancelled();
bTargetingDone = inp.hasPressedOk(); bTargetingDone = inp.hasPressedOk();
} else { } else {

3
src/main/java/forge/control/input/InputAttack.java
View File

@@ -26,7 +26,6 @@ import com.google.common.collect.Iterables;
import forge.Card; import forge.Card;
import forge.CardPredicates; import forge.CardPredicates;
import forge.GameEntity; import forge.GameEntity;
import forge.Singletons;
import forge.game.GameState; import forge.game.GameState;
import forge.game.phase.CombatUtil; import forge.game.phase.CombatUtil;
import forge.game.player.Player; import forge.game.player.Player;
@@ -102,7 +101,7 @@ public class InputAttack extends InputBase {
game.getPhaseHandler().setCombat(!game.getCombat().getAttackers().isEmpty()); game.getPhaseHandler().setCombat(!game.getCombat().getAttackers().isEmpty());
game.getPhaseHandler().setPlayersPriorityPermission(false); game.getPhaseHandler().setPlayersPriorityPermission(false);
Singletons.getControl().getMatch().getInput().updateObservers(); game.getInputQueue().updateObservers();
} }
@Override @Override

5
src/main/java/forge/control/input/InputBase.java
View File

@@ -19,7 +19,6 @@ package forge.control.input;
import forge.Card; import forge.Card;
import forge.FThreads; import forge.FThreads;
import forge.Singletons;
import forge.game.player.Player; import forge.game.player.Player;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
@@ -60,7 +59,7 @@ public abstract class InputBase implements java.io.Serializable, Input {
// Removes this input from the stack and releases any latches (in synchronous imports) // Removes this input from the stack and releases any latches (in synchronous imports)
protected final void stop() { protected final void stop() {
// clears a "temp" Input like Input_PayManaCost if there is one // clears a "temp" Input like Input_PayManaCost if there is one
Singletons.getControl().getMatch().getInput().removeInput(this); player.getGame().getInputQueue().removeInput(this);
afterStop(); // sync inputs will release their latch there afterStop(); // sync inputs will release their latch there
} }
@@ -73,7 +72,7 @@ public abstract class InputBase implements java.io.Serializable, Input {
} }
}; };
if( FThreads.isEDT() ) if( FThreads.isEDT() )
player.getGame().getMatch().getInput().LockAndInvokeGameAction(pass); player.getGame().getInputQueue().LockAndInvokeGameAction(pass);
else else
pass.run(); pass.run();
} }

2
src/main/java/forge/control/input/InputCleanup.java
View File

@@ -77,7 +77,7 @@ public class InputCleanup extends InputBase {
if (!zone.is(ZoneType.Hand, Singletons.getControl().getPlayer())) if (!zone.is(ZoneType.Hand, Singletons.getControl().getPlayer()))
return; return;
game.getMatch().getInput().LockAndInvokeGameAction(new Runnable() { game.getInputQueue().LockAndInvokeGameAction(new Runnable() {
@Override @Override
public void run() { public void run() {
card.getController().discard(card, null); card.getController().discard(card, null);

13
src/main/java/forge/control/input/InputLockUI.java
View File

@@ -4,7 +4,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import forge.Card; import forge.Card;
import forge.FThreads; import forge.FThreads;
import forge.Singletons;
import forge.game.player.Player; import forge.game.player.Player;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
@@ -15,7 +14,15 @@ import forge.view.ButtonUtil;
*/ */
public class InputLockUI implements Input { public class InputLockUI implements Input {
private final AtomicInteger iCall = new AtomicInteger(); private final AtomicInteger iCall = new AtomicInteger();
private final InputQueue iq;
/**
* TODO: Write javadoc for Constructor.
* @param inputQueue
*/
public InputLockUI(InputQueue inputQueue) {
iq = inputQueue;
}
public void showMessage() { public void showMessage() {
int ixCall = 1 + iCall.getAndIncrement(); int ixCall = 1 + iCall.getAndIncrement();
FThreads.delay(500, new InputUpdater(ixCall)); FThreads.delay(500, new InputUpdater(ixCall));
@@ -51,7 +58,7 @@ public class InputLockUI implements Input {
}; };
protected final boolean isActive() { protected final boolean isActive() {
return Singletons.getControl().getMatch().getInput().getInput() == this; return iq.getInput() == this;
} }
protected void showMessage(String message) { protected void showMessage(String message) {

2
src/main/java/forge/control/input/InputPassPriority.java
View File

@@ -89,7 +89,7 @@ public class InputPassPriority extends InputBase {
} }
}; };
player.getGame().getMatch().getInput().LockAndInvokeGameAction(execAbility); player.getGame().getInputQueue().LockAndInvokeGameAction(execAbility);
} }
else { else {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE);

2
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -197,7 +197,7 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
onManaAbilityPlayed(chosen); onManaAbilityPlayed(chosen);
} }
}; };
game.getMatch().getInput().LockAndInvokeGameAction(proc); game.getInputQueue().LockAndInvokeGameAction(proc);
// EDT that removes lockUI from input stack will call our showMessage() method // EDT that removes lockUI from input stack will call our showMessage() method
} }

35
src/main/java/forge/control/input/InputQueue.java
View File

@@ -43,9 +43,16 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
private static final long serialVersionUID = 3955194449319994301L; private static final long serialVersionUID = 3955194449319994301L;
private final BlockingDeque<Input> inputStack = new LinkedBlockingDeque<Input>(); private final BlockingDeque<Input> inputStack = new LinkedBlockingDeque<Input>();
private final GameState game;
private final InputLockUI inputLock;
public InputQueue() {} public InputQueue(GameState game0) {
game = game0;
inputLock = new InputLockUI(this);
}
/** /**
* <p> * <p>
@@ -119,7 +126,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
* *
* @return a {@link forge.control.input.InputBase} object. * @return a {@link forge.control.input.InputBase} object.
*/ */
public final Input getActualInput(GameState game) { public final Input getActualInput() {
GameAge age = game.getAge(); GameAge age = game.getAge();
if ( age != GameAge.Play && age != GameAge.Mulligan) if ( age != GameAge.Play && age != GameAge.Mulligan)
return inputLock; return inputLock;
@@ -187,7 +194,6 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
} // getInput() } // getInput()
private final static InputLockUI inputLock = new InputLockUI();
public void lock() { public void lock() {
setInput(inputLock); setInput(inputLock);
} }
@@ -202,20 +208,13 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
public String printInputStack() { public String printInputStack() {
return inputStack.toString(); return inputStack.toString();
} }
public void setInputAndWait(InputSynchronized input) {
this.setInput(input);
input.awaitLatchRelease();
}
public void LockAndInvokeGameAction(final Runnable proc) { public void LockAndInvokeGameAction(final Runnable proc) {
//final GameState game = Singletons.getControl().getMatch().getCurrentGame();
//final InputQueue iq = game.getMatch().getInput();
// StackTraceElement[] trace = Thread.currentThread().getStackTrace();
// System.out.printf("%s > Invoke in new thread during %s called from %s%n", FThreads.isEDT() ? "EDT" : "TRD", game.getPhaseHandler().getPhase(), trace[2].toString());
// if( trace[2].toString().contains("InputBase.stop"))
// for(StackTraceElement se : trace) {
// System.out.println(se.toString());
// }
this.lock(); this.lock();
Runnable toRun = new Runnable() { Runnable toRun = new Runnable() {
@Override @Override
@@ -224,7 +223,11 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
InputQueue.this.unlock(); InputQueue.this.unlock();
} }
}; };
FThreads.invokeInNewThread(toRun); if(FThreads.isEDT()) {
FThreads.invokeInNewThread(toRun);
} else { // this branch is experimental
toRun.run();
}
} }
} // InputControl } // InputControl

8
src/main/java/forge/game/GameNew.java
View File

@@ -329,9 +329,8 @@ public class GameNew {
} }
// ultimate of Karn the Liberated // ultimate of Karn the Liberated
public static void restartGame(final MatchController match, final GameState game, final Player startingTurn, Map<Player, List<Card>> playerLibraries) { public static void restartGame( final GameState game, final Player startingTurn, Map<Player, List<Card>> playerLibraries) {
final Map<LobbyPlayer, PlayerStartConditions> players = game.getMatch().getPlayers();
Map<LobbyPlayer, PlayerStartConditions> players = match.getPlayers();
Map<Player, PlayerStartConditions> playersConditions = new HashMap<Player, PlayerStartConditions>(); Map<Player, PlayerStartConditions> playersConditions = new HashMap<Player, PlayerStartConditions>();
for (Player p : game.getPlayers()) { for (Player p : game.getPlayers()) {
@@ -339,7 +338,8 @@ public class GameNew {
} }
game.setAge(GameAge.Mulligan); game.setAge(GameAge.Mulligan);
match.getInput().clearInput(); // TODO: Apply new mulligan code here
game.getInputQueue().clearInput();
//Card.resetUniqueNumber(); //Card.resetUniqueNumber();
// need this code here, otherwise observables fail // need this code here, otherwise observables fail

12
src/main/java/forge/game/GameState.java
View File

@@ -39,6 +39,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityStackInstance; import forge.card.spellability.SpellAbilityStackInstance;
import forge.card.trigger.TriggerHandler; import forge.card.trigger.TriggerHandler;
import forge.card.trigger.TriggerType; import forge.card.trigger.TriggerType;
import forge.control.input.InputQueue;
import forge.game.phase.Cleanup; import forge.game.phase.Cleanup;
import forge.game.phase.Combat; import forge.game.phase.Combat;
import forge.game.phase.EndOfCombat; import forge.game.phase.EndOfCombat;
@@ -86,6 +87,8 @@ public class GameState {
private final MatchController match; private final MatchController match;
private GameAge age = GameAge.BeforeMulligan; private GameAge age = GameAge.BeforeMulligan;
private final InputQueue inputQueue;
/** /**
* Constructor. * Constructor.
* @param players2.entrySet() * @param players2.entrySet()
@@ -119,7 +122,9 @@ public class GameState {
cleanup = new Cleanup(this); cleanup = new Cleanup(this);
endOfTurn = new EndOfTurn(this); endOfTurn = new EndOfTurn(this);
endOfCombat = new EndOfCombat(this); endOfCombat = new EndOfCombat(this);
inputQueue = new InputQueue(this);
if ( match0.getGameType() == GameType.Quest) if ( match0.getGameType() == GameType.Quest)
events.register(Singletons.getModel().getQuest()); // this one listens to player's mulligans ATM events.register(Singletons.getModel().getQuest()); // this one listens to player's mulligans ATM
@@ -619,4 +624,9 @@ public class GameState {
void setAge(GameAge value) { void setAge(GameAge value) {
age = value; age = value;
} }
public InputQueue getInputQueue() {
return inputQueue;
}
} }

14
src/main/java/forge/game/MatchController.java
View File

@@ -12,7 +12,6 @@ import forge.FThreads;
import forge.Singletons; import forge.Singletons;
import forge.card.trigger.TriggerType; import forge.card.trigger.TriggerType;
import forge.control.FControl; import forge.control.FControl;
import forge.control.input.InputQueue;
import forge.deck.Deck; import forge.deck.Deck;
import forge.error.BugReporter; import forge.error.BugReporter;
import forge.game.event.DuelOutcomeEvent; import forge.game.event.DuelOutcomeEvent;
@@ -57,8 +56,6 @@ public class MatchController {
private final List<GameOutcome> gamesPlayed = new ArrayList<GameOutcome>(); private final List<GameOutcome> gamesPlayed = new ArrayList<GameOutcome>();
private final List<GameOutcome> gamesPlayedRo; private final List<GameOutcome> gamesPlayedRo;
private InputQueue inputQueue;
/** /**
* This should become constructor once. * This should become constructor once.
*/ */
@@ -145,7 +142,6 @@ public class MatchController {
*/ */
public void startRound() { public void startRound() {
inputQueue = new InputQueue();
currentGame = new GameState(players, gameType, this); currentGame = new GameState(players, gameType, this);
try { try {
@@ -161,7 +157,7 @@ public class MatchController {
final Player firstPlayer = determineFirstTurnPlayer(getLastGameOutcome(), currentGame); final Player firstPlayer = determineFirstTurnPlayer(getLastGameOutcome(), currentGame);
getInput().clearInput(); currentGame.getInputQueue().clearInput();
if(currentGame.getType() == GameType.Planechase) if(currentGame.getType() == GameType.Planechase)
firstPlayer.initPlane(); firstPlayer.initPlane();
@@ -182,7 +178,7 @@ public class MatchController {
final HashMap<String, Object> runParams = new HashMap<String, Object>(); final HashMap<String, Object> runParams = new HashMap<String, Object>();
currentGame.getTriggerHandler().runTrigger(TriggerType.NewGame, runParams, false); currentGame.getTriggerHandler().runTrigger(TriggerType.NewGame, runParams, false);
currentGame.setAge(GameAge.Play); currentGame.setAge(GameAge.Play);
getInput().clearInput(); currentGame.getInputQueue().clearInput();
} }
}); });
} }
@@ -216,7 +212,7 @@ public class MatchController {
Singletons.getControl().changeState(FControl.Screens.MATCH_SCREEN); Singletons.getControl().changeState(FControl.Screens.MATCH_SCREEN);
SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc()); SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
CMessage.SINGLETON_INSTANCE.getInputControl().setMatch(match); CMessage.SINGLETON_INSTANCE.getInputControl().setGame(currentGame);
// models shall notify controllers of changes // models shall notify controllers of changes
@@ -345,10 +341,6 @@ public class MatchController {
return players; return players;
} }
public final InputQueue getInput() {
return inputQueue;
}
/** /**
* TODO: Write javadoc for this method. * TODO: Write javadoc for this method.
* @return * @return

2
src/main/java/forge/game/ai/AiInputBlock.java
View File

@@ -36,6 +36,6 @@ public class AiInputBlock extends InputBase {
game.getPhaseHandler().setPlayersPriorityPermission(false); game.getPhaseHandler().setPlayersPriorityPermission(false);
// was not added to stack, so will be replaced by plain update // was not added to stack, so will be replaced by plain update
Singletons.getControl().getMatch().getInput().updateObservers(); Singletons.getControl().getMatch().getCurrentGame().getInputQueue().updateObservers();
} }
} }

2
src/main/java/forge/game/ai/AiInputCommon.java
View File

@@ -62,7 +62,7 @@ public class AiInputCommon extends InputBase implements AiInput {
* \"Detailed Error Trace\" to the Forge forum."); * \"Detailed Error Trace\" to the Forge forum.");
*/ */
computer.getGame().getMatch().getInput().LockAndInvokeGameAction(aiActions); computer.getGame().getInputQueue().LockAndInvokeGameAction(aiActions);
} // getMessage(); } // getMessage();

2
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -751,7 +751,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
}; };
if ( FThreads.isEDT() ) if ( FThreads.isEDT() )
game.getMatch().getInput().LockAndInvokeGameAction(proc); game.getInputQueue().LockAndInvokeGameAction(proc);
else else
proc.run(); proc.run();
} }

7
src/main/java/forge/game/phase/Untap.java
View File

@@ -28,7 +28,6 @@ import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.CounterType; import forge.CounterType;
import forge.FThreads;
import forge.GameEntity; import forge.GameEntity;
import forge.control.input.InputSelectCards; import forge.control.input.InputSelectCards;
import forge.control.input.InputSelectCardsFromList; import forge.control.input.InputSelectCardsFromList;
@@ -213,7 +212,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1,1, landList); final InputSelectCards target = new InputSelectCardsFromList(1,1, landList);
target.setMessage("Select one tapped land to untap"); target.setMessage("Select one tapped land to untap");
FThreads.setInputAndWait(target); player.getGame().getInputQueue().setInputAndWait(target);
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
target.getSelected().get(0).untap(); target.getSelected().get(0).untap();
} }
@@ -229,7 +228,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1,1, artList); final InputSelectCards target = new InputSelectCardsFromList(1,1, artList);
target.setMessage("Select one tapped artifact to untap"); target.setMessage("Select one tapped artifact to untap");
FThreads.setInputAndWait(target); turnOwner.getGame().getInputQueue().setInputAndWait(target);
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
target.getSelected().get(0).untap(); target.getSelected().get(0).untap();
} }
@@ -243,7 +242,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1, 1, creatures); final InputSelectCards target = new InputSelectCardsFromList(1, 1, creatures);
target.setMessage("Select one creature to untap"); target.setMessage("Select one creature to untap");
FThreads.setInputAndWait(target); player.getGame().getInputQueue().setInputAndWait(target);
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
target.getSelected().get(0).untap(); target.getSelected().get(0).untap();
} }

11
src/main/java/forge/game/phase/Upkeep.java
View File

@@ -26,7 +26,6 @@ import com.google.common.base.Predicate;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardPredicates; import forge.CardPredicates;
import forge.FThreads;
import forge.CardPredicates.Presets; import forge.CardPredicates.Presets;
import forge.CounterType; import forge.CounterType;
import forge.card.cardfactory.CardFactoryUtil; import forge.card.cardfactory.CardFactoryUtil;
@@ -271,7 +270,7 @@ public class Upkeep extends Phase {
final boolean isUpkeepPaid; final boolean isUpkeepPaid;
if (controller.isHuman()) { if (controller.isHuman()) {
InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(controller, sb, upkeepCost); InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(controller, sb, upkeepCost);
FThreads.setInputAndWait(inp); controller.getGame().getInputQueue().setInputAndWait(inp);
isUpkeepPaid = inp.isPaid(); isUpkeepPaid = inp.isPaid();
} else { // computer } else { // computer
Ability aiPaid = Upkeep.getBlankAbility(c, upkeepCost.toString()); Ability aiPaid = Upkeep.getBlankAbility(c, upkeepCost.toString());
@@ -356,7 +355,7 @@ public class Upkeep extends Phase {
boolean isUpkeepPaid = false; boolean isUpkeepPaid = false;
if (controller.isHuman()) { if (controller.isHuman()) {
InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(controller, sb, upkeepCost); InputPayManaExecuteCommands inp = new InputPayManaExecuteCommands(controller, sb, upkeepCost);
FThreads.setInputAndWait(inp); controller.getGame().getInputQueue().setInputAndWait(inp);
isUpkeepPaid = inp.isPaid(); isUpkeepPaid = inp.isPaid();
} else { // computers } else { // computers
final Ability aiPaid = Upkeep.getBlankAbility(c, upkeepCost.toString()); final Ability aiPaid = Upkeep.getBlankAbility(c, upkeepCost.toString());
@@ -436,7 +435,7 @@ public class Upkeep extends Phase {
}; };
}; };
chooseArt.setMessage(abyss.getName() + " - Select one nonartifact creature to destroy"); chooseArt.setMessage(abyss.getName() + " - Select one nonartifact creature to destroy");
FThreads.setInputAndWait(chooseArt); // Input player.getGame().getInputQueue().setInputAndWait(chooseArt); // Input
if (!chooseArt.hasCancelled()) { if (!chooseArt.hasCancelled()) {
game.getAction().destroyNoRegeneration(chooseArt.getSelected().get(0), this); game.getAction().destroyNoRegeneration(chooseArt.getSelected().get(0), this);
} }
@@ -565,7 +564,7 @@ public class Upkeep extends Phase {
public void resolve() { public void resolve() {
if (game.getZoneOf(c).is(ZoneType.Battlefield)) { if (game.getZoneOf(c).is(ZoneType.Battlefield)) {
InputPayment inp = new InputPayManaExecuteCommands(cp, "Pay Demonic Hordes upkeep cost", cost.getPayCosts().getTotalMana() /*, true */); InputPayment inp = new InputPayManaExecuteCommands(cp, "Pay Demonic Hordes upkeep cost", cost.getPayCosts().getTotalMana() /*, true */);
FThreads.setInputAndWait(inp); cp.getGame().getInputQueue().setInputAndWait(inp);
if ( !inp.isPaid() ) if ( !inp.isPaid() )
unpaidHordesAb.resolve(); unpaidHordesAb.resolve();
} }
@@ -923,7 +922,7 @@ public class Upkeep extends Phase {
} else { } else {
InputSelectCards inp = new InputSelectCardsFromList(num, num, list); InputSelectCards inp = new InputSelectCardsFromList(num, num, list);
inp.setMessage(source.getName() + " - Select %d untapped artifact(s), creature(s), or land(s) you control"); inp.setMessage(source.getName() + " - Select %d untapped artifact(s), creature(s), or land(s) you control");
FThreads.setInputAndWait(inp); player.getGame().getInputQueue().setInputAndWait(inp);
for(Card crd : inp.getSelected()) for(Card crd : inp.getSelected())
crd.tap(); crd.tap();
} }

7
src/main/java/forge/game/player/HumanPlay.java
View File

@@ -165,7 +165,7 @@ public class HumanPlay {
if( !isPaid ) { if( !isPaid ) {
InputPayManaBase inputPay = new InputPayManaSimple(p.getGame(), sa, manaCost); InputPayManaBase inputPay = new InputPayManaSimple(p.getGame(), sa, manaCost);
FThreads.setInputAndWait(inputPay); p.getGame().getInputQueue().setInputAndWait(inputPay);
isPaid = inputPay.isPaid(); isPaid = inputPay.isPaid();
} }
return isPaid; return isPaid;
@@ -462,7 +462,7 @@ public class HumanPlay {
InputPayment toSet = current == null InputPayment toSet = current == null
? new InputPayManaExecuteCommands(p, source + "\r\n", cost.getCostMana().getManaToPay()) ? new InputPayManaExecuteCommands(p, source + "\r\n", cost.getCostMana().getManaToPay())
: new InputPayManaExecuteCommands(p, source + "\r\n" + "Current Card: " + current + "\r\n" , cost.getCostMana().getManaToPay()); : new InputPayManaExecuteCommands(p, source + "\r\n" + "Current Card: " + current + "\r\n" , cost.getCostMana().getManaToPay());
FThreads.setInputAndWait(toSet); game.getInputQueue().setInputAndWait(toSet);
return toSet.isPaid(); return toSet.isPaid();
} }
@@ -473,7 +473,8 @@ public class HumanPlay {
inp.setMessage("Select %d " + cpl.getDescriptiveType() + " card(s) to " + actionName); inp.setMessage("Select %d " + cpl.getDescriptiveType() + " card(s) to " + actionName);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
FThreads.setInputAndWait(inp); GameState game = sourceAbility.getActivatingPlayer().getGame();
game.getInputQueue().setInputAndWait(inp);
if( inp.hasCancelled() || inp.getSelected().size() != amount) if( inp.hasCancelled() || inp.getSelected().size() != amount)
return false; return false;

9
src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import forge.Card; import forge.Card;
import forge.FThreads;
import forge.GameEntity; import forge.GameEntity;
import forge.card.mana.Mana; import forge.card.mana.Mana;
import forge.card.replacement.ReplacementEffect; import forge.card.replacement.ReplacementEffect;
@@ -243,7 +242,7 @@ public class PlayerControllerHuman extends PlayerController {
// TODO: Either compose a message here, or pass it as parameter from caller. // TODO: Either compose a message here, or pass it as parameter from caller.
inp.setMessage("Select %d " + validMessage + "(s) to sacrifice"); inp.setMessage("Select %d " + validMessage + "(s) to sacrifice");
FThreads.setInputAndWait(inp); player.getGame().getInputQueue().setInputAndWait(inp);
if( inp.hasCancelled() ) if( inp.hasCancelled() )
return new ArrayList<Card>(); return new ArrayList<Card>();
else return inp.getSelected(); else return inp.getSelected();
@@ -343,7 +342,7 @@ public class PlayerControllerHuman extends PlayerController {
InputSelectCards inp = new InputSelectCardsFromList(min, max, valid); InputSelectCards inp = new InputSelectCardsFromList(min, max, valid);
inp.setMessage("Discard %d cards"); inp.setMessage("Discard %d cards");
FThreads.setInputAndWait(inp); player.getGame().getInputQueue().setInputAndWait(inp);
return inp.getSelected(); return inp.getSelected();
} }
@@ -433,7 +432,7 @@ public class PlayerControllerHuman extends PlayerController {
} }
}; };
target.setMessage("Select %d cards to discard, unless you discard a " + uType + "."); target.setMessage("Select %d cards to discard, unless you discard a " + uType + ".");
FThreads.setInputAndWait(target); player.getGame().getInputQueue().setInputAndWait(target);
return target.getSelected(); return target.getSelected();
} }
@@ -472,7 +471,7 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public List<Card> getCardsToMulligan(boolean isCommander) { public List<Card> getCardsToMulligan(boolean isCommander) {
final InputConfirmMulligan inp = new InputConfirmMulligan(player, isCommander); final InputConfirmMulligan inp = new InputConfirmMulligan(player, isCommander);
FThreads.setInputAndWait(inp); player.getGame().getInputQueue().setInputAndWait(inp);
return inp.isKeepHand() ? null : inp.getSelectedCards(); return inp.isKeepHand() ? null : inp.getSelectedCards();
} }
} }

6
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -392,7 +392,7 @@ public class MagicStack extends MyObservable implements Iterable<SpellAbilitySta
int mkMagnitude = sa.getSourceCard().getKickerMagnitude(); int mkMagnitude = sa.getSourceCard().getKickerMagnitude();
String prompt = String.format("Multikicker for %s\r\nTimes Kicked: %d\r\n", sa.getSourceCard(), mkMagnitude ); String prompt = String.format("Multikicker for %s\r\nTimes Kicked: %d\r\n", sa.getSourceCard(), mkMagnitude );
InputPayManaExecuteCommands toSet = new InputPayManaExecuteCommands(activating, prompt, sp.getMultiKickerManaCost()); InputPayManaExecuteCommands toSet = new InputPayManaExecuteCommands(activating, prompt, sp.getMultiKickerManaCost());
FThreads.setInputAndWait(toSet); activating.getGame().getInputQueue().setInputAndWait(toSet);
if ( !toSet.isPaid() ) if ( !toSet.isPaid() )
break; break;
@@ -437,7 +437,7 @@ public class MagicStack extends MyObservable implements Iterable<SpellAbilitySta
ability.resolve(); ability.resolve();
String prompt = String.format("Replicate for %s\r\nTimes Replicated: %d\r\n", sa.getSourceCard(), sa.getSourceCard().getReplicateMagnitude()); String prompt = String.format("Replicate for %s\r\nTimes Replicated: %d\r\n", sa.getSourceCard(), sa.getSourceCard().getReplicateMagnitude());
InputPayManaExecuteCommands toSet = new InputPayManaExecuteCommands(controller, prompt, sp.getReplicateManaCost()); InputPayManaExecuteCommands toSet = new InputPayManaExecuteCommands(controller, prompt, sp.getReplicateManaCost());
FThreads.setInputAndWait(toSet); controller.getGame().getInputQueue().setInputAndWait(toSet);
if ( toSet.isPaid() ) { if ( toSet.isPaid() ) {
this.run(); this.run();
} else { } else {
@@ -643,7 +643,7 @@ public class MagicStack extends MyObservable implements Iterable<SpellAbilitySta
if (source.getController().isHuman()) { if (source.getController().isHuman()) {
final InputSelectCards targetHaunted = new InputSelectCardsFromList(1,1, creats); final InputSelectCards targetHaunted = new InputSelectCardsFromList(1,1, creats);
targetHaunted.setMessage("Choose target creature to haunt."); targetHaunted.setMessage("Choose target creature to haunt.");
FThreads.setInputAndWait(targetHaunted); source.getGame().getInputQueue().setInputAndWait(targetHaunted);
haunterDiesWork.setTargetCard(targetHaunted.getSelected().get(0)); haunterDiesWork.setTargetCard(targetHaunted.getSelected().get(0));
MagicStack.this.add(haunterDiesWork); MagicStack.this.add(haunterDiesWork);
} else { } else {

20
src/main/java/forge/gui/InputProxy.java
View File

@@ -25,7 +25,6 @@ import forge.Card;
import forge.FThreads; import forge.FThreads;
import forge.control.input.Input; import forge.control.input.Input;
import forge.game.GameState; import forge.game.GameState;
import forge.game.MatchController;
import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseHandler;
import forge.game.player.Player; import forge.game.player.Player;
@@ -41,26 +40,25 @@ public class InputProxy implements Observer {
/** The input. */ /** The input. */
private AtomicReference<Input> input = new AtomicReference<Input>(); private AtomicReference<Input> input = new AtomicReference<Input>();
private MatchController match = null; private GameState game = null;
private static final boolean INPUT_DEBUG = false; private static final boolean INPUT_DEBUG = false;
public void setMatch(MatchController match0) { public void setGame(GameState game0) {
match = match0; game = game0;
match.getCurrentGame().getStack().addObserver(this); game.getStack().addObserver(this);
match.getCurrentGame().getPhaseHandler().addObserver(this); game.getPhaseHandler().addObserver(this);
match.getInput().addObserver(this); game.getInputQueue().addObserver(this);
} }
@Override @Override
public final synchronized void update(final Observable observable, final Object obj) { public final synchronized void update(final Observable observable, final Object obj) {
final GameState game = match.getCurrentGame();
final PhaseHandler ph = game.getPhaseHandler(); final PhaseHandler ph = game.getPhaseHandler();
if(INPUT_DEBUG) if(INPUT_DEBUG)
System.out.printf("%s > InputProxy.update() =>%n", FThreads.debugGetCurrThreadId()); System.out.printf("%s > InputProxy.update() =>%n", FThreads.debugGetCurrThreadId());
if ( match.getInput().isEmpty() && ph.hasPhaseEffects()) { if ( game.getInputQueue().isEmpty() && ph.hasPhaseEffects()) {
Runnable rPhase = new Runnable() { Runnable rPhase = new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -74,10 +72,10 @@ public class InputProxy implements Observer {
return; return;
} }
final Input nextInput = match.getInput().getActualInput(game); final Input nextInput = game.getInputQueue().getActualInput();
if(INPUT_DEBUG) if(INPUT_DEBUG)
System.out.printf("\tinput is %s during %s, \tstack = %s%n", nextInput == null ? "null" : nextInput.getClass().getSimpleName(), ph.debugPrintState(), match.getInput().printInputStack()); System.out.printf("\tinput is %s during %s, \tstack = %s%n", nextInput == null ? "null" : nextInput.getClass().getSimpleName(), ph.debugPrintState(), game.getInputQueue().printInputStack());
this.input.set(nextInput); this.input.set(nextInput);
Runnable showMessage = new Runnable() { Runnable showMessage = new Runnable() {

3
src/main/java/forge/gui/match/nonsingleton/CField.java
View File

@@ -32,7 +32,6 @@ import forge.Card;
import forge.Command; import forge.Command;
import forge.FThreads; import forge.FThreads;
import forge.Constant.Preferences; import forge.Constant.Preferences;
import forge.Singletons;
import forge.card.cardfactory.CardFactoryUtil; import forge.card.cardfactory.CardFactoryUtil;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.control.input.Input; import forge.control.input.Input;
@@ -201,7 +200,7 @@ public class CField implements ICDoc {
/** */ /** */
private void manaAction(byte colorCode) { private void manaAction(byte colorCode) {
if (CField.this.player == CField.this.playerViewer) { if (CField.this.player == CField.this.playerViewer) {
final Input in = Singletons.getControl().getMatch().getInput().getInput(); final Input in = CField.this.player.getGame().getInputQueue().getInput();
if (in instanceof InputPayManaBase) { if (in instanceof InputPayManaBase) {
// Do something // Do something
((InputPayManaBase) in).selectManaPool(colorCode); ((InputPayManaBase) in).selectManaPool(colorCode);