github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #976 from lunaskyrise/unchecked-and-deprecated

Browse source 
Remove most "has been deprecated" and "unchecked conversion" errors
This commit is contained in:
LevelX2 2015-05-19 14:48:25 +02:00
commit c6d0c78d16
43 changed files with 327 additions and 313 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java
View file

@ -105,7 +105,7 @@ class DarkImpostorContinuousEffect extends ContinuousEffectImpl {
if (card != null) {
for (Ability ability: card.getAbilities()) {
if (ability instanceof ActivatedAbility) {
perm.addAbility(ability, game);
perm.addAbility(ability, source.getSourceId(), game);
}
}
}

4
Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java
View file

@ -110,7 +110,7 @@ class RidersOfGavonyEffect extends OneShotEffect {
if (typeChoice.getChoice() != null) {
game.informPlayers(permanent.getName() + ": " + player.getLogName() + " has chosen " + typeChoice.getChoice());
game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice());
permanent.addInfo("chosen type", "<i>Chosen type: " + typeChoice.getChoice().toString() + "</i>", game);
permanent.addInfo("chosen type", "<i>Chosen type: " + typeChoice.getChoice() + "</i>", game);
}
}
return false;
@ -162,7 +162,7 @@ class RidersOfGavonyGainAbilityControlledEffect extends ContinuousEffectImpl {
}
if (protectionFilter != null) {
for (Permanent perm: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
perm.addAbility(new ProtectionAbility(protectionFilter), game);
perm.addAbility(new ProtectionAbility(protectionFilter), source.getSourceId(), game);
}
return true;
}

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java
View file

@ -110,7 +110,7 @@ public class SkullmaneBaku extends CardImpl {
}
Permanent creature = game.getPermanent(targetPointer.getFirst(game, source));
if (creature != null && numberToUnboost != 0) {
creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(numberToUnboost, numberToUnboost, Duration.EndOfTurn)), game);
creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(numberToUnboost, numberToUnboost, Duration.EndOfTurn)), source.getSourceId(), game, false);
}
return true;
}

2
Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java
View file

@ -140,7 +140,7 @@ class CurseOfChaosEffect extends OneShotEffect {
Player attacker = game.getPlayer(this.getTargetPointer().getFirst(game, source));
if (attacker != null) {
if (attacker.getHand().size() > 0 && attacker.chooseUse(outcome, "Discard a card and draw a card?", game)){
attacker.discard(1, source, game);
attacker.discard(1, false, source, game);
attacker.drawCards(1, game);
}
return true;

3
Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java
View file

@ -36,6 +36,7 @@ import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.Costs;
import mage.abilities.costs.CostsImpl;
import mage.abilities.costs.common.SacrificeTargetCost;
@ -81,7 +82,7 @@ public class KnightOfTheReliquary extends CardImpl {
// {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it onto the battlefield, then shuffle your library.
TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard());
Costs costs = new CostsImpl();
Costs<Cost> costs = new CostsImpl<>();
costs.add(new TapSourceCost());
costs.add(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, false)));
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay), costs));

2
Mage.Sets/src/mage/sets/dragonsmaze/BloodBaronOfVizkopa.java
View file

@ -126,7 +126,7 @@ class BloodBaronOfVizkopaEffect extends ContinuousEffectImpl {
break;
case AbilityAddingRemovingEffects_6:
if (sublayer == SubLayer.NA) {
creature.addAbility(FlyingAbility.getInstance(), game);
creature.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
}
break;
default:

2
Mage.Sets/src/mage/sets/eventide/NeedleSpecter.java
View file

@ -98,7 +98,7 @@ class NeedleSpecterEffect extends OneShotEffect {
Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source));
if (targetPlayer != null) {
int damage = (Integer)getValue("damage");
targetPlayer.discard(damage, source, game);
targetPlayer.discard(damage, false, source, game);
game.informPlayers(targetPlayer.getLogName() + "discards " + damage + " card(s)");
return true;
}

3
Mage.Sets/src/mage/sets/eventide/RiseOfTheHobgoblins.java
View file

