From bcb42b8f46f45b896f05f0335ca79ba49776d20a Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 22 Sep 2021 21:20:55 -0400 Subject: [PATCH] simplified ObjectSourcePlayerPredicate interface --- Mage.Sets/src/mage/cards/a/AkiriFearlessVoyager.java | 2 +- Mage.Sets/src/mage/cards/a/AuraGraft.java | 4 ++-- Mage.Sets/src/mage/cards/b/BarteredCow.java | 2 +- Mage.Sets/src/mage/cards/b/Bioshift.java | 2 +- Mage.Sets/src/mage/cards/b/BoreasCharger.java | 2 +- Mage.Sets/src/mage/cards/c/CeruleanDrake.java | 2 +- Mage.Sets/src/mage/cards/c/ConduitOfRuin.java | 2 +- Mage.Sets/src/mage/cards/c/CrownOfDoom.java | 2 +- Mage.Sets/src/mage/cards/c/CullingScales.java | 2 +- Mage.Sets/src/mage/cards/d/DawnCharm.java | 2 +- Mage.Sets/src/mage/cards/d/DevoutHarpist.java | 2 +- Mage.Sets/src/mage/cards/d/DiamondKnight.java | 2 +- Mage.Sets/src/mage/cards/d/DiseasedVermin.java | 2 +- Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java | 2 +- Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java | 2 +- Mage.Sets/src/mage/cards/e/EliteHeadhunter.java | 2 +- Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java | 2 +- Mage.Sets/src/mage/cards/e/EvilTwin.java | 2 +- Mage.Sets/src/mage/cards/f/FalseOrders.java | 2 +- Mage.Sets/src/mage/cards/f/FireAndBrimstone.java | 2 +- Mage.Sets/src/mage/cards/f/FiresOfInvention.java | 2 +- Mage.Sets/src/mage/cards/f/FirjasRetribution.java | 2 +- Mage.Sets/src/mage/cards/f/FlameSweep.java | 2 +- Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java | 2 +- Mage.Sets/src/mage/cards/g/GomaFadaVanguard.java | 2 +- Mage.Sets/src/mage/cards/g/GyrusWakerOfCorpses.java | 2 +- Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java | 2 +- Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java | 2 +- Mage.Sets/src/mage/cards/h/HinderingLight.java | 2 +- Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java | 2 +- Mage.Sets/src/mage/cards/j/JeweledTorque.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfTheFlame.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java | 2 +- Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java | 2 +- Mage.Sets/src/mage/cards/k/KumenasSpeaker.java | 2 +- Mage.Sets/src/mage/cards/l/Legerdemain.java | 2 +- Mage.Sets/src/mage/cards/m/MalevolentNoble.java | 2 +- Mage.Sets/src/mage/cards/m/MartialImpetus.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorSheen.java | 2 +- Mage.Sets/src/mage/cards/m/Mistfolk.java | 2 +- Mage.Sets/src/mage/cards/m/MistformWarchief.java | 2 +- Mage.Sets/src/mage/cards/m/MuckDrubb.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfDruids.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfGhouls.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfLieges.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfMages.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfScholars.java | 2 +- Mage.Sets/src/mage/cards/o/OldManOfTheSea.java | 2 +- Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java | 2 +- Mage.Sets/src/mage/cards/p/PsychicRebuttal.java | 2 +- Mage.Sets/src/mage/cards/p/Pyramids.java | 2 +- Mage.Sets/src/mage/cards/r/Radiate.java | 4 ++-- Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java | 2 +- Mage.Sets/src/mage/cards/r/RemoveEnchantments.java | 2 +- Mage.Sets/src/mage/cards/r/Ricochet.java | 2 +- Mage.Sets/src/mage/cards/s/SageOfTheBeyond.java | 2 +- Mage.Sets/src/mage/cards/s/SalvageTrader.java | 2 +- Mage.Sets/src/mage/cards/s/SavaenElves.java | 2 +- Mage.Sets/src/mage/cards/s/ShacklesOfTreachery.java | 2 +- Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java | 2 +- Mage.Sets/src/mage/cards/s/SilverWyvern.java | 2 +- Mage.Sets/src/mage/cards/s/SilverquillSilencer.java | 2 +- Mage.Sets/src/mage/cards/s/SimicGuildmage.java | 2 +- Mage.Sets/src/mage/cards/s/SkullportMerchant.java | 2 +- Mage.Sets/src/mage/cards/s/SoulShatter.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralDeluge.java | 2 +- Mage.Sets/src/mage/cards/s/SpellstutterSprite.java | 2 +- Mage.Sets/src/mage/cards/s/StumpsquallHydra.java | 2 +- Mage.Sets/src/mage/cards/t/TelimTorsEdict.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderkinAwakener.java | 2 +- Mage.Sets/src/mage/cards/t/Torchling.java | 2 +- Mage.Sets/src/mage/cards/t/TravelersCloak.java | 2 +- Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenShackles.java | 2 +- Mage.Sets/src/mage/cards/v/VineGecko.java | 2 +- Mage.Sets/src/mage/cards/w/WickedAkuba.java | 2 +- Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java | 2 +- .../src/main/java/mage/abilities/keyword/MentorAbility.java | 2 +- Mage/src/main/java/mage/constants/TargetController.java | 6 +++--- Mage/src/main/java/mage/filter/FilterCard.java | 2 +- Mage/src/main/java/mage/filter/FilterPermanent.java | 3 +-- Mage/src/main/java/mage/filter/FilterPlayer.java | 2 +- Mage/src/main/java/mage/filter/FilterStackObject.java | 4 +--- .../java/mage/filter/common/FilterPermanentOrPlayer.java | 1 - .../mage/filter/predicate/ObjectSourcePlayerPredicate.java | 2 +- .../filter/predicate/card/CardOnTopOfLibraryPredicate.java | 2 +- .../predicate/card/DefendingPlayerOwnsCardPredicate.java | 2 +- .../filter/predicate/mageobject/AnotherCardPredicate.java | 2 +- .../mage/filter/predicate/mageobject/AnotherPredicate.java | 2 +- .../filter/predicate/mageobject/ChosenColorPredicate.java | 2 +- .../filter/predicate/mageobject/ChosenSubtypePredicate.java | 2 +- .../mageobject/SharesColorWithSourcePredicate.java | 2 +- .../predicate/mageobject/TargetsOnlyOnePlayerPredicate.java | 2 +- .../predicate/mageobject/TargetsPermanentPredicate.java | 2 +- .../filter/predicate/mageobject/TargetsPlayerPredicate.java | 2 +- .../mage/filter/predicate/other/AnotherTargetPredicate.java | 2 +- .../predicate/other/DamagedPlayerThisTurnPredicate.java | 2 +- .../filter/predicate/other/PlayerCanGainLifePredicate.java | 2 +- .../predicate/permanent/AnotherEnchantedPredicate.java | 2 +- .../permanent/AttachedToControlledPermanentPredicate.java | 2 +- .../permanent/BlockingOrBlockedBySourcePredicate.java | 2 +- .../permanent/DefendingPlayerControlsPredicate.java | 2 +- .../permanent/GreatestPowerControlledPredicate.java | 2 +- 104 files changed, 107 insertions(+), 111 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AkiriFearlessVoyager.java b/Mage.Sets/src/mage/cards/a/AkiriFearlessVoyager.java index 26d165568c4..a7583635ab4 100644 --- a/Mage.Sets/src/mage/cards/a/AkiriFearlessVoyager.java +++ b/Mage.Sets/src/mage/cards/a/AkiriFearlessVoyager.java @@ -103,7 +103,7 @@ class AkiriFearlessVoyagerTriggeredAbility extends TriggeredAbilityImpl { class AkiriFearlessVoyagerEffect extends OneShotEffect { - private static enum AkiriFearlessVoyagerPredicate implements ObjectSourcePlayerPredicate> { + private static enum AkiriFearlessVoyagerPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 519b2d25dc3..27fad23790d 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -54,7 +54,7 @@ public final class AuraGraft extends CardImpl { } } -class AttachedToPermanentPredicate implements ObjectSourcePlayerPredicate> { +class AttachedToPermanentPredicate implements ObjectSourcePlayerPredicate { public AttachedToPermanentPredicate() { super(); @@ -66,7 +66,7 @@ class AttachedToPermanentPredicate implements ObjectSourcePlayerPredicate> { +class PermanentCanBeAttachedToPredicate implements ObjectSourcePlayerPredicate { protected Permanent aura; diff --git a/Mage.Sets/src/mage/cards/b/BarteredCow.java b/Mage.Sets/src/mage/cards/b/BarteredCow.java index 9675188862e..707e63fa07a 100644 --- a/Mage.Sets/src/mage/cards/b/BarteredCow.java +++ b/Mage.Sets/src/mage/cards/b/BarteredCow.java @@ -56,7 +56,7 @@ public final class BarteredCow extends CardImpl { } } -enum BarteredCowPredicate implements ObjectSourcePlayerPredicate> { +enum BarteredCowPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/b/Bioshift.java b/Mage.Sets/src/mage/cards/b/Bioshift.java index 9725347d4c7..d8b750d9ac7 100644 --- a/Mage.Sets/src/mage/cards/b/Bioshift.java +++ b/Mage.Sets/src/mage/cards/b/Bioshift.java @@ -100,7 +100,7 @@ class MoveCounterFromTargetToTargetEffect extends OneShotEffect { } } -class SameControllerPredicate implements ObjectSourcePlayerPredicate> { +class SameControllerPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/b/BoreasCharger.java b/Mage.Sets/src/mage/cards/b/BoreasCharger.java index fcc80133551..7169a5d1240 100644 --- a/Mage.Sets/src/mage/cards/b/BoreasCharger.java +++ b/Mage.Sets/src/mage/cards/b/BoreasCharger.java @@ -138,7 +138,7 @@ class BoreasChargerEffect extends OneShotEffect { } } -class BoreasChargerPredicate implements ObjectSourcePlayerPredicate> { +class BoreasChargerPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/c/CeruleanDrake.java b/Mage.Sets/src/mage/cards/c/CeruleanDrake.java index f4c831dce91..c65cdd08337 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanDrake.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanDrake.java @@ -61,7 +61,7 @@ public final class CeruleanDrake extends CardImpl { } } -enum CeruleanDrakePredicate implements ObjectSourcePlayerPredicate> { +enum CeruleanDrakePredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java index dfd4a39e22a..f9e79a610da 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java @@ -100,7 +100,7 @@ class ConduitOfRuinWatcher extends Watcher { } } -class FirstCastCreatureSpellPredicate implements ObjectSourcePlayerPredicate> { +class FirstCastCreatureSpellPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java index 295c2a27e2b..6d6b2669340 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java @@ -72,7 +72,7 @@ public final class CrownOfDoom extends CardImpl { } } -enum CrownOfDoomPredicate implements ObjectSourcePlayerPredicate> { +enum CrownOfDoomPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/c/CullingScales.java b/Mage.Sets/src/mage/cards/c/CullingScales.java index 0d3922d4a01..9bddf1d536c 100644 --- a/Mage.Sets/src/mage/cards/c/CullingScales.java +++ b/Mage.Sets/src/mage/cards/c/CullingScales.java @@ -52,7 +52,7 @@ public final class CullingScales extends CardImpl { } -class HasLowestCMCAmongstNonlandPermanentsPredicate implements ObjectSourcePlayerPredicate> { +class HasLowestCMCAmongstNonlandPermanentsPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/d/DawnCharm.java b/Mage.Sets/src/mage/cards/d/DawnCharm.java index db5b065bd31..76e15531189 100644 --- a/Mage.Sets/src/mage/cards/d/DawnCharm.java +++ b/Mage.Sets/src/mage/cards/d/DawnCharm.java @@ -59,7 +59,7 @@ public final class DawnCharm extends CardImpl { } } -class DawnCharmPredicate implements ObjectSourcePlayerPredicate> { +class DawnCharmPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java index 1dbd8aebcc3..0f6c9a2ca2d 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java +++ b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java @@ -56,7 +56,7 @@ public final class DevoutHarpist extends CardImpl { } -class DevoutHarpistPredicate implements ObjectSourcePlayerPredicate> { +class DevoutHarpistPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { Permanent attachment = input.getObject(); diff --git a/Mage.Sets/src/mage/cards/d/DiamondKnight.java b/Mage.Sets/src/mage/cards/d/DiamondKnight.java index 406854098e5..d1e089376ba 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKnight.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKnight.java @@ -59,7 +59,7 @@ public final class DiamondKnight extends CardImpl { } } -enum DiamondKnightPredicate implements ObjectSourcePlayerPredicate> { +enum DiamondKnightPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/d/DiseasedVermin.java b/Mage.Sets/src/mage/cards/d/DiseasedVermin.java index efc31859241..ad0957bafaf 100644 --- a/Mage.Sets/src/mage/cards/d/DiseasedVermin.java +++ b/Mage.Sets/src/mage/cards/d/DiseasedVermin.java @@ -114,7 +114,7 @@ class DiseasedVerminEffect extends OneShotEffect { } } -class DiseasedVerminPredicate implements ObjectSourcePlayerPredicate> { +class DiseasedVerminPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java b/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java index 8ba2508b57d..58c6deb298f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java @@ -69,7 +69,7 @@ public final class DreadhordeArcanist extends CardImpl { } } -enum DreadhordeArcanistPredicate implements ObjectSourcePlayerPredicate> { +enum DreadhordeArcanistPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java b/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java index 126accce1b5..41343176fdb 100644 --- a/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java +++ b/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java @@ -68,7 +68,7 @@ public final class EarthshakerKhenra extends CardImpl { } } -enum EarthshakerKhenraPredicate implements ObjectSourcePlayerPredicate> { +enum EarthshakerKhenraPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/e/EliteHeadhunter.java b/Mage.Sets/src/mage/cards/e/EliteHeadhunter.java index d06d5be2602..c28c80af80d 100644 --- a/Mage.Sets/src/mage/cards/e/EliteHeadhunter.java +++ b/Mage.Sets/src/mage/cards/e/EliteHeadhunter.java @@ -63,7 +63,7 @@ public final class EliteHeadhunter extends CardImpl { } } -enum EliteHeadhunterPredicate implements ObjectSourcePlayerPredicate> { +enum EliteHeadhunterPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java index 2b65428decd..1af558de01c 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java +++ b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java @@ -62,7 +62,7 @@ public final class EnchantmentAlteration extends CardImpl { } -class SharesEnchantedCardTypePredicate implements ObjectSourcePlayerPredicate> { +class SharesEnchantedCardTypePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/e/EvilTwin.java b/Mage.Sets/src/mage/cards/e/EvilTwin.java index 047e18248d8..c2f531b9f34 100644 --- a/Mage.Sets/src/mage/cards/e/EvilTwin.java +++ b/Mage.Sets/src/mage/cards/e/EvilTwin.java @@ -75,7 +75,7 @@ class EvilTwinCopyApplier extends CopyApplier { } -class EvilTwinPredicate implements ObjectSourcePlayerPredicate> { +class EvilTwinPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/f/FalseOrders.java b/Mage.Sets/src/mage/cards/f/FalseOrders.java index f788ead8b07..8b4b1cf5bed 100644 --- a/Mage.Sets/src/mage/cards/f/FalseOrders.java +++ b/Mage.Sets/src/mage/cards/f/FalseOrders.java @@ -64,7 +64,7 @@ public final class FalseOrders extends CardImpl { } -enum FalseOrdersDefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate> { +enum FalseOrdersDefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java b/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java index 6dc7fe7f3d7..f7258a53ac3 100644 --- a/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java +++ b/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java @@ -45,7 +45,7 @@ public final class FireAndBrimstone extends CardImpl { } } -enum FireAndBrimstonePredicate implements ObjectSourcePlayerPredicate> { +enum FireAndBrimstonePredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/f/FiresOfInvention.java b/Mage.Sets/src/mage/cards/f/FiresOfInvention.java index 2383d18bfcb..7cc79d35271 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfInvention.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfInvention.java @@ -52,7 +52,7 @@ public final class FiresOfInvention extends CardImpl { } } -enum FiresOfInventionPredicate implements ObjectSourcePlayerPredicate> { +enum FiresOfInventionPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/f/FirjasRetribution.java b/Mage.Sets/src/mage/cards/f/FirjasRetribution.java index 56f0adbfbfb..d4ea16d5d2f 100644 --- a/Mage.Sets/src/mage/cards/f/FirjasRetribution.java +++ b/Mage.Sets/src/mage/cards/f/FirjasRetribution.java @@ -75,7 +75,7 @@ public final class FirjasRetribution extends CardImpl { } } -enum FirjasRetributionPredicate implements ObjectSourcePlayerPredicate> { +enum FirjasRetributionPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/f/FlameSweep.java b/Mage.Sets/src/mage/cards/f/FlameSweep.java index e40d1c9762e..801cfed2139 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSweep.java +++ b/Mage.Sets/src/mage/cards/f/FlameSweep.java @@ -43,7 +43,7 @@ public final class FlameSweep extends CardImpl { } } -enum FlameSweepPredicate implements ObjectSourcePlayerPredicate> { +enum FlameSweepPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java index f17f0b31a17..e6b0102c6aa 100644 --- a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java +++ b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java @@ -79,7 +79,7 @@ public final class FrostpyreArcanist extends CardImpl { } } -enum FrostpyreArcanistPredicate implements ObjectSourcePlayerPredicate> { +enum FrostpyreArcanistPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/g/GomaFadaVanguard.java b/Mage.Sets/src/mage/cards/g/GomaFadaVanguard.java index 725ed0fd9a8..ae5bb8e7cf6 100644 --- a/Mage.Sets/src/mage/cards/g/GomaFadaVanguard.java +++ b/Mage.Sets/src/mage/cards/g/GomaFadaVanguard.java @@ -66,7 +66,7 @@ public final class GomaFadaVanguard extends CardImpl { } } -enum GomaFadaVanguardPredicate implements ObjectSourcePlayerPredicate> { +enum GomaFadaVanguardPredicate implements ObjectSourcePlayerPredicate { instance; private static final FilterPermanent filter = new FilterPermanent(SubType.WARRIOR, ""); diff --git a/Mage.Sets/src/mage/cards/g/GyrusWakerOfCorpses.java b/Mage.Sets/src/mage/cards/g/GyrusWakerOfCorpses.java index 48dc31882cd..28f936bdeb6 100644 --- a/Mage.Sets/src/mage/cards/g/GyrusWakerOfCorpses.java +++ b/Mage.Sets/src/mage/cards/g/GyrusWakerOfCorpses.java @@ -105,7 +105,7 @@ class GyrusWakerOfCorpsesEffect extends OneShotEffect { } } -class GyrusWakerOfCorpsesPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate> { +class GyrusWakerOfCorpsesPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java b/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java index 3a585e8ee91..dd5a6e39c14 100644 --- a/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java +++ b/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java @@ -101,7 +101,7 @@ class HaktosTheUnscarredChooseEffect extends OneShotEffect { } } -enum HaktosTheUnscarredPredicate implements ObjectSourcePlayerPredicate> { +enum HaktosTheUnscarredPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java index 4d2513cc5c0..d2e1568137b 100644 --- a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java +++ b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java @@ -181,7 +181,7 @@ class SwordOfTheRealmsEffect extends OneShotEffect { } } -class HalvarGodOfBattlePredicate implements ObjectSourcePlayerPredicate> { +class HalvarGodOfBattlePredicate implements ObjectSourcePlayerPredicate { private final FilterPermanent filter; diff --git a/Mage.Sets/src/mage/cards/h/HinderingLight.java b/Mage.Sets/src/mage/cards/h/HinderingLight.java index 21838f6aa40..f0589a07876 100644 --- a/Mage.Sets/src/mage/cards/h/HinderingLight.java +++ b/Mage.Sets/src/mage/cards/h/HinderingLight.java @@ -49,7 +49,7 @@ public final class HinderingLight extends CardImpl { } } -class HinderingLightPredicate implements ObjectSourcePlayerPredicate> { +class HinderingLightPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java index f9a870d5b43..9a8fa224708 100644 --- a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java +++ b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java @@ -114,7 +114,7 @@ class HopeOfGhirapurCantCastEffect extends ContinuousRuleModifyingEffectImpl { } } -class HopeOfGhirapurPlayerLostLifePredicate implements ObjectSourcePlayerPredicate> { +class HopeOfGhirapurPlayerLostLifePredicate implements ObjectSourcePlayerPredicate { public HopeOfGhirapurPlayerLostLifePredicate() { } diff --git a/Mage.Sets/src/mage/cards/j/JeweledTorque.java b/Mage.Sets/src/mage/cards/j/JeweledTorque.java index 2d3e25c715d..ad295d7912f 100644 --- a/Mage.Sets/src/mage/cards/j/JeweledTorque.java +++ b/Mage.Sets/src/mage/cards/j/JeweledTorque.java @@ -56,7 +56,7 @@ public final class JeweledTorque extends CardImpl { } } -enum JeweledTorquePredicate implements ObjectSourcePlayerPredicate> { +enum JeweledTorquePredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java index 50249cf421f..387a3a2442d 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java @@ -74,7 +74,7 @@ public final class KeeperOfTheDead extends CardImpl { } } -class KeeperOfDeadPredicate implements ObjectSourcePlayerPredicate> { +class KeeperOfDeadPredicate implements ObjectSourcePlayerPredicate { private static final FilterCard filter = new FilterCard("creature cards"); diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheFlame.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheFlame.java index 9e5cfb6ec3a..6c1d1015ae9 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheFlame.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheFlame.java @@ -58,7 +58,7 @@ public final class KeeperOfTheFlame extends CardImpl { } } -class KeeperOfTheFlamePredicate implements ObjectSourcePlayerPredicate> { +class KeeperOfTheFlamePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java index fb3779ac291..3e943da7277 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java @@ -102,7 +102,7 @@ enum KeeperOfTheMindAdjuster implements TargetAdjuster { } } -class KeeperOfTheMindPredicate implements ObjectSourcePlayerPredicate> { +class KeeperOfTheMindPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java b/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java index 38e8c6a1767..87ce26c7c37 100644 --- a/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java +++ b/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java @@ -69,7 +69,7 @@ public final class KitesailSkirmisher extends CardImpl { } } -enum KitesailSkirmisherPredicate implements ObjectSourcePlayerPredicate> { +enum KitesailSkirmisherPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java b/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java index 9626941ed44..0e3521712e5 100644 --- a/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java +++ b/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java @@ -48,7 +48,7 @@ public final class KumenasSpeaker extends CardImpl { } } -enum KumenasSpeakerPredicate implements ObjectSourcePlayerPredicate> { +enum KumenasSpeakerPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/l/Legerdemain.java b/Mage.Sets/src/mage/cards/l/Legerdemain.java index 89cff853c42..bf3f729578f 100644 --- a/Mage.Sets/src/mage/cards/l/Legerdemain.java +++ b/Mage.Sets/src/mage/cards/l/Legerdemain.java @@ -55,7 +55,7 @@ public final class Legerdemain extends CardImpl { } } -class SharesTypePredicate implements ObjectSourcePlayerPredicate> { +class SharesTypePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/m/MalevolentNoble.java b/Mage.Sets/src/mage/cards/m/MalevolentNoble.java index 611ecf4f3b9..71c8dec34a5 100644 --- a/Mage.Sets/src/mage/cards/m/MalevolentNoble.java +++ b/Mage.Sets/src/mage/cards/m/MalevolentNoble.java @@ -58,7 +58,7 @@ public final class MalevolentNoble extends CardImpl { } } -enum MalevolentNoblePredicate implements ObjectSourcePlayerPredicate> { +enum MalevolentNoblePredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/m/MartialImpetus.java b/Mage.Sets/src/mage/cards/m/MartialImpetus.java index e251becd38c..a57193f549a 100644 --- a/Mage.Sets/src/mage/cards/m/MartialImpetus.java +++ b/Mage.Sets/src/mage/cards/m/MartialImpetus.java @@ -64,7 +64,7 @@ public final class MartialImpetus extends CardImpl { } } -enum MartialImpetusPredicate implements ObjectSourcePlayerPredicate> { +enum MartialImpetusPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/m/MirrorSheen.java b/Mage.Sets/src/mage/cards/m/MirrorSheen.java index e658e9a7fe0..c77f0049e60 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorSheen.java +++ b/Mage.Sets/src/mage/cards/m/MirrorSheen.java @@ -53,7 +53,7 @@ public final class MirrorSheen extends CardImpl { } } -class TargetYouPredicate implements ObjectSourcePlayerPredicate> { +class TargetYouPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/m/Mistfolk.java b/Mage.Sets/src/mage/cards/m/Mistfolk.java index 0a6e5a971a1..f4b6c58b68b 100644 --- a/Mage.Sets/src/mage/cards/m/Mistfolk.java +++ b/Mage.Sets/src/mage/cards/m/Mistfolk.java @@ -60,7 +60,7 @@ public final class Mistfolk extends CardImpl { } } -enum MistfolkPredicate implements ObjectSourcePlayerPredicate> { +enum MistfolkPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/m/MistformWarchief.java b/Mage.Sets/src/mage/cards/m/MistformWarchief.java index 4d71ee79c51..bc6260c717f 100644 --- a/Mage.Sets/src/mage/cards/m/MistformWarchief.java +++ b/Mage.Sets/src/mage/cards/m/MistformWarchief.java @@ -58,7 +58,7 @@ public final class MistformWarchief extends CardImpl { } } -class MistformWarchiefPredicate implements ObjectSourcePlayerPredicate> { +class MistformWarchiefPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/m/MuckDrubb.java b/Mage.Sets/src/mage/cards/m/MuckDrubb.java index c892e9bf5e0..47f4327956f 100644 --- a/Mage.Sets/src/mage/cards/m/MuckDrubb.java +++ b/Mage.Sets/src/mage/cards/m/MuckDrubb.java @@ -69,7 +69,7 @@ public final class MuckDrubb extends CardImpl { } } -class SpellWithOnlySingleTargetPredicate implements ObjectSourcePlayerPredicate> { +class SpellWithOnlySingleTargetPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfDruids.java b/Mage.Sets/src/mage/cards/o/OathOfDruids.java index ae1f201e044..ef54f07cafe 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfDruids.java +++ b/Mage.Sets/src/mage/cards/o/OathOfDruids.java @@ -66,7 +66,7 @@ enum OathOfDruidsAdjuster implements TargetAdjuster { } } -class OathOfDruidsPredicate implements ObjectSourcePlayerPredicate> { +class OathOfDruidsPredicate implements ObjectSourcePlayerPredicate { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java index e692587c55a..dc1552060aa 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java +++ b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java @@ -72,7 +72,7 @@ enum OathOfGhoulsAdjuster implements TargetAdjuster { } } -class OathOfGhoulsPredicate implements ObjectSourcePlayerPredicate> { +class OathOfGhoulsPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfLieges.java b/Mage.Sets/src/mage/cards/o/OathOfLieges.java index 643d754d134..d09d5546987 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLieges.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLieges.java @@ -100,7 +100,7 @@ class OathOfLiegesEffect extends OneShotEffect { } } -class OathOfLiegesPredicate implements ObjectSourcePlayerPredicate> { +class OathOfLiegesPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfMages.java b/Mage.Sets/src/mage/cards/o/OathOfMages.java index 0dbe5e03500..6d6efdef132 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfMages.java +++ b/Mage.Sets/src/mage/cards/o/OathOfMages.java @@ -66,7 +66,7 @@ enum OathOfMagesAdjuster implements TargetAdjuster { } } -enum OathOfMagesPredicate implements ObjectSourcePlayerPredicate> { +enum OathOfMagesPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/o/OathOfScholars.java b/Mage.Sets/src/mage/cards/o/OathOfScholars.java index 02c02dc71e9..194a5709b92 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfScholars.java +++ b/Mage.Sets/src/mage/cards/o/OathOfScholars.java @@ -64,7 +64,7 @@ enum OathOfScholarsAdjuster implements TargetAdjuster { } } -class OathOfScholarsPredicate implements ObjectSourcePlayerPredicate> { +class OathOfScholarsPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/o/OldManOfTheSea.java b/Mage.Sets/src/mage/cards/o/OldManOfTheSea.java index 6e5ee08db4f..4e376e46b3d 100644 --- a/Mage.Sets/src/mage/cards/o/OldManOfTheSea.java +++ b/Mage.Sets/src/mage/cards/o/OldManOfTheSea.java @@ -148,7 +148,7 @@ class SourcePowerGreaterEqualTargetCondition implements Condition { } } -class PowerLowerEqualSourcePredicate implements ObjectSourcePlayerPredicate> { +class PowerLowerEqualSourcePredicate implements ObjectSourcePlayerPredicate { UUID sourceId; diff --git a/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java b/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java index a7294fdf46d..7f63b56e162 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java +++ b/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java @@ -46,7 +46,7 @@ public final class PersonalEnergyShield extends CardImpl { } } -class PersonalEnergyFieldPredicate implements ObjectSourcePlayerPredicate> { +class PersonalEnergyFieldPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicRebuttal.java b/Mage.Sets/src/mage/cards/p/PsychicRebuttal.java index 2fcc52ca173..ac8dbac8b09 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicRebuttal.java +++ b/Mage.Sets/src/mage/cards/p/PsychicRebuttal.java @@ -91,7 +91,7 @@ class PsychicRebuttalEffect extends OneShotEffect { } } -class PsychicRebuttalPredicate implements ObjectSourcePlayerPredicate> { +class PsychicRebuttalPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index 8f14c637860..297ab08af36 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -60,7 +60,7 @@ public final class Pyramids extends CardImpl { return new Pyramids(this); } } -class PyramidsPredicate implements ObjectSourcePlayerPredicate> { +class PyramidsPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { Permanent attachment = input.getObject(); diff --git a/Mage.Sets/src/mage/cards/r/Radiate.java b/Mage.Sets/src/mage/cards/r/Radiate.java index ad83f123481..5e8eeabc69e 100644 --- a/Mage.Sets/src/mage/cards/r/Radiate.java +++ b/Mage.Sets/src/mage/cards/r/Radiate.java @@ -55,7 +55,7 @@ public final class Radiate extends CardImpl { } } -enum SpellWithOnlySingleTargetPredicate implements ObjectSourcePlayerPredicate> { +enum SpellWithOnlySingleTargetPredicate implements ObjectSourcePlayerPredicate { instance; @Override @@ -79,7 +79,7 @@ enum SpellWithOnlySingleTargetPredicate implements ObjectSourcePlayerPredicate> { +enum SpellWithOnlyPermanentOrPlayerTargetsPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java b/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java index 1720c48f8c3..e5f023a7ba0 100644 --- a/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java +++ b/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java @@ -62,7 +62,7 @@ public final class RebbecArchitectOfAscension extends CardImpl { } } -enum RebbecArchitectOfAscensionPredicate implements ObjectSourcePlayerPredicate> { +enum RebbecArchitectOfAscensionPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java index 991a19f7d9c..6a345bfdba5 100644 --- a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java +++ b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java @@ -74,7 +74,7 @@ public final class RemoveEnchantments extends CardImpl { } } -class AttachedToOpponentControlledAttackingCreaturePredicate implements ObjectSourcePlayerPredicate> { +class AttachedToOpponentControlledAttackingCreaturePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/r/Ricochet.java b/Mage.Sets/src/mage/cards/r/Ricochet.java index 99f3b66f719..029f4e5d193 100644 --- a/Mage.Sets/src/mage/cards/r/Ricochet.java +++ b/Mage.Sets/src/mage/cards/r/Ricochet.java @@ -57,7 +57,7 @@ public final class Ricochet extends CardImpl { } } -class SpellWithOnlyPlayerTargetsPredicate implements ObjectSourcePlayerPredicate> { +class SpellWithOnlyPlayerTargetsPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/s/SageOfTheBeyond.java b/Mage.Sets/src/mage/cards/s/SageOfTheBeyond.java index 0f3de5243bc..4317d671c37 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfTheBeyond.java +++ b/Mage.Sets/src/mage/cards/s/SageOfTheBeyond.java @@ -59,7 +59,7 @@ public final class SageOfTheBeyond extends CardImpl { } } -enum SageOfTheBeyondPredicate implements ObjectSourcePlayerPredicate> { +enum SageOfTheBeyondPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/s/SalvageTrader.java b/Mage.Sets/src/mage/cards/s/SalvageTrader.java index 76e21c7352f..eb31a44a3e7 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageTrader.java +++ b/Mage.Sets/src/mage/cards/s/SalvageTrader.java @@ -57,7 +57,7 @@ public final class SalvageTrader extends CardImpl { } } -class SameCastingCostPredicate implements ObjectSourcePlayerPredicate> { +class SameCastingCostPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/s/SavaenElves.java b/Mage.Sets/src/mage/cards/s/SavaenElves.java index bc2837ff4ea..5b0d87ac768 100644 --- a/Mage.Sets/src/mage/cards/s/SavaenElves.java +++ b/Mage.Sets/src/mage/cards/s/SavaenElves.java @@ -59,7 +59,7 @@ public final class SavaenElves extends CardImpl { } } -class SavaenElvesPredicate implements ObjectSourcePlayerPredicate> { +class SavaenElvesPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { Permanent attachment = input.getObject(); diff --git a/Mage.Sets/src/mage/cards/s/ShacklesOfTreachery.java b/Mage.Sets/src/mage/cards/s/ShacklesOfTreachery.java index 12af6a0c8b9..06667a49972 100644 --- a/Mage.Sets/src/mage/cards/s/ShacklesOfTreachery.java +++ b/Mage.Sets/src/mage/cards/s/ShacklesOfTreachery.java @@ -56,7 +56,7 @@ public final class ShacklesOfTreachery extends CardImpl { class ShacklesOfTreacheryTriggeredAbility extends TriggeredAbilityImpl { - private enum ShacklesOfTreacheryPredicate implements ObjectSourcePlayerPredicate> { + private enum ShacklesOfTreacheryPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java index 34809f201ae..1eade2f0432 100644 --- a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java +++ b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java @@ -156,7 +156,7 @@ class ShellOfTheLastKappaCastEffect extends OneShotEffect { } } -class TargetYouPredicate implements ObjectSourcePlayerPredicate> { +class TargetYouPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/s/SilverWyvern.java b/Mage.Sets/src/mage/cards/s/SilverWyvern.java index 1a01717a61f..b1b0e8d21ec 100644 --- a/Mage.Sets/src/mage/cards/s/SilverWyvern.java +++ b/Mage.Sets/src/mage/cards/s/SilverWyvern.java @@ -66,7 +66,7 @@ public final class SilverWyvern extends CardImpl { } } -enum SilverWyvernPredicate implements ObjectSourcePlayerPredicate> { +enum SilverWyvernPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/s/SilverquillSilencer.java b/Mage.Sets/src/mage/cards/s/SilverquillSilencer.java index 8ea5ef8ed9f..fba59f6c3a2 100644 --- a/Mage.Sets/src/mage/cards/s/SilverquillSilencer.java +++ b/Mage.Sets/src/mage/cards/s/SilverquillSilencer.java @@ -65,7 +65,7 @@ public final class SilverquillSilencer extends CardImpl { } } -enum SilverquillSilencerPredicate implements ObjectSourcePlayerPredicate> { +enum SilverquillSilencerPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index 06cd89b6126..aaa757e9285 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -120,7 +120,7 @@ class MoveCounterFromTargetToTargetEffect extends OneShotEffect { } } -class SameControllerPredicate implements ObjectSourcePlayerPredicate> { +class SameControllerPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/s/SkullportMerchant.java b/Mage.Sets/src/mage/cards/s/SkullportMerchant.java index 077336654e9..33aea4c8809 100644 --- a/Mage.Sets/src/mage/cards/s/SkullportMerchant.java +++ b/Mage.Sets/src/mage/cards/s/SkullportMerchant.java @@ -60,7 +60,7 @@ public final class SkullportMerchant extends CardImpl { } } -enum SkullportMerchantPredicate implements ObjectSourcePlayerPredicate> { +enum SkullportMerchantPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/s/SoulShatter.java b/Mage.Sets/src/mage/cards/s/SoulShatter.java index cdb4429db05..b690afb3380 100644 --- a/Mage.Sets/src/mage/cards/s/SoulShatter.java +++ b/Mage.Sets/src/mage/cards/s/SoulShatter.java @@ -47,7 +47,7 @@ public final class SoulShatter extends CardImpl { } } -enum SoulShatterPredicate implements ObjectSourcePlayerPredicate> { +enum SoulShatterPredicate implements ObjectSourcePlayerPredicate { instance; private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent(); diff --git a/Mage.Sets/src/mage/cards/s/SpectralDeluge.java b/Mage.Sets/src/mage/cards/s/SpectralDeluge.java index be30c1e1822..5bc96cc27d7 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralDeluge.java +++ b/Mage.Sets/src/mage/cards/s/SpectralDeluge.java @@ -50,7 +50,7 @@ public final class SpectralDeluge extends CardImpl { } } -enum SpectralDelugePredicate implements ObjectSourcePlayerPredicate> { +enum SpectralDelugePredicate implements ObjectSourcePlayerPredicate { instance; private static final FilterPermanent filter = new FilterControlledPermanent(SubType.ISLAND); diff --git a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java index ad378de75b5..0f6f0719e1c 100644 --- a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java @@ -62,7 +62,7 @@ public final class SpellstutterSprite extends CardImpl { } } -enum SpellstutterSpritePredicate implements ObjectSourcePlayerPredicate> { +enum SpellstutterSpritePredicate implements ObjectSourcePlayerPredicate { instance; private static final FilterPermanent filter = new FilterPermanent(); diff --git a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java index 110ae1ffab9..e59c1c4e8b1 100644 --- a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java +++ b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java @@ -59,7 +59,7 @@ class StumpsquallHydraEffect extends OneShotEffect { filter.add(StumpsquallHydraPredicate.instance); } - private enum StumpsquallHydraPredicate implements ObjectSourcePlayerPredicate> { + private enum StumpsquallHydraPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/t/TelimTorsEdict.java b/Mage.Sets/src/mage/cards/t/TelimTorsEdict.java index c4145bdbeb3..c4f27760e73 100644 --- a/Mage.Sets/src/mage/cards/t/TelimTorsEdict.java +++ b/Mage.Sets/src/mage/cards/t/TelimTorsEdict.java @@ -49,7 +49,7 @@ public final class TelimTorsEdict extends CardImpl { } } -class TelimTorsEdictPredicate implements ObjectSourcePlayerPredicate> { +class TelimTorsEdictPredicate implements ObjectSourcePlayerPredicate { public TelimTorsEdictPredicate() { } diff --git a/Mage.Sets/src/mage/cards/t/ThunderkinAwakener.java b/Mage.Sets/src/mage/cards/t/ThunderkinAwakener.java index a340a43b282..e8d3a109fee 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderkinAwakener.java +++ b/Mage.Sets/src/mage/cards/t/ThunderkinAwakener.java @@ -70,7 +70,7 @@ public final class ThunderkinAwakener extends CardImpl { } } -enum ThunderkinAwakenerPredicate implements ObjectSourcePlayerPredicate> { +enum ThunderkinAwakenerPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/t/Torchling.java b/Mage.Sets/src/mage/cards/t/Torchling.java index 3c3c1b0cfb9..53a094e7b18 100644 --- a/Mage.Sets/src/mage/cards/t/Torchling.java +++ b/Mage.Sets/src/mage/cards/t/Torchling.java @@ -83,7 +83,7 @@ public final class Torchling extends CardImpl { } } -enum TorchlingPredicate implements ObjectSourcePlayerPredicate> { +enum TorchlingPredicate implements ObjectSourcePlayerPredicate { instance; diff --git a/Mage.Sets/src/mage/cards/t/TravelersCloak.java b/Mage.Sets/src/mage/cards/t/TravelersCloak.java index afeaf1e4d0f..230c7c34567 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersCloak.java +++ b/Mage.Sets/src/mage/cards/t/TravelersCloak.java @@ -86,7 +86,7 @@ class TravelersCloakGainAbilityAttachedEffect extends GainAbilityAttachedEffect } } -enum TravelersCloakChosenSubtypePredicate implements ObjectSourcePlayerPredicate> { +enum TravelersCloakChosenSubtypePredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java b/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java index 1fde042523d..490dc55e22e 100644 --- a/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java +++ b/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java @@ -63,7 +63,7 @@ public final class UnlivingPsychopath extends CardImpl { } } -class UnlivingPsychopathPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate> { +class UnlivingPsychopathPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java index 2049a078224..2c6adc7e209 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java @@ -62,7 +62,7 @@ public final class VedalkenShackles extends CardImpl { } } -class PowerIslandPredicate implements ObjectSourcePlayerPredicate> { +class PowerIslandPredicate implements ObjectSourcePlayerPredicate { static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { diff --git a/Mage.Sets/src/mage/cards/v/VineGecko.java b/Mage.Sets/src/mage/cards/v/VineGecko.java index fbdf5006061..420e3b37194 100644 --- a/Mage.Sets/src/mage/cards/v/VineGecko.java +++ b/Mage.Sets/src/mage/cards/v/VineGecko.java @@ -67,7 +67,7 @@ public final class VineGecko extends CardImpl { } } -enum VineGeckoPredicate implements ObjectSourcePlayerPredicate> { +enum VineGeckoPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage.Sets/src/mage/cards/w/WickedAkuba.java b/Mage.Sets/src/mage/cards/w/WickedAkuba.java index da754eaa406..3f601af77f1 100644 --- a/Mage.Sets/src/mage/cards/w/WickedAkuba.java +++ b/Mage.Sets/src/mage/cards/w/WickedAkuba.java @@ -56,7 +56,7 @@ public final class WickedAkuba extends CardImpl { } } -class WickedAkubaPredicate implements ObjectSourcePlayerPredicate> { +class WickedAkubaPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java index 70a555f694d..13fd40aa40d 100644 --- a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java +++ b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java @@ -71,7 +71,7 @@ public final class YasovaDragonclaw extends CardImpl { } } -class YasovaDragonclawPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate> { +class YasovaDragonclawPowerLessThanSourcePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java index e7fbee0fb73..6cfe91e6e9e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MentorAbility.java @@ -45,7 +45,7 @@ public class MentorAbility extends AttacksTriggeredAbility { } -enum MentorAbilityPredicate implements ObjectSourcePlayerPredicate> { +enum MentorAbilityPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 7bdfac067b0..a81c3610c87 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -50,7 +50,7 @@ public enum TargetController { return controllerPredicate; } - public static class OwnerPredicate implements ObjectSourcePlayerPredicate> { + public static class OwnerPredicate implements ObjectSourcePlayerPredicate { private final TargetController targetOwner; @@ -99,7 +99,7 @@ public enum TargetController { } } - public static class PlayerPredicate implements ObjectSourcePlayerPredicate> { + public static class PlayerPredicate implements ObjectSourcePlayerPredicate { private final TargetController targetPlayer; @@ -143,7 +143,7 @@ public enum TargetController { } } - public static class ControllerPredicate implements ObjectSourcePlayerPredicate> { + public static class ControllerPredicate implements ObjectSourcePlayerPredicate { private final TargetController controller; diff --git a/Mage/src/main/java/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java index 331558337dd..bae5bcd3de9 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; public class FilterCard extends FilterObject { private static final long serialVersionUID = 1L; - protected List>> extraPredicates = new ArrayList<>(); + protected List> extraPredicates = new ArrayList<>(); public FilterCard() { super("card"); diff --git a/Mage/src/main/java/mage/filter/FilterPermanent.java b/Mage/src/main/java/mage/filter/FilterPermanent.java index 02248373d57..fa995d8a7dd 100644 --- a/Mage/src/main/java/mage/filter/FilterPermanent.java +++ b/Mage/src/main/java/mage/filter/FilterPermanent.java @@ -3,7 +3,6 @@ package mage.filter; import mage.constants.SubType; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.Predicates; import mage.game.Game; import mage.game.permanent.Permanent; @@ -18,7 +17,7 @@ import java.util.UUID; */ public class FilterPermanent extends FilterObject implements FilterInPlay { - protected List>> extraPredicates = new ArrayList<>(); + protected List> extraPredicates = new ArrayList<>(); public FilterPermanent() { super("permanent"); diff --git a/Mage/src/main/java/mage/filter/FilterPlayer.java b/Mage/src/main/java/mage/filter/FilterPlayer.java index d01aa89994b..7a4e0c726e1 100644 --- a/Mage/src/main/java/mage/filter/FilterPlayer.java +++ b/Mage/src/main/java/mage/filter/FilterPlayer.java @@ -16,7 +16,7 @@ import java.util.UUID; */ public class FilterPlayer extends FilterImpl { - protected List>> extraPredicates = new ArrayList<>(); + protected List> extraPredicates = new ArrayList<>(); public FilterPlayer() { this("player"); diff --git a/Mage/src/main/java/mage/filter/FilterStackObject.java b/Mage/src/main/java/mage/filter/FilterStackObject.java index d3c38ecd332..f6099773dd1 100644 --- a/Mage/src/main/java/mage/filter/FilterStackObject.java +++ b/Mage/src/main/java/mage/filter/FilterStackObject.java @@ -2,10 +2,8 @@ package mage.filter; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.Predicates; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import java.util.ArrayList; @@ -17,7 +15,7 @@ import java.util.UUID; */ public class FilterStackObject extends FilterObject { - protected List>> extraPredicates = new ArrayList<>(); + protected List> extraPredicates = new ArrayList<>(); public FilterStackObject() { this("spell or ability"); diff --git a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java index f6fc17d2481..b6b6d18be11 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java @@ -5,7 +5,6 @@ import mage.filter.FilterImpl; import mage.filter.FilterInPlay; import mage.filter.FilterPermanent; import mage.filter.FilterPlayer; -import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java index 73b3679062e..bd451e1112a 100644 --- a/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java @@ -5,5 +5,5 @@ package mage.filter.predicate; * @author North */ @FunctionalInterface -public interface ObjectSourcePlayerPredicate> extends Predicate { +public interface ObjectSourcePlayerPredicate extends Predicate> { } diff --git a/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java index 46661a3d88b..a39ce5110bd 100644 --- a/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java @@ -10,7 +10,7 @@ import mage.players.Player; * @author JayDi85 */ -public enum CardOnTopOfLibraryPredicate implements ObjectSourcePlayerPredicate> { +public enum CardOnTopOfLibraryPredicate implements ObjectSourcePlayerPredicate { YOUR, ANY; diff --git a/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java index a667d02abdf..a863a65c2fd 100644 --- a/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java @@ -8,7 +8,7 @@ import mage.game.Game; /** * @author TheElk801 */ -public enum DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate> { +public enum DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java index 39f3d86867d..6bc62682bca 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java @@ -10,7 +10,7 @@ import mage.game.Game; * * @author North */ -public class AnotherCardPredicate implements ObjectSourcePlayerPredicate> { +public class AnotherCardPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java index 1c104eb326e..a7ce4548085 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java @@ -9,7 +9,7 @@ import mage.game.Game; /** * @author North */ -public enum AnotherPredicate implements ObjectSourcePlayerPredicate> { +public enum AnotherPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenColorPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenColorPredicate.java index 77a920369f2..e0575ae97ce 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenColorPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenColorPredicate.java @@ -9,7 +9,7 @@ import mage.game.Game; /** * @author TheElk801 */ -public enum ChosenColorPredicate implements ObjectSourcePlayerPredicate> { +public enum ChosenColorPredicate implements ObjectSourcePlayerPredicate { TRUE(true), FALSE(false); private final boolean value; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java index ed2cdb4cca0..1ac3570785d 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java @@ -13,7 +13,7 @@ import mage.game.Game; * * @author LoneFox */ -public enum ChosenSubtypePredicate implements ObjectSourcePlayerPredicate> { +public enum ChosenSubtypePredicate implements ObjectSourcePlayerPredicate { TRUE(true), FALSE(false); private final boolean value; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java index 56f38b0d622..3beae46614e 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java @@ -10,7 +10,7 @@ import mage.game.Game; * @author LevelX2 */ -public class SharesColorWithSourcePredicate implements ObjectSourcePlayerPredicate> { +public class SharesColorWithSourcePredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java index 5510e927ea2..98eea077fd6 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java @@ -14,7 +14,7 @@ import mage.target.Target; * * @author jeffwadsworth */ -public class TargetsOnlyOnePlayerPredicate implements ObjectSourcePlayerPredicate> { +public class TargetsOnlyOnePlayerPredicate implements ObjectSourcePlayerPredicate { public TargetsOnlyOnePlayerPredicate() { } diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java index fd16aea94be..ccb8adea32e 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java @@ -15,7 +15,7 @@ import java.util.UUID; /** * @author LoneFox */ -public class TargetsPermanentPredicate implements ObjectSourcePlayerPredicate> { +public class TargetsPermanentPredicate implements ObjectSourcePlayerPredicate { private final FilterPermanent targetFilter; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java index e7bf4fe8a18..d5af2774f44 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java @@ -14,7 +14,7 @@ import mage.target.Target; * * @author jeffwadsworth */ -public class TargetsPlayerPredicate implements ObjectSourcePlayerPredicate> { +public class TargetsPlayerPredicate implements ObjectSourcePlayerPredicate { public TargetsPlayerPredicate() { } diff --git a/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java index 5383ed5731e..5ab2b2f8c4c 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java @@ -18,7 +18,7 @@ import mage.target.Target; * * @author LevelX2 */ -public class AnotherTargetPredicate implements ObjectSourcePlayerPredicate> { +public class AnotherTargetPredicate implements ObjectSourcePlayerPredicate { private final int targetTag; private final boolean crossModalCheck; diff --git a/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java index a7935bd77cd..4f3392da66b 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author LevelX2 */ -public class DamagedPlayerThisTurnPredicate implements ObjectSourcePlayerPredicate> { +public class DamagedPlayerThisTurnPredicate implements ObjectSourcePlayerPredicate { private final TargetController controller; diff --git a/Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java index dcb75de1053..e8f48308e1a 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java @@ -10,7 +10,7 @@ import mage.players.Player; * * @author LevelX2 */ -public class PlayerCanGainLifePredicate implements ObjectSourcePlayerPredicate> { +public class PlayerCanGainLifePredicate implements ObjectSourcePlayerPredicate { // public PlayerCanGainLifePredicate() { // } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherEnchantedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AnotherEnchantedPredicate.java index 75d946dde9f..12bbdd5edbc 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherEnchantedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AnotherEnchantedPredicate.java @@ -10,7 +10,7 @@ import mage.game.permanent.Permanent; * * @author LevelX2 */ -public class AnotherEnchantedPredicate implements ObjectSourcePlayerPredicate> { +public class AnotherEnchantedPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToControlledPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToControlledPermanentPredicate.java index 58b8aa6fe96..29f1b839a2f 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToControlledPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToControlledPermanentPredicate.java @@ -10,7 +10,7 @@ import mage.game.permanent.Permanent; * * @author North & L_J */ -public class AttachedToControlledPermanentPredicate implements ObjectSourcePlayerPredicate> { +public class AttachedToControlledPermanentPredicate implements ObjectSourcePlayerPredicate { @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/BlockingOrBlockedBySourcePredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingOrBlockedBySourcePredicate.java index 6b3048bbf78..4e5af9d9dd6 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/BlockingOrBlockedBySourcePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingOrBlockedBySourcePredicate.java @@ -11,7 +11,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public enum BlockingOrBlockedBySourcePredicate implements ObjectSourcePlayerPredicate> { +public enum BlockingOrBlockedBySourcePredicate implements ObjectSourcePlayerPredicate { BLOCKING, BLOCKED_BY, EITHER; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java index 89f43c2677f..d6cdf5e23ae 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java @@ -8,7 +8,7 @@ import mage.game.permanent.Permanent; /** * @author TheElk801 */ -public enum DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate> { +public enum DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate { instance; @Override diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/GreatestPowerControlledPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/GreatestPowerControlledPredicate.java index 0b6e3d90e93..e2a83ef107c 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/GreatestPowerControlledPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/GreatestPowerControlledPredicate.java @@ -9,7 +9,7 @@ import mage.game.permanent.Permanent; /** * @author jeffwadsworth */ -public enum GreatestPowerControlledPredicate implements ObjectSourcePlayerPredicate> { +public enum GreatestPowerControlledPredicate implements ObjectSourcePlayerPredicate { instance; @Override