@ -34,6 +34,7 @@ import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
@ -116,7 +117,7 @@ class RiseOfTheHobgoblinsEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player you = game.getPlayer(source.getControllerId());
ManaCosts cost = new ManaCostsImpl("{X}");
ManaCosts<ManaCost> cost = new ManaCostsImpl<>("{X}");
if (you != null && you.chooseUse(Outcome.Neutral, "Do you want to to pay {X}?", game)) {
int costX = you.announceXMana(0, Integer.MAX_VALUE, "Announce the value for {X}", game, source);
cost.add(new GenericManaCost(costX));

2
Mage.Sets/src/mage/sets/fallenempires/Derelor.java
View file

@ -62,7 +62,7 @@ public class Derelor extends CardImpl {
this.toughness = new MageInt(4);
// Black spells you cast cost {B} more to cast.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasementControllerEffect(filter, new ManaCostsImpl("B"))));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasementControllerEffect(filter, new ManaCostsImpl<>("{B}"))));
}
public Derelor(final Derelor card) {

2
Mage.Sets/src/mage/sets/fifthedition/Recall.java
View file

@ -93,7 +93,7 @@ class RecallEffect extends OneShotEffect {
// Discard X cards
int amount = source.getManaCostsToPay().getX();
int discarded = Math.min(amount, player.getHand().size());
player.discard(amount, source, game);
player.discard(amount, false, source, game);
// then return a card from your graveyard to your hand for each card discarded this way
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(discarded, new FilterCard());

2
Mage.Sets/src/mage/sets/innistrad/FrightfulDelusion.java
View file

@ -94,7 +94,7 @@ class FrightfulDelusionEffect extends OneShotEffect {
if (player != null) {
cost.clearPaid();
game.getPlayer(spell.getControllerId()).discard(
1, source, game);
1, false, source, game);
if (!cost.pay(source, game, spell.getControllerId(),
spell.getControllerId(), false)) {
return game.getStack().counter(source.getFirstTarget(),

2
Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java
View file

@ -105,7 +105,7 @@ class TormentedThoughtsDiscardEffect extends OneShotEffect {
}
}
if (power > 0) {
targetPlayer.discard(power, source, game);
targetPlayer.discard(power, false, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/khansoftarkir/KinTreeInvocation.java
View file

@ -102,7 +102,7 @@ class KinTreeInvocationCreateTokenEffect extends OneShotEffect {
objectColor.setBlack(true);
objectColor.setGreen(true);
Token token = new Token("Spirit Warrior", "X/X black and green Spirit Warrior creature token onto the battlefield, where X is the greatest toughness among creatures you control",
objectColor, list, value, value, new AbilitiesImpl());
objectColor, list, value, value, new AbilitiesImpl<>());
token.getAbilities().newId(); // neccessary if token has ability like DevourAbility()
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
return true;

2
Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java
View file

@ -103,7 +103,7 @@ class ChainsOfMephistophelesReplacementEffect extends ReplacementEffectImpl {
return true;
} else {
// discards a card instead. If the player discards a card this way, he or she draws a card.
player.discard(1, source, game);
player.discard(1, false, source, game);
return false; // because player draws a card, the draw event is kept
}
}

20
Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java
View file

@ -29,13 +29,6 @@
package mage.sets.magic2011;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
@ -43,6 +36,13 @@ import mage.abilities.effects.common.AttachEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.ForestwalkAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
@ -57,16 +57,16 @@ public class DryadsFavor extends CardImpl {
public DryadsFavor(UUID ownerId) {
super(ownerId, 169, "Dryad's Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}");
this.expansionSetCode = "M11";
this.color.setGreen(true);
this.subtype.add("Aura");
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Enchanted creature has forestwalk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DryadsFavorEffect()));
}
public DryadsFavor(final DryadsFavor card) {
@ -104,7 +104,7 @@ class DryadsFavorEffect extends ContinuousEffectImpl {
switch (layer) {
case AbilityAddingRemovingEffects_6:
if (sublayer == SubLayer.NA) {
creature.addAbility(new ForestwalkAbility(), game);
creature.addAbility(new ForestwalkAbility(), source.getSourceId(), game);
}
break;
}

21
Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java
View file

@ -25,17 +25,9 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.magic2011;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
@ -43,6 +35,13 @@ import mage.abilities.effects.common.AttachEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.MountainwalkAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
@ -57,16 +56,16 @@ public class VolcanicStrength extends CardImpl {
public VolcanicStrength(UUID ownerId) {
super(ownerId, 158, "Volcanic Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}");
this.expansionSetCode = "M11";
this.color.setRed(true);
this.subtype.add("Aura");
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
// Enchanted creature gets +2/+2 and has mountainwalk.
this.addAbility(ability);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VolcanicStrengthEffect()));
}
public VolcanicStrength(final VolcanicStrength card) {
@ -127,7 +126,7 @@ class VolcanicStrengthEffect extends ContinuousEffectImpl {
@Override
public boolean hasLayer(Layer layer) {
return layer == Layer.AbilityAddingRemovingEffects_6 || layer == layer.PTChangingEffects_7;
return layer == Layer.AbilityAddingRemovingEffects_6 || layer == Layer.PTChangingEffects_7;
}
}

2
Mage.Sets/src/mage/sets/magic2013/VolcanicStrength.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author North
* @author anonymous
*/
public class VolcanicStrength extends mage.sets.magic2011.VolcanicStrength {

2
Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java
View file

@ -87,7 +87,7 @@ class LaquatussCreativityEffect extends OneShotEffect {
Player player = game.getPlayer(source.getFirstTarget());
int handCount = player.getHand().count(new FilterCard(), game);
player.drawCards(handCount, game);
player.discard(handCount, source, game);
player.discard(handCount, false, source, game);
return false;
}
}

2
Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java
View file

@ -137,7 +137,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i
if (sublayer == SubLayer.NA) {
if (token.getAbilities().size() > 0) {
for (Ability ability: token.getAbilities()) {
permanent.addAbility(ability, game);
permanent.addAbility(ability, source.getSourceId(), game, false);
}
}
}

2
Mage.Sets/src/mage/sets/planechase2012/LastStand.java
View file

@ -135,7 +135,7 @@ class LastStandEffect extends OneShotEffect {
int islands = game.getBattlefield().count(filterIsland, source.getSourceId(), source.getControllerId(), game);
if (islands > 0) {
controller.drawCards(islands, game);
controller.discard(islands, source, game);
controller.discard(islands, false, source, game);
}
}

2
Mage.Sets/src/mage/sets/ravnica/CompulsiveResearch.java
View file

@ -94,7 +94,7 @@ class CompulsiveResearchDiscardEffect extends OneShotEffect {
if (card != null) {
targetPlayer.discard(card, source, game);
if (!card.getCardType().contains(CardType.LAND) && !targetPlayer.getHand().isEmpty()) {
targetPlayer.discard(1, source, game);
targetPlayer.discard(1, false, source, game);
}
return true;
}

2
Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java
View file

@ -92,7 +92,7 @@ class AssassinsStrikeEffect extends OneShotEffect {
if (permanent != null) {
Player player = game.getPlayer(permanent.getControllerId());
if (player != null) {
player.discard(1, source, game);
player.discard(1, false, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/returntoravnica/StreetSweeper.java
View file

@ -104,7 +104,7 @@ class StreetSweeperDestroyEffect extends OneShotEffect {
Permanent permanent = game.getPermanent(source.getFirstTarget());
if(permanent != null)
{
LinkedList<UUID> attachments = new LinkedList();
LinkedList<UUID> attachments = new LinkedList<>();
attachments.addAll(permanent.getAttachments());
for(UUID uuid : attachments)
{

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java
View file

@ -91,7 +91,7 @@ class InduceDespairEffect extends OneShotEffect {
if (cost != null) {
int CMC = -1 * cost.convertedManaCosts;
if (creature != null) {
creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(CMC, CMC, Duration.EndOfTurn)), game);
creature.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(CMC, CMC, Duration.EndOfTurn)), source.getSourceId(), game, false);
}
}
return true;

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/ThoughtGorger.java
View file

@ -104,7 +104,7 @@ class ThoughtGorgerEffectEnters extends OneShotEffect {
if (player != null && player.getHand().size() > 0 && thoughtGorger != null ) {
int cardsInHand = player.getHand().size();
thoughtGorger.addCounters(CounterType.P1P1.createInstance(cardsInHand), game);
player.discard(cardsInHand, source, game);
player.discard(cardsInHand, false, source, game);
return true;
}
return false;

3
Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java
View file

@ -45,6 +45,7 @@ import mage.counters.CounterType;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.GenericManaCost;
/**
@ -58,7 +59,7 @@ public class TrigonOfMending extends CardImpl {
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), ""));
Costs costs = new CostsImpl();
Costs<Cost> costs = new CostsImpl<>();
costs.add(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
costs.add(new TapSourceCost());
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), costs);

2
Mage.Sets/src/mage/sets/shadowmoor/Gloomlance.java
View file

@ -93,7 +93,7 @@ class GloomlanceEffect extends OneShotEffect {
Permanent destroyedCreature = game.getPermanentOrLKIBattlefield(source.getFirstTarget());
if (destroyedCreature.getColor().isGreen()
|| destroyedCreature.getColor().isWhite()) {
targetController.discard(1, source, game);
targetController.discard(1, false, source, game);
return true;
}
}

2
Mage.Sets/src/mage/sets/shardsofalara/OozeGarden.java
View file

@ -108,7 +108,7 @@ class OozeGardenCreateTokenEffect extends OneShotEffect {
}
ArrayList<String> list = new ArrayList<>();
list.add("Ooze");
Token token = new Token("Ooze", "X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power", ObjectColor.GREEN, list, value, value, new AbilitiesImpl()) {
Token token = new Token("Ooze", "X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power", ObjectColor.GREEN, list, value, value, new AbilitiesImpl<>()) {
};

2
Mage.Sets/src/mage/sets/torment/DeepAnalysis.java
View file

@ -59,7 +59,7 @@ public class DeepAnalysis extends CardImpl {
this.getSpellAbility().addTarget(new TargetPlayer());
// Flashback-{1}{U}, Pay 3 life.
CostsImpl costs = new CostsImpl();
Costs<Cost> costs = new CostsImpl<>();
costs.add(new ManaCostsImpl("{1}{U}"));
costs.add(new PayLifeCost(3));
this.addAbility(new FlashbackAbility(costs, TimingRule.SORCERY));

2
Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java
View file

@ -167,7 +167,7 @@ class MemoryJarDelayedEffect extends OneShotEffect {
Player player = game.getPlayer(playerId);
if (player != null)
{
player.discard(player.getHand().size(), source, game);
player.discard(player.getHand().size(), false, source, game);
}
}
//Return to hand

4
Mage.Sets/src/mage/sets/urzassaga/NoRestForTheWicked.java
View file

@ -120,12 +120,12 @@ class NoRestForTheWickedWatcher extends Watcher {
public NoRestForTheWickedWatcher() {
super("NoRestForTheWickedWatcher", WatcherScope.GAME);
this.cards = new ArrayList();
this.cards = new ArrayList<>();
}
public NoRestForTheWickedWatcher(final NoRestForTheWickedWatcher watcher) {
super(watcher);
this.cards = new ArrayList();
this.cards = new ArrayList<>();
this.cards.addAll(watcher.cards);
}

7
Mage.Sets/src/mage/sets/vintagemasters/DacksDuplicate.java
View file

@ -53,8 +53,6 @@ public class DacksDuplicate extends CardImpl {
this.expansionSetCode = "VMA";
this.subtype.add("Shapeshifter");
this.color.setRed(true);
this.color.setBlue(true);
this.power = new MageInt(0);
this.toughness = new MageInt(0);
@ -77,8 +75,13 @@ public class DacksDuplicate extends CardImpl {
}
class DacksDuplicateApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
/**
* 29/05/2014 The ability of Dack’s Duplicate doesn’t target the
* creature.
*/
permanent.addAbility(new DethroneAbility(), game);
permanent.addAbility(HasteAbility.getInstance(), game);
return true;

2
Mage.Sets/src/mage/sets/visions/AnvilOfBogardan.java
View file

@ -90,7 +90,7 @@ class AnvilOfBogardanEffect extends OneShotEffect {
Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source));
if (targetPlayer != null) {
targetPlayer.drawCards(1, game);
targetPlayer.discard(1, source, game);
targetPlayer.discard(1, false, source, game);
return true;
}
return false;

3
Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
View file

@ -34,6 +34,7 @@ import mage.constants.Rarity;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
@ -115,7 +116,7 @@ class PermafrostTrapWatcher extends Watcher {
}
}
class PermafrostTrapAlternativeCost extends AlternativeCostImpl {
class PermafrostTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public PermafrostTrapAlternativeCost() {
super("you may pay {U} rather than pay Permafrost Trap's mana cost");

3
Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java
View file

@ -34,6 +34,7 @@ import mage.constants.Rarity;
import mage.constants.WatcherScope;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.effects.common.ChooseNewTargetsTargetEffect;
import mage.cards.CardImpl;
@ -123,7 +124,7 @@ class RicochetTrapWatcher extends Watcher {
}
}
class RicochetTrapAlternativeCost extends AlternativeCostImpl {
class RicochetTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public RicochetTrapAlternativeCost() {
super("You may pay {R} rather than pay Ricochet Trap's mana cost");

3
Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java
View file

@ -33,6 +33,7 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.keyword.FlyingAbility;
@ -80,7 +81,7 @@ public class SlingbowTrap extends CardImpl {
}
}
class SlingbowTrapAlternativeCost extends AlternativeCostImpl {
class SlingbowTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public SlingbowTrapAlternativeCost() {
super("you may pay {G} rather than pay {this}'s mana cost");

3
Mage.Sets/src/mage/sets/zendikar/CobraTrap.java
View file

@ -35,6 +35,7 @@ import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
@ -113,7 +114,7 @@ class CobraTrapWatcher extends Watcher {
}
}
class CobraTrapAlternativeCost extends AlternativeCostImpl {
class CobraTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public CobraTrapAlternativeCost() {
super("you may pay {G} rather than pay Cobra Trap's mana cost");

11
Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
View file

@ -35,6 +35,7 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DamageAllEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
@ -83,7 +84,7 @@ public class LavaballTrap extends CardImpl {
class LavaballTrapWatcher extends Watcher {
private Map<UUID, Integer> amountOfLandsPlayedThisTurn = new HashMap<UUID, Integer>();
private Map<UUID, Integer> amountOfLandsPlayedThisTurn = new HashMap<>();
public LavaballTrapWatcher() {
super("LavaballTrapWatcher", WatcherScope.GAME);
@ -108,7 +109,7 @@ class LavaballTrapWatcher extends Watcher {
if (perm.getCardType().contains(CardType.LAND)) {
Integer amount = amountOfLandsPlayedThisTurn.get(perm.getControllerId());
if (amount == null) {
amount = Integer.valueOf(1);
amount = 1;
} else {
++amount;
}
@ -121,8 +122,8 @@ class LavaballTrapWatcher extends Watcher {
int maxLands = 0;
for (UUID opponentId : game.getOpponents(playerId)) {
Integer amount = amountOfLandsPlayedThisTurn.get(opponentId);
if (amount != null && amount.intValue() > maxLands) {
maxLands = amount.intValue();
if (amount != null && amount > maxLands) {
maxLands = amount;
}
}
return maxLands;
@ -135,7 +136,7 @@ class LavaballTrapWatcher extends Watcher {
}
}
class LavaballTrapAlternativeCost extends AlternativeCostImpl {
class LavaballTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public LavaballTrapAlternativeCost() {
super("you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost");

3
Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java
View file

@ -33,6 +33,7 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.CardImpl;
@ -78,7 +79,7 @@ public class LethargyTrap extends CardImpl {
}
}
class LethargyTrapAlternativeCost extends AlternativeCostImpl {
class LethargyTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public LethargyTrapAlternativeCost() {
super("you may pay {U} rather than pay Lethargy Trap's mana cost");

3
Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java
View file

@ -44,6 +44,7 @@ import mage.target.TargetPlayer;
import mage.watchers.Watcher;
import java.util.UUID;
import mage.abilities.costs.Cost;
/**
*
@ -142,7 +143,7 @@ class CardsDrawnOpponentWatcher extends Watcher {
}
}
class RuneflareTrapAlternativeCost extends AlternativeCostImpl {
class RuneflareTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public RuneflareTrapAlternativeCost() {
super("you may pay {R} rather than pay Runeflare Trap's mana cost");

3
Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java
View file

@ -36,6 +36,7 @@ import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
@ -126,7 +127,7 @@ class SummoningTrapWatcher extends Watcher {
}
}
class SummoningTrapAlternativeCost extends AlternativeCostImpl {
class SummoningTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public SummoningTrapAlternativeCost() {
super("you may pay {0} rather than pay Summoning Trap's mana cost");

3
Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java
View file

@ -35,6 +35,7 @@ import mage.constants.Zone;
import mage.abilities.ActivatedAbility;
import mage.abilities.common.LandfallAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.Costs;
import mage.abilities.costs.CostsImpl;
import mage.abilities.costs.common.RemoveCountersSourceCost;
@ -56,7 +57,7 @@ public class SunspringExpedition extends CardImpl {
this.color.setWhite(true);
this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true));
Costs costs = new CostsImpl();
Costs<Cost> costs = new CostsImpl<>();
costs.add(new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3)));
costs.add(new SacrificeSourceCost());
ActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(8), costs);

4
Mage/src/mage/abilities/costs/AlternativeCostImpl.java
View file

@ -3,7 +3,7 @@ package mage.abilities.costs;
import mage.abilities.Ability;
import mage.game.Game;
public class AlternativeCostImpl extends CostsImpl implements AlternativeCost {
public class AlternativeCostImpl<T extends Cost> extends CostsImpl<T> implements AlternativeCost {
protected String name;
@ -13,7 +13,7 @@ public class AlternativeCostImpl extends CostsImpl implements AlternativeCost {
public AlternativeCostImpl(String name, Cost cost) {
this.name = name;
this.add(cost);
this.add((T)cost);
}
public AlternativeCostImpl(final AlternativeCostImpl cost) {