From 2dfde7f41a3b3d61473b7ad078f5196c0910da44 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 21 Feb 2021 08:00:21 +0400 Subject: [PATCH] Refactor: correct predicate packages --- .../mage/client/deckeditor/CardSelector.java | 4 +-- .../src/mage/cards/a/AcademyResearchers.java | 2 +- .../src/mage/cards/a/AcclaimedContender.java | 2 +- .../src/mage/cards/a/AcidSpewerDragon.java | 2 +- .../src/mage/cards/a/AdarkarValkyrie.java | 3 +- .../src/mage/cards/a/AdmonitionAngel.java | 2 +- Mage.Sets/src/mage/cards/a/AegisAngel.java | 2 +- .../src/mage/cards/a/AegisAutomaton.java | 2 +- Mage.Sets/src/mage/cards/a/AerialGuide.java | 2 +- .../src/mage/cards/a/AetherbornMarauder.java | 2 +- .../src/mage/cards/a/AethersquallAncient.java | 2 +- .../src/mage/cards/a/AhnCropInvader.java | 2 +- .../src/mage/cards/a/AjaniSteadfast.java | 2 +- .../mage/cards/a/AjaniTheGreathearted.java | 2 +- .../src/mage/cards/a/AjaniUnyielding.java | 2 +- .../src/mage/cards/a/AkroanConscriptor.java | 2 +- .../mage/cards/a/AlharuSolemnRitualist.java | 2 +- .../src/mage/cards/a/AlpineHoundmaster.java | 2 +- .../mage/cards/a/AlrundGodOfTheCosmos.java | 2 +- .../src/mage/cards/a/AltarOfTheBrood.java | 2 +- .../src/mage/cards/a/AmarethTheLustrous.java | 2 +- Mage.Sets/src/mage/cards/a/AmbushKrotiq.java | 2 +- .../mage/cards/a/AminatouTheFateshifter.java | 2 +- Mage.Sets/src/mage/cards/a/AnabaAncestor.java | 2 +- .../mage/cards/a/AnafenzaKinTreeSpirit.java | 2 +- .../src/mage/cards/a/AnafenzaTheForemost.java | 2 +- .../src/mage/cards/a/AnaraWolvidFamiliar.java | 2 +- Mage.Sets/src/mage/cards/a/AncestralMask.java | 2 +- .../src/mage/cards/a/AngelOfCondemnation.java | 2 +- .../src/mage/cards/a/AngelOfSerenity.java | 2 +- .../src/mage/cards/a/AngelicCaptain.java | 2 +- .../src/mage/cards/a/ApocalypseChime.java | 2 +- .../src/mage/cards/a/ApocalypseDemon.java | 2 +- .../src/mage/cards/a/ApothecaryGeist.java | 2 +- .../mage/cards/a/ArahboRoarOfTheWorld.java | 2 +- .../src/mage/cards/a/ArashinForemost.java | 2 +- Mage.Sets/src/mage/cards/a/ArcTrail.java | 2 +- .../src/mage/cards/a/ArcboundCrusher.java | 2 +- .../src/mage/cards/a/AshenmoorCohort.java | 2 +- .../src/mage/cards/a/AthreosGodOfPassage.java | 3 +- .../src/mage/cards/a/AthreosShroudVeiled.java | 2 +- .../src/mage/cards/a/AttendedHealer.java | 2 +- Mage.Sets/src/mage/cards/a/AtzocanArcher.java | 2 +- Mage.Sets/src/mage/cards/a/AuraGraft.java | 2 +- .../src/mage/cards/a/AuratouchedMage.java | 2 +- .../src/mage/cards/a/AuriokChampion.java | 2 +- Mage.Sets/src/mage/cards/a/Aurochs.java | 2 +- Mage.Sets/src/mage/cards/a/AurochsHerd.java | 2 +- .../src/mage/cards/a/AuroraChampion.java | 2 +- .../src/mage/cards/a/AvacynGuardianAngel.java | 2 +- .../src/mage/cards/a/AvacynThePurifier.java | 2 +- .../src/mage/cards/a/AvatarOfTheResolute.java | 2 +- Mage.Sets/src/mage/cards/a/AvenSoulgazer.java | 2 +- .../src/mage/cards/a/AvengingHuntbonder.java | 2 +- .../src/mage/cards/a/AviaryMechanic.java | 2 +- Mage.Sets/src/mage/cards/a/AvoidFate.java | 2 +- .../mage/cards/a/AyaraFirstOfLocthwain.java | 2 +- Mage.Sets/src/mage/cards/a/AyeshaTanaka.java | 2 +- .../mage/cards/a/AyulaQueenAmongBears.java | 2 +- .../src/mage/cards/b/BallynockCohort.java | 2 +- .../src/mage/cards/b/BalthorTheStout.java | 2 +- Mage.Sets/src/mage/cards/b/BandTogether.java | 2 +- Mage.Sets/src/mage/cards/b/BantSureblade.java | 2 +- Mage.Sets/src/mage/cards/b/BaronSengir.java | 2 +- Mage.Sets/src/mage/cards/b/BarrageTyrant.java | 2 +- Mage.Sets/src/mage/cards/b/BarrenGlory.java | 2 +- .../mage/cards/b/BarrinTolarianArchmage.java | 2 +- Mage.Sets/src/mage/cards/b/BasrisAcolyte.java | 2 +- .../src/mage/cards/b/BastionProtector.java | 2 +- Mage.Sets/src/mage/cards/b/BazaarKrovod.java | 2 +- .../src/mage/cards/b/BellowingAegisaur.java | 2 +- .../src/mage/cards/b/BelltollDragon.java | 2 +- Mage.Sets/src/mage/cards/b/BindingMummy.java | 2 +- Mage.Sets/src/mage/cards/b/Bioshift.java | 2 +- .../src/mage/cards/b/BlackOakOfOdunos.java | 2 +- .../src/mage/cards/b/BlindSpotGiant.java | 2 +- Mage.Sets/src/mage/cards/b/BlizzardStrix.java | 2 +- .../src/mage/cards/b/BloodChinFanatic.java | 2 +- Mage.Sets/src/mage/cards/b/BloodFeud.java | 2 +- Mage.Sets/src/mage/cards/b/Bloodbriar.java | 2 +- .../src/mage/cards/b/BloodlinePretender.java | 2 +- .../mage/cards/b/BloodmistInfiltrator.java | 2 +- .../src/mage/cards/b/BloodswornSteward.java | 2 +- .../src/mage/cards/b/BogardanDragonheart.java | 2 +- Mage.Sets/src/mage/cards/b/BoltBend.java | 2 +- .../src/mage/cards/b/BoltwingMarauder.java | 2 +- Mage.Sets/src/mage/cards/b/BondOfPassion.java | 2 +- .../src/mage/cards/b/BoneyardMycodrax.java | 2 +- .../src/mage/cards/b/BorderlandBehemoth.java | 2 +- .../src/mage/cards/b/BoundByMoonsilver.java | 2 +- .../src/mage/cards/b/BrambleSovereign.java | 2 +- Mage.Sets/src/mage/cards/b/BrashTaunter.java | 2 +- .../src/mage/cards/b/BreachingHippocamp.java | 2 +- Mage.Sets/src/mage/cards/b/BreakOpen.java | 2 +- .../src/mage/cards/b/BriarberryCohort.java | 2 +- Mage.Sets/src/mage/cards/b/BrionStoutarm.java | 2 +- Mage.Sets/src/mage/cards/b/BronzeHorse.java | 2 +- Mage.Sets/src/mage/cards/b/BronzebeakMoa.java | 2 +- .../src/mage/cards/b/BroodingSaurian.java | 2 +- .../src/mage/cards/b/BrothersYamazaki.java | 2 +- Mage.Sets/src/mage/cards/b/BrownOuphe.java | 2 +- .../mage/cards/b/BrunaLightOfAlabaster.java | 4 +-- Mage.Sets/src/mage/cards/b/BullAurochs.java | 2 +- .../src/mage/cards/b/BullRushBruiser.java | 2 +- .../src/mage/cards/b/BurningYardTrainer.java | 2 +- .../src/mage/cards/b/BushmeatPoacher.java | 2 +- .../src/mage/cards/c/CallToTheKindred.java | 2 +- .../src/mage/cards/c/CaptainOfTheMists.java | 2 +- Mage.Sets/src/mage/cards/c/CarnifexDemon.java | 2 +- Mage.Sets/src/mage/cards/c/Carom.java | 2 +- .../src/mage/cards/c/CatacombSifter.java | 2 +- .../src/mage/cards/c/CavalierOfNight.java | 2 +- .../src/mage/cards/c/CavalierOfThorns.java | 2 +- Mage.Sets/src/mage/cards/c/CennsHeir.java | 2 +- .../src/mage/cards/c/ChampionOfLambholt.java | 2 +- .../mage/cards/c/ChampionOfStraySouls.java | 2 +- .../src/mage/cards/c/ChampionOfTheParish.java | 2 +- Mage.Sets/src/mage/cards/c/ChaosMaw.java | 2 +- Mage.Sets/src/mage/cards/c/CharmedStray.java | 2 +- .../src/mage/cards/c/CharmingPrince.java | 2 +- .../src/mage/cards/c/CherishedHatchling.java | 2 +- Mage.Sets/src/mage/cards/c/Chewbacca.java | 2 +- .../src/mage/cards/c/ChewbaccaTheBeast.java | 2 +- Mage.Sets/src/mage/cards/c/ChiefChirpa.java | 2 +- Mage.Sets/src/mage/cards/c/CinderGiant.java | 2 +- Mage.Sets/src/mage/cards/c/ClashOfTitans.java | 2 +- .../src/mage/cards/c/ClericOfLifesBond.java | 2 +- Mage.Sets/src/mage/cards/c/CoastalWizard.java | 2 +- .../src/mage/cards/c/CommandersPlate.java | 2 +- Mage.Sets/src/mage/cards/c/ConeOfFlame.java | 2 +- Mage.Sets/src/mage/cards/c/Confound.java | 2 +- .../src/mage/cards/c/ConsecratedByBlood.java | 2 +- .../src/mage/cards/c/ConsulsShieldguard.java | 2 +- .../src/mage/cards/c/ConsumeStrength.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseKnight.java | 2 +- .../src/mage/cards/c/CourtStreetDenizen.java | 2 +- .../src/mage/cards/c/CrabappleCohort.java | 2 +- .../src/mage/cards/c/CrimsonHonorGuard.java | 2 +- .../src/mage/cards/c/CrownOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/c/CryptChampion.java | 2 +- Mage.Sets/src/mage/cards/c/Cryptoplasm.java | 2 +- .../mage/cards/c/CrystallineResonance.java | 2 +- .../src/mage/cards/c/CunningGeysermage.java | 2 +- .../src/mage/cards/c/CustodiSoulbinders.java | 2 +- .../src/mage/cards/c/CytoplastRootKin.java | 2 +- .../src/mage/cards/d/DarkslickShores.java | 2 +- .../src/mage/cards/d/DauntlessBodyguard.java | 2 +- .../src/mage/cards/d/DauntlessDourbark.java | 2 +- .../src/mage/cards/d/DawnbreakReclaimer.java | 2 +- Mage.Sets/src/mage/cards/d/Deadshot.java | 2 +- .../src/mage/cards/d/DeathbringerRegent.java | 2 +- .../src/mage/cards/d/DecoratedChampion.java | 2 +- Mage.Sets/src/mage/cards/d/DeeprootElite.java | 2 +- .../src/mage/cards/d/DefiantGreatmaw.java | 2 +- Mage.Sets/src/mage/cards/d/Deflection.java | 2 +- .../src/mage/cards/d/DemonicTaskmaster.java | 2 +- .../src/mage/cards/d/DemonlordOfAshmouth.java | 2 +- .../src/mage/cards/d/DenizenOfTheDeep.java | 2 +- .../src/mage/cards/d/DeputyOfAcquittals.java | 2 +- .../src/mage/cards/d/DesolationGiant.java | 2 +- .../src/mage/cards/d/DiluvianPrimordial.java | 3 +- .../src/mage/cards/d/DimensionalBreach.java | 2 +- .../src/mage/cards/d/DiplomaticEscort.java | 2 +- .../src/mage/cards/d/DireFleetCaptain.java | 2 +- .../mage/cards/d/DissensionInTheRanks.java | 2 +- .../src/mage/cards/d/DominatorDrone.java | 2 +- Mage.Sets/src/mage/cards/d/DomriRade.java | 2 +- Mage.Sets/src/mage/cards/d/Dracoplasm.java | 2 +- .../mage/cards/d/DrakusethMawOfFlames.java | 2 +- .../src/mage/cards/d/DreadCacodemon.java | 2 +- Mage.Sets/src/mage/cards/d/Dreadmalkin.java | 2 +- Mage.Sets/src/mage/cards/d/DreamChisel.java | 2 +- .../src/mage/cards/d/DreamcallerSiren.java | 2 +- Mage.Sets/src/mage/cards/d/DrillSkimmer.java | 2 +- .../src/mage/cards/d/DrogskolCavalry.java | 2 +- .../src/mage/cards/d/DroolingGroodion.java | 2 +- Mage.Sets/src/mage/cards/d/DustStalker.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenMine.java | 2 +- Mage.Sets/src/mage/cards/d/DwynensElite.java | 2 +- Mage.Sets/src/mage/cards/e/EaterOfHope.java | 2 +- Mage.Sets/src/mage/cards/e/EddytrailHawk.java | 2 +- .../src/mage/cards/e/EfreetWeaponmaster.java | 3 +- .../src/mage/cards/e/EldraziAggressor.java | 2 +- .../src/mage/cards/e/EldraziDisplacer.java | 3 +- Mage.Sets/src/mage/cards/e/EldraziMimic.java | 2 +- .../src/mage/cards/e/ElshaOfTheInfinite.java | 2 +- .../src/mage/cards/e/ElvishVanguard.java | 2 +- .../src/mage/cards/e/ElvishWarmaster.java | 2 +- .../src/mage/cards/e/EmielTheBlessed.java | 2 +- .../src/mage/cards/e/EmrakulsEvangel.java | 2 +- .../mage/cards/e/EnchantmentAlteration.java | 2 +- Mage.Sets/src/mage/cards/e/EndemicPlague.java | 2 +- .../mage/cards/e/EnigmaticIncarnation.java | 2 +- .../src/mage/cards/e/EnslavedHorror.java | 2 +- .../src/mage/cards/e/ErebosBleakHearted.java | 2 +- .../mage/cards/e/EsiorWardwingFamiliar.java | 2 +- .../src/mage/cards/e/EsperStormblade.java | 2 +- Mage.Sets/src/mage/cards/e/EssenceWarden.java | 2 +- .../src/mage/cards/e/EstridTheMasked.java | 2 +- Mage.Sets/src/mage/cards/e/Evershrike.java | 2 +- .../src/mage/cards/e/EverythingamajigB.java | 2 +- .../mage/cards/e/ExavaRakdosBloodWitch.java | 2 +- Mage.Sets/src/mage/cards/e/Exhume.java | 2 +- .../src/mage/cards/e/ExpeditionChampion.java | 2 +- .../src/mage/cards/e/ExpeditionDiviner.java | 2 +- .../src/mage/cards/e/ExpeditionHealer.java | 2 +- .../src/mage/cards/e/ExpeditionSkulker.java | 2 +- .../src/mage/cards/e/ExperimentKraj.java | 2 +- Mage.Sets/src/mage/cards/e/Expropriate.java | 2 +- .../src/mage/cards/e/ExtractorDemon.java | 2 +- .../src/mage/cards/e/ExtricatorOfSin.java | 2 +- .../src/mage/cards/e/EzuriClawOfProgress.java | 2 +- .../src/mage/cards/f/FacelessButcher.java | 4 +-- .../src/mage/cards/f/FacelessDevourer.java | 4 +-- .../src/mage/cards/f/FaerieImpostor.java | 2 +- .../src/mage/cards/f/FaerieMiscreant.java | 2 +- .../src/mage/cards/f/FallOfTheHammer.java | 2 +- .../cards/f/FalthisShadowcatFamiliar.java | 2 +- Mage.Sets/src/mage/cards/f/FangOfThePack.java | 2 +- Mage.Sets/src/mage/cards/f/FateTransfer.java | 2 +- Mage.Sets/src/mage/cards/f/Fatestitcher.java | 2 +- .../src/mage/cards/f/FathomFleetBoarder.java | 2 +- .../src/mage/cards/f/FathomFleetCaptain.java | 2 +- .../src/mage/cards/f/FelhideBrawler.java | 2 +- .../src/mage/cards/f/FelhideSpiritbinder.java | 2 +- .../src/mage/cards/f/FelidarGuardian.java | 3 +- Mage.Sets/src/mage/cards/f/FeralContest.java | 2 +- .../src/mage/cards/f/FerventChampion.java | 2 +- Mage.Sets/src/mage/cards/f/Fettergeist.java | 2 +- Mage.Sets/src/mage/cards/f/FiendArtisan.java | 2 +- Mage.Sets/src/mage/cards/f/FiendHunter.java | 2 +- Mage.Sets/src/mage/cards/f/FireAnts.java | 2 +- Mage.Sets/src/mage/cards/f/FirefluxSquad.java | 2 +- .../src/mage/cards/f/FlameKinWarScout.java | 2 +- .../src/mage/cards/f/FlamekinHerald.java | 2 +- .../src/mage/cards/f/FlamerushRider.java | 2 +- Mage.Sets/src/mage/cards/f/FlayerDrone.java | 2 +- Mage.Sets/src/mage/cards/f/FleshmadSteed.java | 2 +- Mage.Sets/src/mage/cards/f/Flickerwisp.java | 2 +- .../cards/f/ForerunnerOfTheCoalition.java | 2 +- .../mage/cards/f/ForerunnerOfTheHeralds.java | 2 +- .../mage/cards/f/ForerunnerOfTheLegion.java | 2 +- Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java | 2 +- .../src/mage/cards/f/ForgottenAncient.java | 2 +- Mage.Sets/src/mage/cards/f/ForgottenLore.java | 2 +- .../mage/cards/f/FoundryStreetDenizen.java | 2 +- .../src/mage/cards/g/GalepowderMage.java | 2 +- .../src/mage/cards/g/GargantuanGorilla.java | 2 +- .../src/mage/cards/g/GarrukApexPredator.java | 2 +- .../src/mage/cards/g/GarrukSavageHerald.java | 2 +- .../src/mage/cards/g/GarruksPackleader.java | 2 +- .../src/mage/cards/g/GavonyUnhallowed.java | 2 +- .../src/mage/cards/g/GhituJourneymage.java | 2 +- .../src/mage/cards/g/GideonBlackblade.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfDoom.java | 2 +- .../src/mage/cards/g/GingerbreadCabin.java | 2 +- Mage.Sets/src/mage/cards/g/GiverOfRunes.java | 2 +- .../mage/cards/g/GladewalkerRitualist.java | 2 +- Mage.Sets/src/mage/cards/g/GlassdustHulk.java | 2 +- Mage.Sets/src/mage/cards/g/GlazeFiend.java | 2 +- .../src/mage/cards/g/GlimmerpointStag.java | 2 +- Mage.Sets/src/mage/cards/g/GlintHawkIdol.java | 2 +- Mage.Sets/src/mage/cards/g/GloryBearers.java | 2 +- .../src/mage/cards/g/GluttonousTroll.java | 2 +- .../mage/cards/g/GlyphOfReincarnation.java | 2 +- .../src/mage/cards/g/GoblinPiledriver.java | 2 +- .../src/mage/cards/g/GoblinRabblemaster.java | 2 +- .../src/mage/cards/g/GoblinSmuggler.java | 2 +- .../src/mage/cards/g/GodEternalBontu.java | 2 +- Mage.Sets/src/mage/cards/g/GodheadOfAwe.java | 2 +- .../src/mage/cards/g/GodoBanditWarlord.java | 2 +- .../src/mage/cards/g/GoldenGuardian.java | 3 +- .../src/mage/cards/g/GoldnightRedeemer.java | 2 +- .../src/mage/cards/g/GolgothianSylex.java | 2 +- .../mage/cards/g/GrakmawSkyclaveRavager.java | 2 +- .../src/mage/cards/g/GravebreakerLamia.java | 2 +- .../src/mage/cards/g/GravenAbomination.java | 2 +- .../src/mage/cards/g/GravenDominator.java | 2 +- Mage.Sets/src/mage/cards/g/Gravestorm.java | 2 +- .../src/mage/cards/g/GravityNegator.java | 2 +- Mage.Sets/src/mage/cards/g/GrimHaruspex.java | 2 +- Mage.Sets/src/mage/cards/g/GrimPoppet.java | 2 +- .../src/mage/cards/g/GrixisGrimblade.java | 2 +- .../mage/cards/g/GrothamaAllDevouring.java | 2 +- .../src/mage/cards/g/GruulBeastmaster.java | 2 +- .../src/mage/cards/g/GuardianProject.java | 2 +- .../mage/cards/g/GuardianShieldBearer.java | 2 +- .../src/mage/cards/g/GuardiansOfKoilos.java | 2 +- .../src/mage/cards/h/HakimLoreweaver.java | 2 +- Mage.Sets/src/mage/cards/h/Halfdane.java | 2 +- .../src/mage/cards/h/HanSoloScrumrat.java | 2 +- .../src/mage/cards/h/HarbingerOfTheHunt.java | 2 +- .../src/mage/cards/h/HarmonicConvergence.java | 2 +- .../src/mage/cards/h/HarvesterOfSouls.java | 2 +- Mage.Sets/src/mage/cards/h/HavengulSkaab.java | 3 +- .../src/mage/cards/h/HeadstrongBrute.java | 2 +- Mage.Sets/src/mage/cards/h/HeavenlyQilin.java | 2 +- .../src/mage/cards/h/HeliodSunCrowned.java | 2 +- .../src/mage/cards/h/HellkiteCourser.java | 2 +- .../src/mage/cards/h/HeraldOfDromoka.java | 2 +- .../src/mage/cards/h/HeraldOfLeshrac.java | 2 +- .../src/mage/cards/h/HeraldOfTheSun.java | 2 +- Mage.Sets/src/mage/cards/h/HerdGnarr.java | 2 +- .../src/mage/cards/h/HerdchaserDragon.java | 2 +- .../mage/cards/h/HighSentinelsOfArashin.java | 2 +- Mage.Sets/src/mage/cards/h/HisokasGuard.java | 2 +- Mage.Sets/src/mage/cards/h/HomewardPath.java | 2 +- Mage.Sets/src/mage/cards/h/HostageTaker.java | 2 +- Mage.Sets/src/mage/cards/h/HowlpackWolf.java | 2 +- Mage.Sets/src/mage/cards/h/HurkylsRecall.java | 2 +- .../src/mage/cards/h/HydromorphGuardian.java | 2 +- .../src/mage/cards/h/HydromorphGull.java | 2 +- .../cards/i/IbHalfheartGoblinTactician.java | 2 +- Mage.Sets/src/mage/cards/i/IceFangCoatl.java | 3 +- .../src/mage/cards/i/IcebergCancrix.java | 2 +- .../src/mage/cards/i/IcefeatherAven.java | 2 +- Mage.Sets/src/mage/cards/i/IdyllicGrange.java | 2 +- .../src/mage/cards/i/ImpassionedOrator.java | 2 +- Mage.Sets/src/mage/cards/i/ImpelledGiant.java | 2 +- .../src/mage/cards/i/ImperialAerosaur.java | 2 +- Mage.Sets/src/mage/cards/i/ImpsMischief.java | 2 +- .../mage/cards/i/InallaArchmageRitualist.java | 2 +- .../src/mage/cards/i/IncrementalBlight.java | 2 +- .../src/mage/cards/i/IncrementalGrowth.java | 2 +- .../src/mage/cards/i/InkEyesServantOfOni.java | 2 +- Mage.Sets/src/mage/cards/i/InspireAwe.java | 2 +- .../src/mage/cards/i/InspiringCommander.java | 2 +- Mage.Sets/src/mage/cards/i/Intervene.java | 2 +- .../src/mage/cards/i/IntrepidProvisioner.java | 2 +- .../src/mage/cards/i/InvasiveSpecies.java | 2 +- .../src/mage/cards/i/IridescentDrake.java | 2 +- .../src/mage/cards/i/IvyLaneDenizen.java | 2 +- .../mage/cards/i/IxidorRealitySculptor.java | 2 +- Mage.Sets/src/mage/cards/i/Ixidron.java | 4 +-- .../mage/cards/j/JaceTheLivingGuildpact.java | 2 +- Mage.Sets/src/mage/cards/j/JadeBearer.java | 2 +- .../src/mage/cards/j/JediInstructor.java | 2 +- Mage.Sets/src/mage/cards/j/JediSentinel.java | 2 +- .../src/mage/cards/j/JeeringInstigator.java | 2 +- .../src/mage/cards/j/JeskaiBarricade.java | 2 +- Mage.Sets/src/mage/cards/j/JeweledLotus.java | 2 +- Mage.Sets/src/mage/cards/j/Jilt.java | 2 +- .../src/mage/cards/j/JoragaAuxiliary.java | 2 +- .../src/mage/cards/j/JoragaWarcaller.java | 2 +- .../src/mage/cards/j/JourneyToNowhere.java | 2 +- .../src/mage/cards/j/JubilantMascot.java | 2 +- Mage.Sets/src/mage/cards/j/JundHackblade.java | 2 +- .../src/mage/cards/j/JuniperOrderRanger.java | 2 +- .../src/mage/cards/j/JwariShapeshifter.java | 2 +- .../mage/cards/k/KadenaSlinkingSorcerer.java | 4 +-- .../mage/cards/k/KaheeraTheOrphanguard.java | 2 +- .../mage/cards/k/KalitasTraitorOfGhet.java | 2 +- .../src/mage/cards/k/KangeeAerieKeeper.java | 2 +- .../src/mage/cards/k/KarametrasBlessing.java | 2 +- .../mage/cards/k/KarrthusTyrantOfJund.java | 2 +- Mage.Sets/src/mage/cards/k/KavuMauler.java | 2 +- Mage.Sets/src/mage/cards/k/KavuMonarch.java | 2 +- .../src/mage/cards/k/KederektLeviathan.java | 2 +- .../mage/cards/k/KedissEmberclawFamiliar.java | 2 +- Mage.Sets/src/mage/cards/k/KeepSafe.java | 2 +- .../src/mage/cards/k/KeeperOfTheLens.java | 2 +- .../mage/cards/k/KelethSunmaneFamiliar.java | 2 +- .../src/mage/cards/k/KerugaTheMacrosage.java | 2 +- .../mage/cards/k/KeskitTheFleshSculptor.java | 2 +- Mage.Sets/src/mage/cards/k/KiAdiMundi.java | 2 +- .../src/mage/cards/k/KiorasFollower.java | 2 +- .../src/mage/cards/k/KitesailSkirmisher.java | 2 +- Mage.Sets/src/mage/cards/k/KitsuneMystic.java | 2 +- .../src/mage/cards/k/KnightExemplar.java | 2 +- .../mage/cards/k/KnightOfTheLastBreath.java | 2 +- .../src/mage/cards/k/KodamaOfTheEastTree.java | 2 +- .../src/mage/cards/k/KollTheForgemaster.java | 2 +- .../src/mage/cards/k/KomaCosmosSerpent.java | 2 +- Mage.Sets/src/mage/cards/k/KorChant.java | 2 +- Mage.Sets/src/mage/cards/k/KorDirge.java | 2 +- .../mage/cards/k/KorvoldFaeCursedKing.java | 2 +- .../mage/cards/k/KumenaTyrantOfOrazca.java | 2 +- Mage.Sets/src/mage/cards/l/LadySun.java | 2 +- .../mage/cards/l/LamplighterOfSelhoff.java | 2 +- Mage.Sets/src/mage/cards/l/LastLaugh.java | 2 +- .../src/mage/cards/l/LathlissDragonQueen.java | 2 +- .../src/mage/cards/l/LeadershipVacuum.java | 2 +- Mage.Sets/src/mage/cards/l/LeechBonder.java | 2 +- Mage.Sets/src/mage/cards/l/LeechingBite.java | 2 +- Mage.Sets/src/mage/cards/l/Legerdemain.java | 2 +- .../src/mage/cards/l/LegionGuildmage.java | 2 +- Mage.Sets/src/mage/cards/l/LensOfClarity.java | 2 +- Mage.Sets/src/mage/cards/l/LichsMirror.java | 2 +- Mage.Sets/src/mage/cards/l/LiegeOfThePit.java | 2 +- .../mage/cards/l/LilianaHereticalHealer.java | 2 +- Mage.Sets/src/mage/cards/l/LivingTotem.java | 2 +- .../mage/cards/l/LivioOathswornSentinel.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfThePit.java | 2 +- .../src/mage/cards/l/LumberingBattlement.java | 2 +- Mage.Sets/src/mage/cards/m/MadAuntie.java | 2 +- Mage.Sets/src/mage/cards/m/MagetaTheLion.java | 2 +- .../src/mage/cards/m/MagisterOfWorth.java | 2 +- .../src/mage/cards/m/MagusOfTheOrder.java | 2 +- .../src/mage/cards/m/MajesticHeliopterus.java | 2 +- .../src/mage/cards/m/ManascapeRefractor.java | 2 +- Mage.Sets/src/mage/cards/m/ManifoldKey.java | 2 +- .../mage/cards/m/MaraudingBoneslasher.java | 2 +- .../src/mage/cards/m/MaraudingRaptor.java | 2 +- .../src/mage/cards/m/MarkovCrusader.java | 2 +- .../src/mage/cards/m/MartonStromgald.java | 2 +- .../src/mage/cards/m/MarwynTheNurturer.java | 2 +- .../src/mage/cards/m/MausoleumHarpy.java | 2 +- .../src/mage/cards/m/MausoleumTurnkey.java | 2 +- .../src/mage/cards/m/MausoleumWanderer.java | 2 +- Mage.Sets/src/mage/cards/m/MemoryTheft.java | 2 +- .../src/mage/cards/m/MentorOfTheMeek.java | 2 +- .../src/mage/cards/m/MerenOfClanNelToth.java | 2 +- Mage.Sets/src/mage/cards/m/MidnightGuard.java | 2 +- .../src/mage/cards/m/MikaeusTheLunarch.java | 2 +- .../src/mage/cards/m/MinionOfLeshrac.java | 2 +- Mage.Sets/src/mage/cards/m/Mirrorworks.java | 2 +- Mage.Sets/src/mage/cards/m/Misdirection.java | 2 +- .../src/mage/cards/m/MistfordRiverTurtle.java | 2 +- .../src/mage/cards/m/MobileGarrison.java | 2 +- Mage.Sets/src/mage/cards/m/MoggBombers.java | 2 +- Mage.Sets/src/mage/cards/m/MoggSquad.java | 2 +- Mage.Sets/src/mage/cards/m/MonstrousStep.java | 2 +- .../src/mage/cards/m/MorkrutNecropod.java | 2 +- .../src/mage/cards/m/MossbridgeTroll.java | 2 +- Mage.Sets/src/mage/cards/m/MuckDrubb.java | 2 +- .../src/mage/cards/m/MudbrawlerCohort.java | 2 +- .../src/mage/cards/m/MummyParamount.java | 2 +- .../src/mage/cards/m/MuxusGoblinGrandee.java | 2 +- .../mage/cards/m/MyojinOfCleansingFire.java | 2 +- .../src/mage/cards/m/MysticSanctuary.java | 2 +- Mage.Sets/src/mage/cards/m/MythUnbound.java | 2 +- Mage.Sets/src/mage/cards/n/N1Starfighter.java | 2 +- Mage.Sets/src/mage/cards/n/NayaHushblade.java | 2 +- .../src/mage/cards/n/NebulonBFrigate.java | 2 +- .../src/mage/cards/n/NephaliaSmuggler.java | 2 +- .../src/mage/cards/n/NessianHornbeetle.java | 2 +- .../src/mage/cards/n/NessianWildsRavager.java | 2 +- .../src/mage/cards/n/NestingGrounds.java | 2 +- .../mage/cards/n/NiambiEsteemedSpeaker.java | 2 +- .../src/mage/cards/n/NicolBolasDragonGod.java | 2 +- .../src/mage/cards/n/NightmareShepherd.java | 2 +- .../src/mage/cards/n/NikaraLairScavenger.java | 2 +- .../src/mage/cards/n/NikoDefiesDestiny.java | 2 +- .../src/mage/cards/n/NinthBridgePatrol.java | 2 +- Mage.Sets/src/mage/cards/n/NosyGoblin.java | 2 +- .../src/mage/cards/n/NotOfThisWorld.java | 2 +- Mage.Sets/src/mage/cards/n/NovablastWurm.java | 2 +- .../src/mage/cards/n/NoxiousGearhulk.java | 2 +- Mage.Sets/src/mage/cards/n/NyxHerald.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfGhouls.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfLimDul.java | 3 +- Mage.Sets/src/mage/cards/o/OathOfTeferi.java | 2 +- Mage.Sets/src/mage/cards/o/OblivionRing.java | 3 +- Mage.Sets/src/mage/cards/o/OblivionSower.java | 4 +-- .../src/mage/cards/o/ObscuringAether.java | 2 +- .../src/mage/cards/o/OgreBattledriver.java | 2 +- Mage.Sets/src/mage/cards/o/OgreErrant.java | 2 +- Mage.Sets/src/mage/cards/o/OgreSlumlord.java | 2 +- .../src/mage/cards/o/OliviaVoldaren.java | 2 +- Mage.Sets/src/mage/cards/o/Opalescence.java | 2 +- Mage.Sets/src/mage/cards/o/OrcGeneral.java | 2 +- Mage.Sets/src/mage/cards/o/OrcSureshot.java | 2 +- Mage.Sets/src/mage/cards/o/OrchardWarden.java | 2 +- Mage.Sets/src/mage/cards/o/OupheVandals.java | 2 +- .../src/mage/cards/o/OuterRimSlaver.java | 2 +- .../src/mage/cards/o/OvergrowthElemental.java | 2 +- Mage.Sets/src/mage/cards/p/Paleoloth.java | 2 +- .../mage/cards/p/ParagonOfEternalWilds.java | 2 +- .../mage/cards/p/ParagonOfFierceDefiance.java | 2 +- .../mage/cards/p/ParagonOfGatheringMists.java | 2 +- .../src/mage/cards/p/ParagonOfNewDawns.java | 2 +- .../src/mage/cards/p/ParagonOfOpenGraves.java | 2 +- Mage.Sets/src/mage/cards/p/PashalikMons.java | 2 +- .../src/mage/cards/p/PeacewalkerColossus.java | 2 +- .../src/mage/cards/p/PegasusCourser.java | 2 +- Mage.Sets/src/mage/cards/p/PhaseDolphin.java | 2 +- .../mage/cards/p/PhyrexianDreadnought.java | 2 +- Mage.Sets/src/mage/cards/p/PiousEvangel.java | 2 +- Mage.Sets/src/mage/cards/p/PitFight.java | 2 +- .../src/mage/cards/p/PitilessPlunderer.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueBelcher.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueReaver.java | 2 +- .../src/mage/cards/p/PoisonbellyOgre.java | 2 +- .../src/mage/cards/p/PolukranosUnchained.java | 2 +- .../src/mage/cards/p/PontiffOfBlight.java | 2 +- .../src/mage/cards/p/PrideOfTheClouds.java | 2 +- .../src/mage/cards/p/PrideSovereign.java | 2 +- .../mage/cards/p/PriestOfForgottenGods.java | 2 +- .../src/mage/cards/p/PrimalForcemage.java | 2 +- .../src/mage/cards/p/PrimalWhisperer.java | 2 +- .../src/mage/cards/p/PrimevalProtector.java | 2 +- .../src/mage/cards/p/PrimordialMist.java | 2 +- Mage.Sets/src/mage/cards/p/PrincessLeia.java | 2 +- .../src/mage/cards/p/ProteanThaumaturge.java | 3 +- .../src/mage/cards/p/ProwessOfTheFair.java | 2 +- .../src/mage/cards/p/PullFromEternity.java | 2 +- .../mage/cards/p/PurphorosGodOfTheForge.java | 2 +- Mage.Sets/src/mage/cards/p/PyreOfHeroes.java | 2 +- Mage.Sets/src/mage/cards/q/Quickling.java | 2 +- .../src/mage/cards/r/RadiantArchangel.java | 2 +- .../mage/cards/r/RadiantSerraArchangel.java | 2 +- Mage.Sets/src/mage/cards/r/RageForger.java | 2 +- .../src/mage/cards/r/RagingSwordtooth.java | 2 +- .../src/mage/cards/r/RakshasaDebaser.java | 2 +- Mage.Sets/src/mage/cards/r/RalZarek.java | 2 +- .../src/mage/cards/r/RampagingFerocidon.java | 2 +- Mage.Sets/src/mage/cards/r/Ramroller.java | 2 +- Mage.Sets/src/mage/cards/r/RatColony.java | 2 +- .../src/mage/cards/r/RaziaBorosArchangel.java | 2 +- Mage.Sets/src/mage/cards/r/ReaperKing.java | 2 +- Mage.Sets/src/mage/cards/r/ReaverDrone.java | 2 +- Mage.Sets/src/mage/cards/r/Rebound.java | 2 +- .../src/mage/cards/r/RebuffTheWicked.java | 2 +- .../src/mage/cards/r/RecklessBushwhacker.java | 2 +- .../src/mage/cards/r/RecklessCohort.java | 2 +- .../src/mage/cards/r/ReclusiveWight.java | 2 +- Mage.Sets/src/mage/cards/r/Reincarnation.java | 3 +- .../src/mage/cards/r/ReinsOfTheVinesteed.java | 2 +- .../src/mage/cards/r/RelicOfProgenitus.java | 2 +- .../src/mage/cards/r/RenegadeKrasis.java | 3 +- Mage.Sets/src/mage/cards/r/RequiemAngel.java | 2 +- Mage.Sets/src/mage/cards/r/Reroute.java | 2 +- .../src/mage/cards/r/ResplendentMarshal.java | 2 +- Mage.Sets/src/mage/cards/r/Retaliate.java | 2 +- Mage.Sets/src/mage/cards/r/RevealingWind.java | 2 +- .../mage/cards/r/RhonasTheIndomitable.java | 2 +- Mage.Sets/src/mage/cards/r/Ricochet.java | 2 +- Mage.Sets/src/mage/cards/r/RicochetTrap.java | 2 +- .../src/mage/cards/r/RidgescaleTusker.java | 2 +- Mage.Sets/src/mage/cards/r/Riftsweeper.java | 2 +- .../src/mage/cards/r/RighteousValkyrie.java | 2 +- .../mage/cards/r/RikuOfTwoReflections.java | 2 +- Mage.Sets/src/mage/cards/r/RimeTender.java | 2 +- .../src/mage/cards/r/RimehornAurochs.java | 2 +- .../src/mage/cards/r/RingOfImmortals.java | 2 +- .../src/mage/cards/r/RisingPopulace.java | 2 +- .../src/mage/cards/r/RitesOfReaping.java | 2 +- Mage.Sets/src/mage/cards/r/RiverSneak.java | 2 +- .../src/mage/cards/r/RoaleskApexHybrid.java | 2 +- Mage.Sets/src/mage/cards/r/RookieMistake.java | 2 +- .../mage/cards/r/RoonOfTheHiddenRealm.java | 2 +- Mage.Sets/src/mage/cards/r/RotShambler.java | 2 +- Mage.Sets/src/mage/cards/r/Rust.java | 2 +- Mage.Sets/src/mage/cards/r/RustElemental.java | 2 +- .../src/mage/cards/r/RysorianBadger.java | 2 +- .../src/mage/cards/s/SaddlebackLagac.java | 2 +- .../src/mage/cards/s/SagesRowDenizen.java | 2 +- .../mage/cards/s/SaheeliSublimeArtificer.java | 2 +- .../src/mage/cards/s/SaltRoadAmbushers.java | 2 +- Mage.Sets/src/mage/cards/s/Saltskitter.java | 2 +- .../src/mage/cards/s/SamutVoiceOfDissent.java | 2 +- .../src/mage/cards/s/SanctifierOfSouls.java | 2 +- .../src/mage/cards/s/SanctumOfEternity.java | 2 +- .../src/mage/cards/s/SanguineGlorifier.java | 2 +- .../src/mage/cards/s/SarulfRealmEater.java | 2 +- Mage.Sets/src/mage/cards/s/Schismotivate.java | 2 +- .../src/mage/cards/s/ScionOfDarkness.java | 2 +- .../src/mage/cards/s/ScourgeOfKherRidges.java | 2 +- .../src/mage/cards/s/ScrabblingClaws.java | 2 +- Mage.Sets/src/mage/cards/s/Scrounge.java | 2 +- .../src/mage/cards/s/ScroungingBandar.java | 2 +- .../src/mage/cards/s/SeasonOfGrowth.java | 2 +- Mage.Sets/src/mage/cards/s/SecretPlans.java | 2 +- .../src/mage/cards/s/SekKuarDeathkeeper.java | 2 +- .../src/mage/cards/s/SelflessSavior.java | 2 +- .../mage/cards/s/SelvalaHeartOfTheWilds.java | 2 +- .../mage/cards/s/SepulchralPrimordial.java | 2 +- .../src/mage/cards/s/SerendibSorcerer.java | 2 +- .../src/mage/cards/s/SerpentineSpike.java | 2 +- .../src/mage/cards/s/SetessanTactics.java | 2 +- Mage.Sets/src/mage/cards/s/SevenDwarves.java | 2 +- .../src/mage/cards/s/ShadowAlleyDenizen.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowStinger.java | 2 +- .../src/mage/cards/s/ShaleskinBruiser.java | 2 +- .../src/mage/cards/s/ShaperApprentice.java | 2 +- .../src/mage/cards/s/SharedAnimosity.java | 2 +- .../src/mage/cards/s/ShaukuEndbringer.java | 2 +- .../src/mage/cards/s/ShieldhideDragon.java | 2 +- .../src/mage/cards/s/ShimmerwingChimera.java | 2 +- Mage.Sets/src/mage/cards/s/ShriekingMogg.java | 2 +- Mage.Sets/src/mage/cards/s/ShroudedLore.java | 2 +- Mage.Sets/src/mage/cards/s/Shunt.java | 2 +- Mage.Sets/src/mage/cards/s/SickleDancer.java | 2 +- .../src/mage/cards/s/SifterOfSkulls.java | 2 +- .../src/mage/cards/s/SilumgarScavenger.java | 2 +- .../src/mage/cards/s/SimicGuildmage.java | 2 +- .../src/mage/cards/s/SkemfarAvenger.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkAlarmist.java | 2 +- Mage.Sets/src/mage/cards/s/Skitterskin.java | 2 +- .../src/mage/cards/s/SkophosWarleader.java | 2 +- Mage.Sets/src/mage/cards/s/Skullsnatcher.java | 3 +- .../src/mage/cards/s/SkycatSovereign.java | 2 +- .../src/mage/cards/s/SkyriderPatrol.java | 2 +- Mage.Sets/src/mage/cards/s/SlashTheRanks.java | 2 +- .../mage/cards/s/SlaughterPriestOfMogis.java | 2 +- Mage.Sets/src/mage/cards/s/Slitherwisp.java | 2 +- Mage.Sets/src/mage/cards/s/SliverLegion.java | 2 +- Mage.Sets/src/mage/cards/s/SludgeStrider.java | 3 +- Mage.Sets/src/mage/cards/s/SmokeTeller.java | 2 +- .../src/mage/cards/s/SorceressQueen.java | 2 +- .../src/mage/cards/s/SoulOfTheHarvest.java | 2 +- Mage.Sets/src/mage/cards/s/SoulWarden.java | 2 +- Mage.Sets/src/mage/cards/s/Soulherder.java | 2 +- .../src/mage/cards/s/SoulsAttendant.java | 2 +- .../src/mage/cards/s/SoultetherGolem.java | 2 +- .../mage/cards/s/SovereignsOfLostAlara.java | 3 +- .../src/mage/cards/s/SpatulaOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/s/SpearOfHeliod.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralSteel.java | 2 +- .../mage/cards/s/SpiritOfTheAldergard.java | 2 +- Mage.Sets/src/mage/cards/s/SpyNetwork.java | 2 +- Mage.Sets/src/mage/cards/s/StagBeetle.java | 2 +- .../src/mage/cards/s/StalkingVengeance.java | 2 +- .../src/mage/cards/s/StampedingHorncrest.java | 2 +- .../src/mage/cards/s/StarfieldOfNyx.java | 2 +- Mage.Sets/src/mage/cards/s/StealStrength.java | 2 +- .../src/mage/cards/s/SteelcladSerpent.java | 2 +- .../src/mage/cards/s/StonehoofChieftain.java | 2 +- .../src/mage/cards/s/StormwingDragon.java | 2 +- .../src/mage/cards/s/StromkirkMentor.java | 2 +- .../src/mage/cards/s/StumpsquallHydra.java | 2 +- .../mage/cards/s/SubiraTulzidiCaravanner.java | 2 +- .../src/mage/cards/s/SunCrestedPterodon.java | 2 +- .../mage/cards/s/SunstrikeLegionnaire.java | 2 +- Mage.Sets/src/mage/cards/s/SupplyRunners.java | 2 +- .../mage/cards/s/SureFootedInfiltrator.java | 2 +- .../src/mage/cards/s/SwayOfTheStars.java | 2 +- Mage.Sets/src/mage/cards/s/Swerve.java | 2 +- .../mage/cards/s/SyrFarenTheHengehammer.java | 2 +- .../src/mage/cards/t/TaboraxHopesDemise.java | 2 +- .../src/mage/cards/t/TajicLegionsEdge.java | 2 +- Mage.Sets/src/mage/cards/t/TajuruParagon.java | 2 +- .../mage/cards/t/TaranikaAkroanVeteran.java | 2 +- .../mage/cards/t/TasigurTheGoldenFang.java | 2 +- .../mage/cards/t/TawnosUrzasApprentice.java | 2 +- .../src/mage/cards/t/TeferisResponse.java | 2 +- Mage.Sets/src/mage/cards/t/TempleThief.java | 2 +- .../mage/cards/t/TemptWithImmortality.java | 2 +- .../src/mage/cards/t/TemurSabertooth.java | 2 +- .../mage/cards/t/TenthDistrictVeteran.java | 2 +- Mage.Sets/src/mage/cards/t/Terminus.java | 2 +- .../mage/cards/t/TerritorialAllosaurus.java | 2 +- .../mage/cards/t/TeveshSzatDoomOfFools.java | 4 +-- .../src/mage/cards/t/TeysaOrzhovScion.java | 2 +- .../src/mage/cards/t/ThaliasLieutenant.java | 2 +- .../src/mage/cards/t/ThassaDeepDwelling.java | 2 +- .../src/mage/cards/t/ThatWhichWasTaken.java | 2 +- .../src/mage/cards/t/TheScorpionGod.java | 3 +- Mage.Sets/src/mage/cards/t/TheWanderer.java | 2 +- .../src/mage/cards/t/ThopterAssembly.java | 2 +- .../src/mage/cards/t/ThopterSquadron.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandWinds.java | 2 +- .../src/mage/cards/t/ThrashOfRaptors.java | 2 +- .../mage/cards/t/ThundercloudElemental.java | 2 +- Mage.Sets/src/mage/cards/t/Thundermare.java | 2 +- .../src/mage/cards/t/TideforceElemental.java | 2 +- .../mage/cards/t/TilonallisSkinshifter.java | 2 +- .../src/mage/cards/t/TimberProtector.java | 2 +- Mage.Sets/src/mage/cards/t/Timbermare.java | 2 +- Mage.Sets/src/mage/cards/t/TimelyWard.java | 2 +- Mage.Sets/src/mage/cards/t/TimidDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TomeOfLegends.java | 2 +- Mage.Sets/src/mage/cards/t/TorchCourier.java | 2 +- .../src/mage/cards/t/TrailOfMystery.java | 2 +- Mage.Sets/src/mage/cards/t/TrainedCondor.java | 2 +- Mage.Sets/src/mage/cards/t/TranquilGrove.java | 2 +- Mage.Sets/src/mage/cards/t/TriadOfFates.java | 2 +- .../src/mage/cards/t/TrostaniDiscordant.java | 2 +- Mage.Sets/src/mage/cards/t/TurnAside.java | 2 +- Mage.Sets/src/mage/cards/t/TurretOgre.java | 2 +- .../src/mage/cards/u/UlashtTheHateSeed.java | 2 +- .../src/mage/cards/u/UlvenwaldTracker.java | 2 +- Mage.Sets/src/mage/cards/u/UnbenderTine.java | 2 +- .../src/mage/cards/u/UndercityNecrolisk.java | 2 +- .../src/mage/cards/u/UndercityScavenger.java | 2 +- Mage.Sets/src/mage/cards/u/UnrulyMob.java | 2 +- .../mage/cards/u/UnstableShapeshifter.java | 2 +- .../src/mage/cards/v/VeryCrypticCommandD.java | 2 +- .../src/mage/cards/v/VesuvanShapeshifter.java | 2 +- .../src/mage/cards/v/VeteranWarleader.java | 2 +- Mage.Sets/src/mage/cards/v/VictorysEnvoy.java | 2 +- .../src/mage/cards/v/VigilantMartyr.java | 2 +- .../src/mage/cards/v/VindictiveLich.java | 2 +- .../src/mage/cards/v/VindictiveVampire.java | 2 +- .../src/mage/cards/v/VirtussManeuver.java | 2 +- .../mage/cards/v/VizierOfTumblingSands.java | 2 +- Mage.Sets/src/mage/cards/v/VoidGrafter.java | 2 +- .../src/mage/cards/v/VoldarenPariah.java | 2 +- .../src/mage/cards/v/VraskaGolgariQueen.java | 2 +- .../src/mage/cards/w/WardenOfTheChained.java | 2 +- .../src/mage/cards/w/WatcherOfTheSpheres.java | 2 +- .../src/mage/cards/w/WaterspoutElemental.java | 2 +- .../src/mage/cards/w/WaywardServant.java | 2 +- Mage.Sets/src/mage/cards/w/WeaverOfLies.java | 2 +- .../src/mage/cards/w/WeedPrunerPoplar.java | 2 +- .../src/mage/cards/w/WeightOfConscience.java | 2 +- .../mage/cards/w/WhisperwoodElemental.java | 2 +- .../src/mage/cards/w/WickedGuardian.java | 2 +- .../src/mage/cards/w/WildbornPreserver.java | 2 +- .../src/mage/cards/w/WildwoodTracker.java | 2 +- Mage.Sets/src/mage/cards/w/Willbender.java | 2 +- .../src/mage/cards/w/WintermoorCommander.java | 2 +- Mage.Sets/src/mage/cards/w/WintersRest.java | 2 +- .../src/mage/cards/w/WirewoodHivemaster.java | 2 +- .../src/mage/cards/w/WispweaverAngel.java | 2 +- Mage.Sets/src/mage/cards/w/WitchsCottage.java | 2 +- Mage.Sets/src/mage/cards/w/Withdraw.java | 2 +- Mage.Sets/src/mage/cards/w/WizardMentor.java | 2 +- Mage.Sets/src/mage/cards/w/WoeStrider.java | 2 +- .../src/mage/cards/w/WolverineRiders.java | 2 +- .../src/mage/cards/w/WookieeRaidleader.java | 2 +- .../src/mage/cards/w/WorldgorgerDragon.java | 2 +- Mage.Sets/src/mage/cards/w/WormfangDrake.java | 2 +- Mage.Sets/src/mage/cards/w/WormfangNewt.java | 2 +- .../src/mage/cards/w/WormfangTurtle.java | 2 +- .../src/mage/cards/w/WretchedAnurid.java | 2 +- .../src/mage/cards/w/WrexialTheRisenDeep.java | 3 +- Mage.Sets/src/mage/cards/x/XathridDemon.java | 2 +- .../src/mage/cards/x/XenagosGodOfRevels.java | 2 +- .../cards/y/YannikScavengingSentinel.java | 2 +- .../src/mage/cards/y/YodaJediMaster.java | 2 +- .../src/mage/cards/y/YomijiWhoBarsTheWay.java | 2 +- .../src/mage/cards/y/YorionSkyNomad.java | 2 +- .../mage/cards/y/YorvoLordOfGarenbrig.java | 2 +- .../src/mage/cards/y/YouthfulValkyrie.java | 2 +- .../mage/cards/z/ZarethSanTheTrickster.java | 2 +- .../mage/cards/z/ZeganaUtopianSpeaker.java | 2 +- .../src/mage/cards/z/ZombieCannibal.java | 2 +- .../common/DiesCreatureTriggeredAbility.java | 2 +- .../condition/common/MeldCondition.java | 2 +- .../CopySpellForEachItCouldTargetEffect.java | 2 +- .../effects/common/DevourEffect.java | 2 +- .../abilities/keyword/AuraSwapAbility.java | 2 +- .../abilities/keyword/ChampionAbility.java | 2 +- .../mage/abilities/keyword/EscapeAbility.java | 2 +- .../abilities/keyword/SoulbondAbility.java | 2 +- .../abilities/keyword/SupportAbility.java | 2 +- .../main/java/mage/filter/StaticFilters.java | 2 +- .../AuraCardCanAttachToLKIPermanentId.java | 2 +- .../AuraCardCanAttachToPermanentId.java | 2 +- .../CardCanTargetPermanentId.java | 2 +- .../CardOnTopOfLibraryPredicate.java | 2 +- .../{other => card}/CardTextPredicate.java | 2 +- .../CastFromZonePredicate.java | 2 +- .../DefendingPlayerOwnsCardPredicate.java | 2 +- .../ExpansionSetPredicate.java | 2 +- .../FaceDownCastablePredicate.java | 2 +- .../{other => card}/FaceDownPredicate.java | 2 +- .../{other => card}/OwnerIdPredicate.java | 2 +- .../AnotherPredicate.java | 2 +- .../CommanderPredicate.java | 2 +- .../SharesCreatureTypePredicate.java | 2 +- .../TargetsOnlyOnePlayerPredicate.java | 2 +- .../TargetsPermanentPredicate.java | 2 +- .../TargetsPlayerPredicate.java | 2 +- .../AnotherTargetPredicate.java | 2 +- .../ArtifactSourcePredicate.java | 2 +- .../DamagedPlayerThisTurnPredicate.java | 2 +- .../FromSetPredicate.java | 2 +- .../NumberOfTargetsPredicate.java | 2 +- .../other/PermanentCanTargetPermanentId.java | 36 ------------------- ...AttachmentAttachedToCardTypePredicate.java | 2 +- .../AuraPermanentCanAttachToPermanentId.java | 2 +- .../EnchantmentOrEnchantedPredicate.java | 2 +- .../permanent/token/BelzenlokDemonToken.java | 2 +- .../mage/target/common/TargetDiscard.java | 2 +- 766 files changed, 771 insertions(+), 830 deletions(-) rename Mage/src/main/java/mage/filter/predicate/{other => card}/AuraCardCanAttachToLKIPermanentId.java (96%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/AuraCardCanAttachToPermanentId.java (97%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/CardCanTargetPermanentId.java (95%) rename Mage/src/main/java/mage/filter/predicate/{mageobject => card}/CardOnTopOfLibraryPredicate.java (94%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/CardTextPredicate.java (99%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/CastFromZonePredicate.java (96%) rename Mage/src/main/java/mage/filter/predicate/{permanent => card}/DefendingPlayerOwnsCardPredicate.java (93%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/ExpansionSetPredicate.java (93%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/FaceDownCastablePredicate.java (93%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/FaceDownPredicate.java (91%) rename Mage/src/main/java/mage/filter/predicate/{other => card}/OwnerIdPredicate.java (93%) rename Mage/src/main/java/mage/filter/predicate/{permanent => mageobject}/AnotherPredicate.java (92%) rename Mage/src/main/java/mage/filter/predicate/{permanent => mageobject}/CommanderPredicate.java (92%) rename Mage/src/main/java/mage/filter/predicate/{permanent => mageobject}/SharesCreatureTypePredicate.java (92%) rename Mage/src/main/java/mage/filter/predicate/{other => mageobject}/TargetsOnlyOnePlayerPredicate.java (97%) rename Mage/src/main/java/mage/filter/predicate/{other => mageobject}/TargetsPermanentPredicate.java (97%) rename Mage/src/main/java/mage/filter/predicate/{other => mageobject}/TargetsPlayerPredicate.java (97%) rename Mage/src/main/java/mage/filter/predicate/{mageobject => other}/AnotherTargetPredicate.java (98%) rename Mage/src/main/java/mage/filter/predicate/{ability => other}/ArtifactSourcePredicate.java (94%) rename Mage/src/main/java/mage/filter/predicate/{permanent => other}/DamagedPlayerThisTurnPredicate.java (98%) rename Mage/src/main/java/mage/filter/predicate/{mageobject => other}/FromSetPredicate.java (91%) rename Mage/src/main/java/mage/filter/predicate/{mageobject => other}/NumberOfTargetsPredicate.java (96%) delete mode 100644 Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java rename Mage/src/main/java/mage/filter/predicate/{mageobject => permanent}/AttachmentAttachedToCardTypePredicate.java (95%) rename Mage/src/main/java/mage/filter/predicate/{other => permanent}/AuraPermanentCanAttachToPermanentId.java (96%) rename Mage/src/main/java/mage/filter/predicate/{mageobject => permanent}/EnchantmentOrEnchantedPredicate.java (95%) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index 1ec5c731593..cb83a88c32b 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -22,8 +22,8 @@ import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.other.CardTextPredicate; -import mage.filter.predicate.other.ExpansionSetPredicate; +import mage.filter.predicate.card.CardTextPredicate; +import mage.filter.predicate.card.ExpansionSetPredicate; import mage.game.events.Listener; import mage.view.CardView; import mage.view.CardsView; diff --git a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java index 1b02dcd3a12..b6646bf014e 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java +++ b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java index 7d77b6799d0..9ffedd21655 100644 --- a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java +++ b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java @@ -17,7 +17,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index 73aeea63b52..81047f0d9ed 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java index 9056ecd306b..57f8d3231d3 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java @@ -16,10 +16,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java index bf696813021..b40d865ae97 100644 --- a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AegisAngel.java b/Mage.Sets/src/mage/cards/a/AegisAngel.java index 644190bba82..7a7d812249f 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAngel.java +++ b/Mage.Sets/src/mage/cards/a/AegisAngel.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.watchers.common.LostControlWatcher; diff --git a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java index 2127d13412f..9fc1e09aea8 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AerialGuide.java b/Mage.Sets/src/mage/cards/a/AerialGuide.java index 31a7fcae573..11e1ffbad40 100644 --- a/Mage.Sets/src/mage/cards/a/AerialGuide.java +++ b/Mage.Sets/src/mage/cards/a/AerialGuide.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetAttackingCreature; /** diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index 2307965db85..e2ef434a570 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java index 0bf7d49f8a1..cd95c0822cf 100644 --- a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java +++ b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java index 91b1646bdf7..c23fbdf0b89 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java index 9c438edab0a..c951d1b4f02 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java @@ -22,7 +22,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.command.emblems.AjaniSteadfastEmblem; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java b/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java index fe392e8e504..837660006db 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java +++ b/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java @@ -18,7 +18,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java index e4cf26fc5f0..50a5472824e 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java +++ b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java @@ -19,7 +19,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java index cffa80c3215..0c960f0b56c 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java +++ b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java b/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java index 3c28abda5d0..30ebc945e01 100644 --- a/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java +++ b/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java @@ -17,7 +17,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java index 431d697ef0b..dce4308001f 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java +++ b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java @@ -17,7 +17,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; diff --git a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java index 4275d8574d3..4ea247f568c 100644 --- a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java +++ b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java @@ -26,7 +26,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.ExileZone; import mage.players.Player; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java index 273411f3d60..5353f2b626a 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AmarethTheLustrous.java b/Mage.Sets/src/mage/cards/a/AmarethTheLustrous.java index e624fd88515..f495459367c 100644 --- a/Mage.Sets/src/mage/cards/a/AmarethTheLustrous.java +++ b/Mage.Sets/src/mage/cards/a/AmarethTheLustrous.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java index c9c462ba189..19085fbbe14 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java +++ b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java index 1d32032fd9d..54c6abcf700 100644 --- a/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java +++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java @@ -17,7 +17,7 @@ import mage.choices.ChoiceLeftOrRight; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 27f02bd7256..0612ecaced5 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java index 406e8bf655a..7e081ac81fe 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java @@ -13,7 +13,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 0dcae5be702..84ae8cc0f94 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/a/AnaraWolvidFamiliar.java b/Mage.Sets/src/mage/cards/a/AnaraWolvidFamiliar.java index 51b00062ab0..5f54c803ffb 100644 --- a/Mage.Sets/src/mage/cards/a/AnaraWolvidFamiliar.java +++ b/Mage.Sets/src/mage/cards/a/AnaraWolvidFamiliar.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AncestralMask.java b/Mage.Sets/src/mage/cards/a/AncestralMask.java index 471e88e844d..bbeea358e10 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMask.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMask.java @@ -11,7 +11,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java index 67721b9e874..d1740013eb4 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java @@ -22,7 +22,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java index 656f869934f..9c03356a167 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInGraveyardOrBattlefield; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java index 1d1b2df90b4..d9f8f3f4e39 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java index fdbc0a04871..1493ab75280 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.ExpansionSetPredicate; +import mage.filter.predicate.card.ExpansionSetPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java index 2c3192e18f3..9d63be36d5c 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java index 92495d54208..7d09799e70f 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index d290d67c659..d6da1988602 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -19,7 +19,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/ArashinForemost.java b/Mage.Sets/src/mage/cards/a/ArashinForemost.java index 374edd8b91a..943af6b4556 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinForemost.java +++ b/Mage.Sets/src/mage/cards/a/ArashinForemost.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index e16796dccb0..1ff4c47d473 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java index cbfd65239e8..593398d4f15 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index 9c935fd5c2f..6a3987ad6da 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java index 7a72706e8de..1c923b39811 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java @@ -16,10 +16,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.players.Player; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java index 57feccd8943..acad64c2ec9 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java +++ b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage.Sets/src/mage/cards/a/AttendedHealer.java b/Mage.Sets/src/mage/cards/a/AttendedHealer.java index ea804d0d36f..a6b1a19536a 100644 --- a/Mage.Sets/src/mage/cards/a/AttendedHealer.java +++ b/Mage.Sets/src/mage/cards/a/AttendedHealer.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.CatToken3; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/a/AtzocanArcher.java b/Mage.Sets/src/mage/cards/a/AtzocanArcher.java index c0d82a88ff0..d9d0853a918 100644 --- a/Mage.Sets/src/mage/cards/a/AtzocanArcher.java +++ b/Mage.Sets/src/mage/cards/a/AtzocanArcher.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index be06b674601..26fdd13056d 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -16,7 +16,7 @@ import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index 032430a6666..3a359c28e2f 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -12,7 +12,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.AuraCardCanAttachToLKIPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToLKIPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AuriokChampion.java b/Mage.Sets/src/mage/cards/a/AuriokChampion.java index 9cd2337d099..986e7e28f44 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuriokChampion.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/Aurochs.java b/Mage.Sets/src/mage/cards/a/Aurochs.java index d115b40dbc3..ec3c832c9c5 100644 --- a/Mage.Sets/src/mage/cards/a/Aurochs.java +++ b/Mage.Sets/src/mage/cards/a/Aurochs.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AurochsHerd.java b/Mage.Sets/src/mage/cards/a/AurochsHerd.java index fe3a6234ce6..baf2a98d7df 100644 --- a/Mage.Sets/src/mage/cards/a/AurochsHerd.java +++ b/Mage.Sets/src/mage/cards/a/AurochsHerd.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; /** diff --git a/Mage.Sets/src/mage/cards/a/AuroraChampion.java b/Mage.Sets/src/mage/cards/a/AuroraChampion.java index c21ea6ea936..c21eefb425c 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuroraChampion.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterTeamPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index da550aa0675..9304d9a3d1a 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -17,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java index 6f9c4286b60..b9b085e3389 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java @@ -9,7 +9,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java index fe1c0cb6f54..d3d44beea71 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java index 0e5bd76ccfd..1fae3a76be9 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AvengingHuntbonder.java b/Mage.Sets/src/mage/cards/a/AvengingHuntbonder.java index 0867621cbf0..4df34e8f44a 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingHuntbonder.java +++ b/Mage.Sets/src/mage/cards/a/AvengingHuntbonder.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java index 060ce499510..757a1604ba4 100644 --- a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java +++ b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/a/AvoidFate.java b/Mage.Sets/src/mage/cards/a/AvoidFate.java index 74f133c57db..e2eca8f029d 100644 --- a/Mage.Sets/src/mage/cards/a/AvoidFate.java +++ b/Mage.Sets/src/mage/cards/a/AvoidFate.java @@ -9,7 +9,7 @@ import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AyaraFirstOfLocthwain.java b/Mage.Sets/src/mage/cards/a/AyaraFirstOfLocthwain.java index 0e45252d447..73f22405a66 100644 --- a/Mage.Sets/src/mage/cards/a/AyaraFirstOfLocthwain.java +++ b/Mage.Sets/src/mage/cards/a/AyaraFirstOfLocthwain.java @@ -20,7 +20,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java index c034861bab0..02ab49e6904 100644 --- a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java +++ b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.ability.ArtifactSourcePredicate; +import mage.filter.predicate.other.ArtifactSourcePredicate; import mage.target.common.TargetActivatedAbility; /** diff --git a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java index 1b08f1aa6e8..cbbd241f965 100644 --- a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java +++ b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java @@ -15,7 +15,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/b/BallynockCohort.java b/Mage.Sets/src/mage/cards/b/BallynockCohort.java index 2b4f28122f3..a7afdb28be3 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockCohort.java +++ b/Mage.Sets/src/mage/cards/b/BallynockCohort.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java index 0ed999b14a3..f92050b1e38 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/BandTogether.java b/Mage.Sets/src/mage/cards/b/BandTogether.java index 1c61c35ee32..cab380356ca 100644 --- a/Mage.Sets/src/mage/cards/b/BandTogether.java +++ b/Mage.Sets/src/mage/cards/b/BandTogether.java @@ -9,7 +9,7 @@ import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/b/BantSureblade.java b/Mage.Sets/src/mage/cards/b/BantSureblade.java index ccc073ef302..fe889bf15dc 100644 --- a/Mage.Sets/src/mage/cards/b/BantSureblade.java +++ b/Mage.Sets/src/mage/cards/b/BantSureblade.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BaronSengir.java b/Mage.Sets/src/mage/cards/b/BaronSengir.java index f4163c02296..4c3e87dfadc 100644 --- a/Mage.Sets/src/mage/cards/b/BaronSengir.java +++ b/Mage.Sets/src/mage/cards/b/BaronSengir.java @@ -16,7 +16,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index e62323f5ef6..cb4658785ee 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; diff --git a/Mage.Sets/src/mage/cards/b/BarrenGlory.java b/Mage.Sets/src/mage/cards/b/BarrenGlory.java index c28d9c26c2d..e7c448b67d9 100644 --- a/Mage.Sets/src/mage/cards/b/BarrenGlory.java +++ b/Mage.Sets/src/mage/cards/b/BarrenGlory.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java index 7bdf6f46fda..74df305d38b 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java +++ b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage.Sets/src/mage/cards/b/BasrisAcolyte.java b/Mage.Sets/src/mage/cards/b/BasrisAcolyte.java index a1e1a2e5203..eeb0dd12f10 100644 --- a/Mage.Sets/src/mage/cards/b/BasrisAcolyte.java +++ b/Mage.Sets/src/mage/cards/b/BasrisAcolyte.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BastionProtector.java b/Mage.Sets/src/mage/cards/b/BastionProtector.java index 09735f6c883..ababacd673b 100644 --- a/Mage.Sets/src/mage/cards/b/BastionProtector.java +++ b/Mage.Sets/src/mage/cards/b/BastionProtector.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java index 881c255b768..baf732610c0 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java +++ b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetAttackingCreature; diff --git a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java index bcd083f52ee..efb46f11c5c 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java +++ b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index 2e10ffaa00c..d8385290b1c 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BindingMummy.java b/Mage.Sets/src/mage/cards/b/BindingMummy.java index d03972fde74..8e6c2e0622e 100644 --- a/Mage.Sets/src/mage/cards/b/BindingMummy.java +++ b/Mage.Sets/src/mage/cards/b/BindingMummy.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/Bioshift.java b/Mage.Sets/src/mage/cards/b/Bioshift.java index 2ce6ecb571e..edbd85651ed 100644 --- a/Mage.Sets/src/mage/cards/b/Bioshift.java +++ b/Mage.Sets/src/mage/cards/b/Bioshift.java @@ -13,7 +13,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java index a78b00541d0..4c2ed32b4a2 100644 --- a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java +++ b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index e0a21ff6461..e040ce79069 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlizzardStrix.java b/Mage.Sets/src/mage/cards/b/BlizzardStrix.java index 58f7b35b9c0..b45eaca2a0c 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardStrix.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardStrix.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java index 03df4345dac..89951ed9899 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/b/BloodFeud.java b/Mage.Sets/src/mage/cards/b/BloodFeud.java index bfd93fcffbd..c2a9319a4af 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFeud.java +++ b/Mage.Sets/src/mage/cards/b/BloodFeud.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/Bloodbriar.java b/Mage.Sets/src/mage/cards/b/Bloodbriar.java index 4a3866a61dd..ed3c14c8197 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodbriar.java +++ b/Mage.Sets/src/mage/cards/b/Bloodbriar.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodlinePretender.java b/Mage.Sets/src/mage/cards/b/BloodlinePretender.java index 1da57f4a724..9cc4b8efb10 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlinePretender.java +++ b/Mage.Sets/src/mage/cards/b/BloodlinePretender.java @@ -15,7 +15,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java b/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java index 1a523bb7395..ddf7cf91472 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java +++ b/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java @@ -12,7 +12,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java index 726c39641a9..9801b696564 100644 --- a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java +++ b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogardanDragonheart.java b/Mage.Sets/src/mage/cards/b/BogardanDragonheart.java index 23d4cdbd24b..c788d89a1c3 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanDragonheart.java +++ b/Mage.Sets/src/mage/cards/b/BogardanDragonheart.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.TokenImpl; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/b/BoltBend.java b/Mage.Sets/src/mage/cards/b/BoltBend.java index 1f27c67d0a0..21ff34ae7be 100644 --- a/Mage.Sets/src/mage/cards/b/BoltBend.java +++ b/Mage.Sets/src/mage/cards/b/BoltBend.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetStackObject; /** diff --git a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java index 52f9b423745..0ae84fbe29e 100644 --- a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java +++ b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/BondOfPassion.java b/Mage.Sets/src/mage/cards/b/BondOfPassion.java index 174af8fe9dd..bf7c770cd31 100644 --- a/Mage.Sets/src/mage/cards/b/BondOfPassion.java +++ b/Mage.Sets/src/mage/cards/b/BondOfPassion.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/b/BoneyardMycodrax.java b/Mage.Sets/src/mage/cards/b/BoneyardMycodrax.java index 72e7776e2ed..1d9ccd0a6ec 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardMycodrax.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardMycodrax.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java index 9e0bc71421a..2afdf251ddb 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java index f8b2bf8b425..63f81ebe21e 100644 --- a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java +++ b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java index 686031a150a..a76a4a5183a 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java +++ b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BrashTaunter.java b/Mage.Sets/src/mage/cards/b/BrashTaunter.java index f685d13d59e..874130ea7a0 100644 --- a/Mage.Sets/src/mage/cards/b/BrashTaunter.java +++ b/Mage.Sets/src/mage/cards/b/BrashTaunter.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java index 88c9a0e2c74..4f7b44ad426 100644 --- a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java +++ b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/BreakOpen.java b/Mage.Sets/src/mage/cards/b/BreakOpen.java index 8a839958c95..ae00e8d7762 100644 --- a/Mage.Sets/src/mage/cards/b/BreakOpen.java +++ b/Mage.Sets/src/mage/cards/b/BreakOpen.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java index 0d1788a6258..135b78470e5 100644 --- a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java +++ b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java index 988c057167a..a0a6865c344 100644 --- a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java +++ b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; diff --git a/Mage.Sets/src/mage/cards/b/BronzeHorse.java b/Mage.Sets/src/mage/cards/b/BronzeHorse.java index 700ea591be3..50b532c1573 100644 --- a/Mage.Sets/src/mage/cards/b/BronzeHorse.java +++ b/Mage.Sets/src/mage/cards/b/BronzeHorse.java @@ -21,7 +21,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; /** diff --git a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java index 949498cd939..e5a06c6d5f5 100644 --- a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java +++ b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java index 65eadd859f4..02dc1aa657c 100644 --- a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java +++ b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java index b89bc8b1418..eb339a13ba0 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java +++ b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java @@ -17,7 +17,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BrownOuphe.java b/Mage.Sets/src/mage/cards/b/BrownOuphe.java index 2bea108b5f5..3fa7fdc17ef 100644 --- a/Mage.Sets/src/mage/cards/b/BrownOuphe.java +++ b/Mage.Sets/src/mage/cards/b/BrownOuphe.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.ability.ArtifactSourcePredicate; +import mage.filter.predicate.other.ArtifactSourcePredicate; import mage.target.common.TargetActivatedAbility; /** diff --git a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java index 9258a60e202..9329557a7b0 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java @@ -18,8 +18,8 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; -import mage.filter.predicate.other.AuraPermanentCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.permanent.AuraPermanentCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/b/BullAurochs.java b/Mage.Sets/src/mage/cards/b/BullAurochs.java index 783ffdfe39c..24392488007 100644 --- a/Mage.Sets/src/mage/cards/b/BullAurochs.java +++ b/Mage.Sets/src/mage/cards/b/BullAurochs.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BullRushBruiser.java b/Mage.Sets/src/mage/cards/b/BullRushBruiser.java index 6a7035b6729..9727549dd37 100644 --- a/Mage.Sets/src/mage/cards/b/BullRushBruiser.java +++ b/Mage.Sets/src/mage/cards/b/BullRushBruiser.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterTeamPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/b/BurningYardTrainer.java b/Mage.Sets/src/mage/cards/b/BurningYardTrainer.java index 3d37d2b461d..a95486f9d9e 100644 --- a/Mage.Sets/src/mage/cards/b/BurningYardTrainer.java +++ b/Mage.Sets/src/mage/cards/b/BurningYardTrainer.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BushmeatPoacher.java b/Mage.Sets/src/mage/cards/b/BushmeatPoacher.java index f7ca63eeacf..48a98416221 100644 --- a/Mage.Sets/src/mage/cards/b/BushmeatPoacher.java +++ b/Mage.Sets/src/mage/cards/b/BushmeatPoacher.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java index 0f99bf6fd2a..27894b52efe 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java @@ -11,7 +11,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index afdd38ef50c..31273351d96 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java index 41f5cef598c..93b6260494c 100644 --- a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java +++ b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/c/Carom.java b/Mage.Sets/src/mage/cards/c/Carom.java index a6244f9f7a8..71b86294535 100644 --- a/Mage.Sets/src/mage/cards/c/Carom.java +++ b/Mage.Sets/src/mage/cards/c/Carom.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index a7f70d1c714..f31d57b6311 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.EldraziScionToken; /** diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java index 11b65d70040..ccf0aa529f0 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java @@ -20,7 +20,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponentsCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java index 14b84ac4a13..6f65acd4a1d 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; diff --git a/Mage.Sets/src/mage/cards/c/CennsHeir.java b/Mage.Sets/src/mage/cards/c/CennsHeir.java index 6263ade2ce0..4c7973f4ec3 100644 --- a/Mage.Sets/src/mage/cards/c/CennsHeir.java +++ b/Mage.Sets/src/mage/cards/c/CennsHeir.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index 22b4af1ad5e..b75014c8a3e 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index 53dea0d3c9b..45168297c1e 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetadjustment.TargetAdjuster; diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java index 57d072c493e..005635f2d92 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChaosMaw.java b/Mage.Sets/src/mage/cards/c/ChaosMaw.java index c53c0263ea3..773f13e5f87 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosMaw.java +++ b/Mage.Sets/src/mage/cards/c/ChaosMaw.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; public final class ChaosMaw extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature"); diff --git a/Mage.Sets/src/mage/cards/c/CharmedStray.java b/Mage.Sets/src/mage/cards/c/CharmedStray.java index a684da40634..237bee52f3c 100644 --- a/Mage.Sets/src/mage/cards/c/CharmedStray.java +++ b/Mage.Sets/src/mage/cards/c/CharmedStray.java @@ -12,7 +12,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CharmingPrince.java b/Mage.Sets/src/mage/cards/c/CharmingPrince.java index 24a21d37b41..da9fde85774 100644 --- a/Mage.Sets/src/mage/cards/c/CharmingPrince.java +++ b/Mage.Sets/src/mage/cards/c/CharmingPrince.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java index cc72a885507..8babe2d93c8 100644 --- a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java +++ b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; diff --git a/Mage.Sets/src/mage/cards/c/Chewbacca.java b/Mage.Sets/src/mage/cards/c/Chewbacca.java index 166a0c6ddc5..0a7b260d4fc 100644 --- a/Mage.Sets/src/mage/cards/c/Chewbacca.java +++ b/Mage.Sets/src/mage/cards/c/Chewbacca.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java index e58b771fe76..117a730c910 100644 --- a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java +++ b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java @@ -11,7 +11,7 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 7f9096482d0..0892f3c1e36 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -20,7 +20,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.EwokToken; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CinderGiant.java b/Mage.Sets/src/mage/cards/c/CinderGiant.java index 64f04cd4a50..7069f741c17 100644 --- a/Mage.Sets/src/mage/cards/c/CinderGiant.java +++ b/Mage.Sets/src/mage/cards/c/CinderGiant.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/c/ClashOfTitans.java b/Mage.Sets/src/mage/cards/c/ClashOfTitans.java index 3c2b45967ef..616d399b27f 100644 --- a/Mage.Sets/src/mage/cards/c/ClashOfTitans.java +++ b/Mage.Sets/src/mage/cards/c/ClashOfTitans.java @@ -5,7 +5,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/ClericOfLifesBond.java b/Mage.Sets/src/mage/cards/c/ClericOfLifesBond.java index 3e084e9d2a1..f79903978fb 100644 --- a/Mage.Sets/src/mage/cards/c/ClericOfLifesBond.java +++ b/Mage.Sets/src/mage/cards/c/ClericOfLifesBond.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CoastalWizard.java b/Mage.Sets/src/mage/cards/c/CoastalWizard.java index 69e085db3e9..b476e1b3b5d 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalWizard.java +++ b/Mage.Sets/src/mage/cards/c/CoastalWizard.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/c/CommandersPlate.java b/Mage.Sets/src/mage/cards/c/CommandersPlate.java index ae791be00b4..9655e8bfdb8 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersPlate.java +++ b/Mage.Sets/src/mage/cards/c/CommandersPlate.java @@ -15,7 +15,7 @@ import mage.constants.*; import mage.filter.FilterMana; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java index 3985be503e1..c02a90518af 100644 --- a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java @@ -7,7 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/c/Confound.java b/Mage.Sets/src/mage/cards/c/Confound.java index 2cc7c106491..c4bba5826d2 100644 --- a/Mage.Sets/src/mage/cards/c/Confound.java +++ b/Mage.Sets/src/mage/cards/c/Confound.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index 087ba5d3b28..1c7ef9daa7e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -17,7 +17,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java index eed6249e0e1..93d11a8282e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java +++ b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/ConsumeStrength.java b/Mage.Sets/src/mage/cards/c/ConsumeStrength.java index 08e85c37461..d6b0522b1ab 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeStrength.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeStrength.java @@ -10,7 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CorpseKnight.java b/Mage.Sets/src/mage/cards/c/CorpseKnight.java index d5a68d8c190..aa12a8357eb 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseKnight.java +++ b/Mage.Sets/src/mage/cards/c/CorpseKnight.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java index 910479e4be2..7c728e6e2fe 100644 --- a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java index ba13e018cb9..c105f943f2c 100644 --- a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java +++ b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java index 7623a6161bf..9ce3a8a9ca2 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 12cf10ae33c..2dfd51581aa 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; +import mage.filter.predicate.permanent.AttachmentAttachedToCardTypePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/c/CryptChampion.java b/Mage.Sets/src/mage/cards/c/CryptChampion.java index 22d838e6ed1..70166884fcf 100644 --- a/Mage.Sets/src/mage/cards/c/CryptChampion.java +++ b/Mage.Sets/src/mage/cards/c/CryptChampion.java @@ -22,7 +22,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java index 2fd5135608f..c9659f99e2f 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java @@ -13,7 +13,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CrystallineResonance.java b/Mage.Sets/src/mage/cards/c/CrystallineResonance.java index 828f18ae8e2..8167b56cd06 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineResonance.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineResonance.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.TargetPermanent; import mage.util.functions.CopyApplier; diff --git a/Mage.Sets/src/mage/cards/c/CunningGeysermage.java b/Mage.Sets/src/mage/cards/c/CunningGeysermage.java index 523d21e587e..c7ce4e0003a 100644 --- a/Mage.Sets/src/mage/cards/c/CunningGeysermage.java +++ b/Mage.Sets/src/mage/cards/c/CunningGeysermage.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index b73d347359a..4e639378247 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java index 13a656ff7f5..5fe91f4613f 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DarkslickShores.java b/Mage.Sets/src/mage/cards/d/DarkslickShores.java index ce14e9ee57c..0c828b10faa 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickShores.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickShores.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java index 1f7adf8d7c6..535c7ab7ac0 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java @@ -20,7 +20,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index add62ac399f..1ca398929b2 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -19,7 +19,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java index f850e2b78d9..cb95219643b 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java +++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; diff --git a/Mage.Sets/src/mage/cards/d/Deadshot.java b/Mage.Sets/src/mage/cards/d/Deadshot.java index b35a2d87958..c0f482e7b1c 100644 --- a/Mage.Sets/src/mage/cards/d/Deadshot.java +++ b/Mage.Sets/src/mage/cards/d/Deadshot.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java index 968839bb511..7a627b3c6ce 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.watchers.common.CastFromHandWatcher; diff --git a/Mage.Sets/src/mage/cards/d/DecoratedChampion.java b/Mage.Sets/src/mage/cards/d/DecoratedChampion.java index 5c3ee664b4c..c0b14f601f5 100644 --- a/Mage.Sets/src/mage/cards/d/DecoratedChampion.java +++ b/Mage.Sets/src/mage/cards/d/DecoratedChampion.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterTeamPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeeprootElite.java b/Mage.Sets/src/mage/cards/d/DeeprootElite.java index 6b4ecd04ae3..e41d034419e 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootElite.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootElite.java @@ -14,7 +14,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java index 43724042f45..7731c6c3471 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java +++ b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java @@ -14,7 +14,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/Deflection.java b/Mage.Sets/src/mage/cards/d/Deflection.java index c7f4c758716..29759e66152 100644 --- a/Mage.Sets/src/mage/cards/d/Deflection.java +++ b/Mage.Sets/src/mage/cards/d/Deflection.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java index dd5a6f3811a..4fea076e2b9 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java index 3dc6018067e..b059b1f5fbb 100644 --- a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java +++ b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java index c5535182cc2..a0857acaa64 100644 --- a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java +++ b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java index cb5c1e2db4d..44e8443105a 100644 --- a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DesolationGiant.java b/Mage.Sets/src/mage/cards/d/DesolationGiant.java index 5ee4f6f2c8c..2ee454d29aa 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationGiant.java +++ b/Mage.Sets/src/mage/cards/d/DesolationGiant.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java index b10ec3390d3..c435484a2a1 100644 --- a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java +++ b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java @@ -13,10 +13,9 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/d/DimensionalBreach.java b/Mage.Sets/src/mage/cards/d/DimensionalBreach.java index 4bf81b47320..5a2a3999557 100644 --- a/Mage.Sets/src/mage/cards/d/DimensionalBreach.java +++ b/Mage.Sets/src/mage/cards/d/DimensionalBreach.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java index a929d5b1855..2b4a67ffa6e 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterStackObject; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetStackObject; /** diff --git a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java index 4668a1b9fe4..32f5a34f74d 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java index 32055a42533..aa495af369f 100644 --- a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java +++ b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DominatorDrone.java b/Mage.Sets/src/mage/cards/d/DominatorDrone.java index e9a2ff4cae0..e7f5f7abbbc 100644 --- a/Mage.Sets/src/mage/cards/d/DominatorDrone.java +++ b/Mage.Sets/src/mage/cards/d/DominatorDrone.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DomriRade.java b/Mage.Sets/src/mage/cards/d/DomriRade.java index 7ad65620c15..7bc987cc020 100644 --- a/Mage.Sets/src/mage/cards/d/DomriRade.java +++ b/Mage.Sets/src/mage/cards/d/DomriRade.java @@ -19,7 +19,7 @@ import mage.constants.Outcome; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.command.emblems.DomriRadeEmblem; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/d/Dracoplasm.java b/Mage.Sets/src/mage/cards/d/Dracoplasm.java index 0b96b81a2e6..80b1a77d3c7 100644 --- a/Mage.Sets/src/mage/cards/d/Dracoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dracoplasm.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java b/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java index 48635637692..d0ad46a3831 100644 --- a/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java +++ b/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java @@ -12,7 +12,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java index fc193a1d3dc..fc396178375 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java +++ b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.watchers.common.CastFromHandWatcher; /** diff --git a/Mage.Sets/src/mage/cards/d/Dreadmalkin.java b/Mage.Sets/src/mage/cards/d/Dreadmalkin.java index 8cc76d83a6c..cdf6f361a95 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadmalkin.java +++ b/Mage.Sets/src/mage/cards/d/Dreadmalkin.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DreamChisel.java b/Mage.Sets/src/mage/cards/d/DreamChisel.java index 512b217a7f9..f9fdf124c7f 100644 --- a/Mage.Sets/src/mage/cards/d/DreamChisel.java +++ b/Mage.Sets/src/mage/cards/d/DreamChisel.java @@ -7,7 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.FaceDownCastablePredicate; +import mage.filter.predicate.card.FaceDownCastablePredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java index beb1d6334eb..894a50ecc8d 100644 --- a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java +++ b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetNonlandPermanent; /** diff --git a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java index 98ca896b9a9..33e5ad1ea45 100644 --- a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java +++ b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index 6e76745a690..5b999319a77 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; /** diff --git a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java index c20e24c882e..555e22a3774 100644 --- a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java +++ b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index 3aa24b26987..56ee4d7da59 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DwarvenMine.java b/Mage.Sets/src/mage/cards/d/DwarvenMine.java index bf26b0e4b4f..3bf540dc3fe 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenMine.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenMine.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.DwarfToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DwynensElite.java b/Mage.Sets/src/mage/cards/d/DwynensElite.java index 4dcce5b15c0..f72f424959f 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.ElfWarriorToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/EaterOfHope.java b/Mage.Sets/src/mage/cards/e/EaterOfHope.java index f12398e9dda..b3fbc447806 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfHope.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java index 1779d06ad0f..d89c7edb8e2 100644 --- a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java +++ b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index 33b9aed35c4..62be553400f 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -15,10 +15,9 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index b145ca088b2..f5ac7fec13c 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java index 7fbe6397109..13d0ab9db8f 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java +++ b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.abilities.keyword.DevoidAbility; @@ -14,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/EldraziMimic.java b/Mage.Sets/src/mage/cards/e/EldraziMimic.java index 6ddeeeda531..938f6f1205e 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziMimic.java +++ b/Mage.Sets/src/mage/cards/e/EldraziMimic.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/e/ElshaOfTheInfinite.java b/Mage.Sets/src/mage/cards/e/ElshaOfTheInfinite.java index 62e488566a7..c400fc2d8cc 100644 --- a/Mage.Sets/src/mage/cards/e/ElshaOfTheInfinite.java +++ b/Mage.Sets/src/mage/cards/e/ElshaOfTheInfinite.java @@ -16,7 +16,7 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.CardOnTopOfLibraryPredicate; +import mage.filter.predicate.card.CardOnTopOfLibraryPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java index 27729eb07ce..96cb511e301 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java b/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java index e83424af129..24a82184753 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java +++ b/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.ElfWarriorToken; diff --git a/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java b/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java index 875a264fee3..d60d00eead7 100644 --- a/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java +++ b/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java @@ -17,7 +17,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index 55070b581ac..c5b0170ac0a 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.EldraziHorrorToken; diff --git a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java index da7be3c8cdc..db6b59c9e96 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java +++ b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java @@ -13,7 +13,7 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; +import mage.filter.predicate.permanent.AttachmentAttachedToCardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/e/EndemicPlague.java b/Mage.Sets/src/mage/cards/e/EndemicPlague.java index 1b541013b05..417fdb27acc 100644 --- a/Mage.Sets/src/mage/cards/e/EndemicPlague.java +++ b/Mage.Sets/src/mage/cards/e/EndemicPlague.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java index 04ef30ed867..53df40ee2bf 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java @@ -16,7 +16,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/e/EnslavedHorror.java b/Mage.Sets/src/mage/cards/e/EnslavedHorror.java index 189014f231a..1048f609aaf 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedHorror.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedHorror.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java b/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java index 8be20754032..abf4a2fa75a 100644 --- a/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java +++ b/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java @@ -22,7 +22,7 @@ import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/e/EsiorWardwingFamiliar.java b/Mage.Sets/src/mage/cards/e/EsiorWardwingFamiliar.java index 501a516976e..5e018812035 100644 --- a/Mage.Sets/src/mage/cards/e/EsiorWardwingFamiliar.java +++ b/Mage.Sets/src/mage/cards/e/EsiorWardwingFamiliar.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/e/EsperStormblade.java b/Mage.Sets/src/mage/cards/e/EsperStormblade.java index f7ddaea9936..c9ae008bc62 100644 --- a/Mage.Sets/src/mage/cards/e/EsperStormblade.java +++ b/Mage.Sets/src/mage/cards/e/EsperStormblade.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/EssenceWarden.java b/Mage.Sets/src/mage/cards/e/EssenceWarden.java index e92881580df..4695f837325 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceWarden.java +++ b/Mage.Sets/src/mage/cards/e/EssenceWarden.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java index 4a0585574df..06d4ff56016 100644 --- a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java +++ b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java @@ -19,7 +19,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterEnchantmentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index f51432d37a1..efa57ab77d7 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -17,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigB.java b/Mage.Sets/src/mage/cards/e/EverythingamajigB.java index 35cfe5358bb..ed21767e6a7 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigB.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigB.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.other.ExpansionSetPredicate; +import mage.filter.predicate.card.ExpansionSetPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index 937fe1f51c9..b32e9dab48a 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/Exhume.java b/Mage.Sets/src/mage/cards/e/Exhume.java index f2456266ad9..e1d5724ca38 100644 --- a/Mage.Sets/src/mage/cards/e/Exhume.java +++ b/Mage.Sets/src/mage/cards/e/Exhume.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionChampion.java b/Mage.Sets/src/mage/cards/e/ExpeditionChampion.java index 8ab529cbf3b..bb2b692ad9b 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionChampion.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionChampion.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionDiviner.java b/Mage.Sets/src/mage/cards/e/ExpeditionDiviner.java index bc6c96b825d..1ded2293510 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionDiviner.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionDiviner.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; import mage.abilities.common.DiesSourceTriggeredAbility; diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionHealer.java b/Mage.Sets/src/mage/cards/e/ExpeditionHealer.java index 9c27b301226..58d1edc6e90 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionHealer.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionHealer.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionSkulker.java b/Mage.Sets/src/mage/cards/e/ExpeditionSkulker.java index 839959e6963..6053d63cab7 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionSkulker.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionSkulker.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index f53df958485..b6df994db9e 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/e/Expropriate.java b/Mage.Sets/src/mage/cards/e/Expropriate.java index 34c153dd279..e1077ded6cf 100644 --- a/Mage.Sets/src/mage/cards/e/Expropriate.java +++ b/Mage.Sets/src/mage/cards/e/Expropriate.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.turn.TurnMod; diff --git a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java index 298ec1f30a2..bf23831df86 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java +++ b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; /** diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java index baef68c05c3..57876a106a7 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java index a1a39573d5c..ca7fcb1ec3b 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java +++ b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/f/FacelessButcher.java b/Mage.Sets/src/mage/cards/f/FacelessButcher.java index 05a2a471816..de40203235e 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessButcher.java +++ b/Mage.Sets/src/mage/cards/f/FacelessButcher.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.cards.CardImpl; @@ -13,8 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; -import mage.target.Target; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java index 8ae88aa07e1..3cc83f2c458 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java +++ b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java @@ -4,7 +4,6 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.abilities.keyword.ShadowAbility; @@ -15,8 +14,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; -import mage.target.Target; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java index 9918cca5ca1..6e7659bc8a7 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java +++ b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java index 859c866bb11..1a20458ff85 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java b/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java index dbd17cbffd4..f03918c7c05 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/FalthisShadowcatFamiliar.java b/Mage.Sets/src/mage/cards/f/FalthisShadowcatFamiliar.java index e2c730b8336..5c6b4b83e52 100644 --- a/Mage.Sets/src/mage/cards/f/FalthisShadowcatFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FalthisShadowcatFamiliar.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FangOfThePack.java b/Mage.Sets/src/mage/cards/f/FangOfThePack.java index f6f07ea4283..64af6c36b82 100644 --- a/Mage.Sets/src/mage/cards/f/FangOfThePack.java +++ b/Mage.Sets/src/mage/cards/f/FangOfThePack.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/f/FateTransfer.java b/Mage.Sets/src/mage/cards/f/FateTransfer.java index 2e202ea5a1d..071c306639d 100644 --- a/Mage.Sets/src/mage/cards/f/FateTransfer.java +++ b/Mage.Sets/src/mage/cards/f/FateTransfer.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.Counter; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index 971babca6af..3019602378e 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java index b35e2e204e1..1574b38afb2 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java index 1a402f351e2..6d309e00894 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.PirateToken; diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index 5e3e7a68778..bc1a772569d 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java index 54bae1f0231..cfa673999e6 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java @@ -18,7 +18,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java index 86cabf74726..155d6d53fa7 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java +++ b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java @@ -3,7 +3,6 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.cards.CardImpl; @@ -11,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FeralContest.java b/Mage.Sets/src/mage/cards/f/FeralContest.java index ef74c8acaf0..bd10f66d312 100644 --- a/Mage.Sets/src/mage/cards/f/FeralContest.java +++ b/Mage.Sets/src/mage/cards/f/FeralContest.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/FerventChampion.java b/Mage.Sets/src/mage/cards/f/FerventChampion.java index 3ad2e21d0a4..828b931c715 100644 --- a/Mage.Sets/src/mage/cards/f/FerventChampion.java +++ b/Mage.Sets/src/mage/cards/f/FerventChampion.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/f/Fettergeist.java b/Mage.Sets/src/mage/cards/f/Fettergeist.java index aa316aeafdf..e75e2d007f7 100644 --- a/Mage.Sets/src/mage/cards/f/Fettergeist.java +++ b/Mage.Sets/src/mage/cards/f/Fettergeist.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/f/FiendArtisan.java b/Mage.Sets/src/mage/cards/f/FiendArtisan.java index fed489f0ac2..5289270613c 100644 --- a/Mage.Sets/src/mage/cards/f/FiendArtisan.java +++ b/Mage.Sets/src/mage/cards/f/FiendArtisan.java @@ -21,7 +21,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/f/FiendHunter.java b/Mage.Sets/src/mage/cards/f/FiendHunter.java index a393ea0c30b..dd2a7f11108 100644 --- a/Mage.Sets/src/mage/cards/f/FiendHunter.java +++ b/Mage.Sets/src/mage/cards/f/FiendHunter.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/f/FireAnts.java b/Mage.Sets/src/mage/cards/f/FireAnts.java index f048643060a..eba7657b458 100644 --- a/Mage.Sets/src/mage/cards/f/FireAnts.java +++ b/Mage.Sets/src/mage/cards/f/FireAnts.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/f/FirefluxSquad.java b/Mage.Sets/src/mage/cards/f/FirefluxSquad.java index 85ac79b014a..90c6ea834a6 100644 --- a/Mage.Sets/src/mage/cards/f/FirefluxSquad.java +++ b/Mage.Sets/src/mage/cards/f/FirefluxSquad.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java b/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java index 5e34c8ebb7e..5787ae25a7a 100644 --- a/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java +++ b/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/f/FlamekinHerald.java b/Mage.Sets/src/mage/cards/f/FlamekinHerald.java index 1ba9d817f64..256420b7072 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinHerald.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinHerald.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FlamerushRider.java b/Mage.Sets/src/mage/cards/f/FlamerushRider.java index be9f5176bef..2e8e079c937 100644 --- a/Mage.Sets/src/mage/cards/f/FlamerushRider.java +++ b/Mage.Sets/src/mage/cards/f/FlamerushRider.java @@ -18,7 +18,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/f/FlayerDrone.java b/Mage.Sets/src/mage/cards/f/FlayerDrone.java index 3d26f03461b..cd80ba19f88 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerDrone.java +++ b/Mage.Sets/src/mage/cards/f/FlayerDrone.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetOpponent; /** diff --git a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java index 0f3c23e0696..3485ae76818 100644 --- a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java +++ b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/f/Flickerwisp.java b/Mage.Sets/src/mage/cards/f/Flickerwisp.java index 4da4cc0d8dd..f009d348eba 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerwisp.java +++ b/Mage.Sets/src/mage/cards/f/Flickerwisp.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java index 2f60bb6e938..2b3c91a3b31 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; /** diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java index 8383be5525a..02419f0cd14 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java @@ -16,7 +16,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; /** diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java index 645c3635467..97a71e9dfe9 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java b/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java index 2ecafc8814d..84c22e247ec 100644 --- a/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java +++ b/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.filter.predicate.permanent.EnteredThisTurnPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java index 106b3d9c3c4..69b10c65aea 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/f/ForgottenLore.java b/Mage.Sets/src/mage/cards/f/ForgottenLore.java index 51aff33932e..bdd376c6911 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenLore.java @@ -11,7 +11,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java index 455e5c58da2..8542f5d87a7 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GalepowderMage.java b/Mage.Sets/src/mage/cards/g/GalepowderMage.java index 3345eb879ec..8aecee8b049 100644 --- a/Mage.Sets/src/mage/cards/g/GalepowderMage.java +++ b/Mage.Sets/src/mage/cards/g/GalepowderMage.java @@ -17,7 +17,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index 121b1f724f6..0ccdda88056 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java index 7c8a2c0716c..dbdfb814733 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.command.emblems.GarrukApexPredatorEmblem; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/g/GarrukSavageHerald.java b/Mage.Sets/src/mage/cards/g/GarrukSavageHerald.java index 5d2aaf48a86..c8c2e32740a 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukSavageHerald.java +++ b/Mage.Sets/src/mage/cards/g/GarrukSavageHerald.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java index 6d80a1a8eb6..937bdb45658 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java +++ b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java index 816604fbab0..d4758818d82 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java +++ b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java index c5e192c0751..4e442174ef5 100644 --- a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java +++ b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java index a1da242b62b..00e7ec80c04 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java +++ b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java @@ -24,7 +24,7 @@ import mage.choices.ChoiceImpl; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.TokenImpl; diff --git a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java index ee063f9baae..15265c8dc64 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java @@ -17,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GingerbreadCabin.java b/Mage.Sets/src/mage/cards/g/GingerbreadCabin.java index a6d6295fbb6..0a9d37c861a 100644 --- a/Mage.Sets/src/mage/cards/g/GingerbreadCabin.java +++ b/Mage.Sets/src/mage/cards/g/GingerbreadCabin.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.FoodToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GiverOfRunes.java b/Mage.Sets/src/mage/cards/g/GiverOfRunes.java index b7ba1450879..cffe27d9c0e 100644 --- a/Mage.Sets/src/mage/cards/g/GiverOfRunes.java +++ b/Mage.Sets/src/mage/cards/g/GiverOfRunes.java @@ -18,7 +18,7 @@ import mage.filter.FilterObject; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/g/GladewalkerRitualist.java b/Mage.Sets/src/mage/cards/g/GladewalkerRitualist.java index 15401e582e8..4dd49aa41f3 100644 --- a/Mage.Sets/src/mage/cards/g/GladewalkerRitualist.java +++ b/Mage.Sets/src/mage/cards/g/GladewalkerRitualist.java @@ -11,7 +11,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java index b962ceb23ef..543f43fd251 100644 --- a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java +++ b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlazeFiend.java b/Mage.Sets/src/mage/cards/g/GlazeFiend.java index 6f8ce0204e3..9dc45be7494 100644 --- a/Mage.Sets/src/mage/cards/g/GlazeFiend.java +++ b/Mage.Sets/src/mage/cards/g/GlazeFiend.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java index 7411d47583c..412f122b9c0 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index b7fc79084a4..28f124f1671 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.TokenImpl; /** diff --git a/Mage.Sets/src/mage/cards/g/GloryBearers.java b/Mage.Sets/src/mage/cards/g/GloryBearers.java index 6416ae90c6c..9383c201c14 100644 --- a/Mage.Sets/src/mage/cards/g/GloryBearers.java +++ b/Mage.Sets/src/mage/cards/g/GloryBearers.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GluttonousTroll.java b/Mage.Sets/src/mage/cards/g/GluttonousTroll.java index 6e9825b010f..3770ec3942b 100644 --- a/Mage.Sets/src/mage/cards/g/GluttonousTroll.java +++ b/Mage.Sets/src/mage/cards/g/GluttonousTroll.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.FoodToken; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java index 41be4d22924..96e569be88d 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java index 88fddaa829f..a6aff231e73 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 8e7842b9581..77c078fae51 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.permanent.token.GoblinToken; import mage.watchers.common.AttackedThisTurnWatcher; diff --git a/Mage.Sets/src/mage/cards/g/GoblinSmuggler.java b/Mage.Sets/src/mage/cards/g/GoblinSmuggler.java index 4e5edd90078..2e2de0c11a3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSmuggler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSmuggler.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GodEternalBontu.java b/Mage.Sets/src/mage/cards/g/GodEternalBontu.java index e34a96cad2b..2244e8db4d0 100644 --- a/Mage.Sets/src/mage/cards/g/GodEternalBontu.java +++ b/Mage.Sets/src/mage/cards/g/GodEternalBontu.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java index b0f19907724..6ee4263f9fa 100644 --- a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java index 6309133f3b9..26a2902ee76 100644 --- a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java +++ b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; /** diff --git a/Mage.Sets/src/mage/cards/g/GoldenGuardian.java b/Mage.Sets/src/mage/cards/g/GoldenGuardian.java index 404b9cf7834..1314a1e26e4 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GoldenGuardian.java @@ -20,10 +20,9 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java index ff6cf85a06d..201fe8b6b7c 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java index 58beb5af348..0180d2f2edc 100644 --- a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java +++ b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.ExpansionSetPredicate; +import mage.filter.predicate.card.ExpansionSetPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/g/GrakmawSkyclaveRavager.java b/Mage.Sets/src/mage/cards/g/GrakmawSkyclaveRavager.java index e414e6b35c7..297021a025f 100644 --- a/Mage.Sets/src/mage/cards/g/GrakmawSkyclaveRavager.java +++ b/Mage.Sets/src/mage/cards/g/GrakmawSkyclaveRavager.java @@ -16,7 +16,7 @@ import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.GrakmawSkyclaveRavagerHydraToken; diff --git a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java index e9fd1f39bbf..da397fe836f 100644 --- a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java +++ b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.CastFromZonePredicate; +import mage.filter.predicate.card.CastFromZonePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; diff --git a/Mage.Sets/src/mage/cards/g/GravenAbomination.java b/Mage.Sets/src/mage/cards/g/GravenAbomination.java index 5d64b3860e8..8ca543256d2 100644 --- a/Mage.Sets/src/mage/cards/g/GravenAbomination.java +++ b/Mage.Sets/src/mage/cards/g/GravenAbomination.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.permanent.DefendingPlayerOwnsCardPredicate; +import mage.filter.predicate.card.DefendingPlayerOwnsCardPredicate; import mage.target.common.TargetCardInGraveyard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GravenDominator.java b/Mage.Sets/src/mage/cards/g/GravenDominator.java index 28caa75ab23..3dc20009ac7 100644 --- a/Mage.Sets/src/mage/cards/g/GravenDominator.java +++ b/Mage.Sets/src/mage/cards/g/GravenDominator.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/Gravestorm.java b/Mage.Sets/src/mage/cards/g/Gravestorm.java index c39f35d0b58..410118c9ec0 100644 --- a/Mage.Sets/src/mage/cards/g/Gravestorm.java +++ b/Mage.Sets/src/mage/cards/g/Gravestorm.java @@ -13,7 +13,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/g/GravityNegator.java b/Mage.Sets/src/mage/cards/g/GravityNegator.java index 3af4010e285..3f21ccefa5b 100644 --- a/Mage.Sets/src/mage/cards/g/GravityNegator.java +++ b/Mage.Sets/src/mage/cards/g/GravityNegator.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index 456c598def7..9fff4ca0b37 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -15,7 +15,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/g/GrimPoppet.java b/Mage.Sets/src/mage/cards/g/GrimPoppet.java index 78d8b5082ae..02acd710738 100644 --- a/Mage.Sets/src/mage/cards/g/GrimPoppet.java +++ b/Mage.Sets/src/mage/cards/g/GrimPoppet.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java index 731cc87e4c2..3592ce751b9 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java index 56bdc5976bf..02363795845 100644 --- a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java +++ b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java @@ -21,7 +21,7 @@ import mage.constants.Outcome; import mage.constants.WatcherScope; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java b/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java index bd475efdee5..ec4fc4bd8a6 100644 --- a/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java +++ b/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GuardianProject.java b/Mage.Sets/src/mage/cards/g/GuardianProject.java index a1473a84479..54face9a2e3 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianProject.java +++ b/Mage.Sets/src/mage/cards/g/GuardianProject.java @@ -15,7 +15,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java index b79fb3c202e..39e07e9915b 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java +++ b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java b/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java index e93875afe33..b104a558366 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.HistoricPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java index 8e7b4f64de5..c3dcba2193e 100644 --- a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java +++ b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/h/Halfdane.java b/Mage.Sets/src/mage/cards/h/Halfdane.java index 1a37e6e3596..723b55fc088 100644 --- a/Mage.Sets/src/mage/cards/h/Halfdane.java +++ b/Mage.Sets/src/mage/cards/h/Halfdane.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java index f498fd6df10..7eb615b8517 100644 --- a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java +++ b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java @@ -14,7 +14,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java index 8be63b22f53..c1834f55ac2 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HarmonicConvergence.java b/Mage.Sets/src/mage/cards/h/HarmonicConvergence.java index 4deb3cae3bd..95dccfa4bcd 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonicConvergence.java +++ b/Mage.Sets/src/mage/cards/h/HarmonicConvergence.java @@ -15,7 +15,7 @@ import mage.players.Player; import java.util.*; import mage.cards.Cards; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java index bdc3d8f5bec..c6c05e0fe4c 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java +++ b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/h/HavengulSkaab.java b/Mage.Sets/src/mage/cards/h/HavengulSkaab.java index 41a49d63b1d..ed061321011 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulSkaab.java +++ b/Mage.Sets/src/mage/cards/h/HavengulSkaab.java @@ -11,10 +11,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java index 37beaadabf9..9dedfc41b47 100644 --- a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java +++ b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java b/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java index 3eb61db0c12..47cca7c3eb5 100644 --- a/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java +++ b/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/h/HeliodSunCrowned.java b/Mage.Sets/src/mage/cards/h/HeliodSunCrowned.java index 10a2e80d5c8..8991ab0a0aa 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodSunCrowned.java +++ b/Mage.Sets/src/mage/cards/h/HeliodSunCrowned.java @@ -23,7 +23,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/h/HellkiteCourser.java b/Mage.Sets/src/mage/cards/h/HellkiteCourser.java index 5b5d8ba8fad..a0948290de0 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteCourser.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteCourser.java @@ -14,7 +14,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java index ec8758ec298..3d9ec22cb20 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java index ffbe3842268..3e22e1bc98d 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java @@ -19,7 +19,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfTheSun.java b/Mage.Sets/src/mage/cards/h/HeraldOfTheSun.java index 3c3975e8bad..784aa47c721 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfTheSun.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfTheSun.java @@ -14,7 +14,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/h/HerdGnarr.java b/Mage.Sets/src/mage/cards/h/HerdGnarr.java index a125ce2f981..a966e80e38f 100644 --- a/Mage.Sets/src/mage/cards/h/HerdGnarr.java +++ b/Mage.Sets/src/mage/cards/h/HerdGnarr.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java index 6d0720bd38a..7378bfdfeba 100644 --- a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java +++ b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java index 6b7f7243a98..6c5681f93b9 100644 --- a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java +++ b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java @@ -20,7 +20,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/h/HisokasGuard.java b/Mage.Sets/src/mage/cards/h/HisokasGuard.java index 77872c91ca5..c6769aafd08 100644 --- a/Mage.Sets/src/mage/cards/h/HisokasGuard.java +++ b/Mage.Sets/src/mage/cards/h/HisokasGuard.java @@ -20,7 +20,7 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/h/HomewardPath.java b/Mage.Sets/src/mage/cards/h/HomewardPath.java index bf3dd475eef..464a5a49812 100644 --- a/Mage.Sets/src/mage/cards/h/HomewardPath.java +++ b/Mage.Sets/src/mage/cards/h/HomewardPath.java @@ -19,7 +19,7 @@ import mage.constants.SubLayer; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/h/HostageTaker.java b/Mage.Sets/src/mage/cards/h/HostageTaker.java index 315984d792a..9436f7c67d6 100644 --- a/Mage.Sets/src/mage/cards/h/HostageTaker.java +++ b/Mage.Sets/src/mage/cards/h/HostageTaker.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java index f8f28e4baae..b5c1038e2fc 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java index 384f5c6ec36..4faff28b02a 100644 --- a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java +++ b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java index 8977902354a..d53466e2dfe 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java @@ -16,7 +16,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGull.java b/Mage.Sets/src/mage/cards/h/HydromorphGull.java index 8005db2aa40..5a5009c0781 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGull.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGull.java @@ -17,7 +17,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 08c2971e755..6f8cb02d7b4 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/i/IceFangCoatl.java b/Mage.Sets/src/mage/cards/i/IceFangCoatl.java index 9ec9b720b4a..adcc658fc21 100644 --- a/Mage.Sets/src/mage/cards/i/IceFangCoatl.java +++ b/Mage.Sets/src/mage/cards/i/IceFangCoatl.java @@ -9,7 +9,6 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.hint.ConditionHint; -import mage.abilities.hint.Hint; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; @@ -18,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/IcebergCancrix.java b/Mage.Sets/src/mage/cards/i/IcebergCancrix.java index 0f2cb53c504..a73803eabca 100644 --- a/Mage.Sets/src/mage/cards/i/IcebergCancrix.java +++ b/Mage.Sets/src/mage/cards/i/IcebergCancrix.java @@ -11,7 +11,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java index 3f6ebb31bdb..48c07f245fd 100644 --- a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java +++ b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/i/IdyllicGrange.java b/Mage.Sets/src/mage/cards/i/IdyllicGrange.java index 50b1d4bfc63..30c1312b362 100644 --- a/Mage.Sets/src/mage/cards/i/IdyllicGrange.java +++ b/Mage.Sets/src/mage/cards/i/IdyllicGrange.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java b/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java index ff27dbdd290..46940915ab8 100644 --- a/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java +++ b/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java index 7d1e815750d..e7ce36bad96 100644 --- a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java +++ b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java index 28cc550bdac..350bbcbffde 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java +++ b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/i/ImpsMischief.java b/Mage.Sets/src/mage/cards/i/ImpsMischief.java index c3c5dbc7be1..4bfa899fb64 100644 --- a/Mage.Sets/src/mage/cards/i/ImpsMischief.java +++ b/Mage.Sets/src/mage/cards/i/ImpsMischief.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 8faff27d186..e0c00bf4580 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -28,7 +28,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/i/IncrementalBlight.java b/Mage.Sets/src/mage/cards/i/IncrementalBlight.java index c539174f4f1..379969847c0 100644 --- a/Mage.Sets/src/mage/cards/i/IncrementalBlight.java +++ b/Mage.Sets/src/mage/cards/i/IncrementalBlight.java @@ -36,7 +36,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/i/IncrementalGrowth.java b/Mage.Sets/src/mage/cards/i/IncrementalGrowth.java index b78edfac8cb..fa61258c907 100644 --- a/Mage.Sets/src/mage/cards/i/IncrementalGrowth.java +++ b/Mage.Sets/src/mage/cards/i/IncrementalGrowth.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java index 42115c0db2e..11b1eb68511 100644 --- a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/i/InspireAwe.java b/Mage.Sets/src/mage/cards/i/InspireAwe.java index 95b55830e4e..483b60114aa 100644 --- a/Mage.Sets/src/mage/cards/i/InspireAwe.java +++ b/Mage.Sets/src/mage/cards/i/InspireAwe.java @@ -8,7 +8,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.EnchantmentOrEnchantedPredicate; +import mage.filter.predicate.permanent.EnchantmentOrEnchantedPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/InspiringCommander.java b/Mage.Sets/src/mage/cards/i/InspiringCommander.java index a77e24fb9a2..ffe9d051bc2 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringCommander.java +++ b/Mage.Sets/src/mage/cards/i/InspiringCommander.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/i/Intervene.java b/Mage.Sets/src/mage/cards/i/Intervene.java index 61a8acf7c9d..a8b1667c270 100644 --- a/Mage.Sets/src/mage/cards/i/Intervene.java +++ b/Mage.Sets/src/mage/cards/i/Intervene.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java b/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java index 2e321230025..844e2edccc1 100644 --- a/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java +++ b/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java b/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java index 0a8d8f0e72c..8964bb4be25 100644 --- a/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java +++ b/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/i/IridescentDrake.java b/Mage.Sets/src/mage/cards/i/IridescentDrake.java index c4008d5260e..bedaa843874 100644 --- a/Mage.Sets/src/mage/cards/i/IridescentDrake.java +++ b/Mage.Sets/src/mage/cards/i/IridescentDrake.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java b/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java index 8ff34902bc6..4257e4b85fb 100644 --- a/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java +++ b/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index 90933bf727f..e86ca1c7632 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/i/Ixidron.java b/Mage.Sets/src/mage/cards/i/Ixidron.java index d6d5ed529db..ab4af589987 100644 --- a/Mage.Sets/src/mage/cards/i/Ixidron.java +++ b/Mage.Sets/src/mage/cards/i/Ixidron.java @@ -17,8 +17,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.card.FaceDownPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java index 0d89760d55d..c905f3cacc5 100644 --- a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java +++ b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JadeBearer.java b/Mage.Sets/src/mage/cards/j/JadeBearer.java index d8adf1bc161..e2dc0843194 100644 --- a/Mage.Sets/src/mage/cards/j/JadeBearer.java +++ b/Mage.Sets/src/mage/cards/j/JadeBearer.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JediInstructor.java b/Mage.Sets/src/mage/cards/j/JediInstructor.java index 80cc06c6be2..be0757481b2 100644 --- a/Mage.Sets/src/mage/cards/j/JediInstructor.java +++ b/Mage.Sets/src/mage/cards/j/JediInstructor.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JediSentinel.java b/Mage.Sets/src/mage/cards/j/JediSentinel.java index b4802f9787f..dbaf877bb75 100644 --- a/Mage.Sets/src/mage/cards/j/JediSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JediSentinel.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java index 10cb9d13621..61beb4fa0ec 100644 --- a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java +++ b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java @@ -19,7 +19,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java index ecd471db551..96abb9c9bf2 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/j/JeweledLotus.java b/Mage.Sets/src/mage/cards/j/JeweledLotus.java index 435512972a3..561226a28a6 100644 --- a/Mage.Sets/src/mage/cards/j/JeweledLotus.java +++ b/Mage.Sets/src/mage/cards/j/JeweledLotus.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterSpell; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/j/Jilt.java b/Mage.Sets/src/mage/cards/j/Jilt.java index c4bc2b79c80..8f90ac0e26b 100644 --- a/Mage.Sets/src/mage/cards/j/Jilt.java +++ b/Mage.Sets/src/mage/cards/j/Jilt.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java index aa40559229e..8ae089d9368 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java +++ b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index f2c4a7b653f..27d71d108c7 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java b/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java index 40ac830b4be..938f6000713 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java +++ b/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/j/JubilantMascot.java b/Mage.Sets/src/mage/cards/j/JubilantMascot.java index 16ae99f9104..6cb52caff59 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantMascot.java +++ b/Mage.Sets/src/mage/cards/j/JubilantMascot.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JundHackblade.java b/Mage.Sets/src/mage/cards/j/JundHackblade.java index f69e22c9c5f..c52fe1306a7 100644 --- a/Mage.Sets/src/mage/cards/j/JundHackblade.java +++ b/Mage.Sets/src/mage/cards/j/JundHackblade.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java b/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java index f8c9e112343..ee986f5c265 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java @@ -15,7 +15,7 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java index 04aca55b2fb..6b9bda45371 100644 --- a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java index 181c7186764..00c25107f62 100644 --- a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java +++ b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java @@ -16,8 +16,8 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.other.FaceDownCastablePredicate; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownCastablePredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; diff --git a/Mage.Sets/src/mage/cards/k/KaheeraTheOrphanguard.java b/Mage.Sets/src/mage/cards/k/KaheeraTheOrphanguard.java index a186762ac71..08e50fa7040 100644 --- a/Mage.Sets/src/mage/cards/k/KaheeraTheOrphanguard.java +++ b/Mage.Sets/src/mage/cards/k/KaheeraTheOrphanguard.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.Arrays; import java.util.List; diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index f859550cb30..5d1723c60ca 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index 5c0b8129b28..d03e56b4c4d 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -17,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/k/KarametrasBlessing.java b/Mage.Sets/src/mage/cards/k/KarametrasBlessing.java index c0de88dd3c4..59b3b33ad91 100644 --- a/Mage.Sets/src/mage/cards/k/KarametrasBlessing.java +++ b/Mage.Sets/src/mage/cards/k/KarametrasBlessing.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.filter.predicate.mageobject.EnchantmentOrEnchantedPredicate; +import mage.filter.predicate.permanent.EnchantmentOrEnchantedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java index 99567018f6f..a6f9211bdfa 100644 --- a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java +++ b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java @@ -18,7 +18,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage.Sets/src/mage/cards/k/KavuMauler.java b/Mage.Sets/src/mage/cards/k/KavuMauler.java index 4653cd2d98e..86b80f5afa1 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMauler.java +++ b/Mage.Sets/src/mage/cards/k/KavuMauler.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index cccf4ff7555..05a3a361124 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KederektLeviathan.java b/Mage.Sets/src/mage/cards/k/KederektLeviathan.java index 0f2effbb128..a762841d9c6 100644 --- a/Mage.Sets/src/mage/cards/k/KederektLeviathan.java +++ b/Mage.Sets/src/mage/cards/k/KederektLeviathan.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KedissEmberclawFamiliar.java b/Mage.Sets/src/mage/cards/k/KedissEmberclawFamiliar.java index 36e52261e72..6153b7dfeaa 100644 --- a/Mage.Sets/src/mage/cards/k/KedissEmberclawFamiliar.java +++ b/Mage.Sets/src/mage/cards/k/KedissEmberclawFamiliar.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/k/KeepSafe.java b/Mage.Sets/src/mage/cards/k/KeepSafe.java index 997a355c03c..a7a676677e6 100644 --- a/Mage.Sets/src/mage/cards/k/KeepSafe.java +++ b/Mage.Sets/src/mage/cards/k/KeepSafe.java @@ -7,7 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.StaticFilters; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java index 8407018afd7..60812e38b54 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java @@ -13,7 +13,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/k/KelethSunmaneFamiliar.java b/Mage.Sets/src/mage/cards/k/KelethSunmaneFamiliar.java index 920490e003a..390509351df 100644 --- a/Mage.Sets/src/mage/cards/k/KelethSunmaneFamiliar.java +++ b/Mage.Sets/src/mage/cards/k/KelethSunmaneFamiliar.java @@ -11,7 +11,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java index a9373bc5b70..6d751460f8b 100644 --- a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java +++ b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.Set; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java index 6eaafcaf4a1..8dfd0ab4cff 100644 --- a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java +++ b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java @@ -17,7 +17,7 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java index f65fc8fae2b..4c57b9b0bd6 100644 --- a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java +++ b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java @@ -15,7 +15,7 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KiorasFollower.java b/Mage.Sets/src/mage/cards/k/KiorasFollower.java index 3125ec8f183..b87413fab6c 100644 --- a/Mage.Sets/src/mage/cards/k/KiorasFollower.java +++ b/Mage.Sets/src/mage/cards/k/KiorasFollower.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java b/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java index 22d7e11b0b0..38e8c6a1767 100644 --- a/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java +++ b/Mage.Sets/src/mage/cards/k/KitesailSkirmisher.java @@ -18,7 +18,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java index 22fa53abd82..000f8e5c677 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java @@ -15,7 +15,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; +import mage.filter.predicate.permanent.AttachmentAttachedToCardTypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/k/KnightExemplar.java b/Mage.Sets/src/mage/cards/k/KnightExemplar.java index ab0575cd5fe..bd08df50340 100644 --- a/Mage.Sets/src/mage/cards/k/KnightExemplar.java +++ b/Mage.Sets/src/mage/cards/k/KnightExemplar.java @@ -14,7 +14,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java index 5ac5c3ea80d..78d7451f8ac 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.WhiteBlackSpiritToken; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java index 1cc62350452..5040e4c548d 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java @@ -19,7 +19,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java b/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java index c67001d66b1..86c30a4676c 100644 --- a/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java +++ b/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java @@ -18,7 +18,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.filter.predicate.permanent.EquippedPredicate; import mage.filter.predicate.permanent.TokenPredicate; diff --git a/Mage.Sets/src/mage/cards/k/KomaCosmosSerpent.java b/Mage.Sets/src/mage/cards/k/KomaCosmosSerpent.java index 3220849f287..9d020070aa5 100644 --- a/Mage.Sets/src/mage/cards/k/KomaCosmosSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KomaCosmosSerpent.java @@ -17,7 +17,7 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.KomasCoilToken; diff --git a/Mage.Sets/src/mage/cards/k/KorChant.java b/Mage.Sets/src/mage/cards/k/KorChant.java index 75db62cb3b7..b0219182e16 100644 --- a/Mage.Sets/src/mage/cards/k/KorChant.java +++ b/Mage.Sets/src/mage/cards/k/KorChant.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetSource; diff --git a/Mage.Sets/src/mage/cards/k/KorDirge.java b/Mage.Sets/src/mage/cards/k/KorDirge.java index 0d102b37108..3c9838a95e4 100644 --- a/Mage.Sets/src/mage/cards/k/KorDirge.java +++ b/Mage.Sets/src/mage/cards/k/KorDirge.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetSource; diff --git a/Mage.Sets/src/mage/cards/k/KorvoldFaeCursedKing.java b/Mage.Sets/src/mage/cards/k/KorvoldFaeCursedKing.java index 2d6b7a4d255..4c0597dbb44 100644 --- a/Mage.Sets/src/mage/cards/k/KorvoldFaeCursedKing.java +++ b/Mage.Sets/src/mage/cards/k/KorvoldFaeCursedKing.java @@ -15,7 +15,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index 26279caba56..f6f5d5dc354 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/l/LadySun.java b/Mage.Sets/src/mage/cards/l/LadySun.java index 8d653c65d54..c4a42248bfc 100644 --- a/Mage.Sets/src/mage/cards/l/LadySun.java +++ b/Mage.Sets/src/mage/cards/l/LadySun.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java index 14a7109a0eb..a354078460a 100644 --- a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java +++ b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/l/LastLaugh.java b/Mage.Sets/src/mage/cards/l/LastLaugh.java index 852a5960aec..15e38cba738 100644 --- a/Mage.Sets/src/mage/cards/l/LastLaugh.java +++ b/Mage.Sets/src/mage/cards/l/LastLaugh.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index c97bc9b3ca2..d032a5b4f7b 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.DragonToken2; diff --git a/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java b/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java index de1d303adf7..98d1ab4538e 100644 --- a/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java +++ b/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/l/LeechBonder.java b/Mage.Sets/src/mage/cards/l/LeechBonder.java index e7035d561df..c6a617def39 100644 --- a/Mage.Sets/src/mage/cards/l/LeechBonder.java +++ b/Mage.Sets/src/mage/cards/l/LeechBonder.java @@ -19,7 +19,7 @@ import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/l/LeechingBite.java b/Mage.Sets/src/mage/cards/l/LeechingBite.java index 1bb7e7198f7..35fb9da8bf2 100644 --- a/Mage.Sets/src/mage/cards/l/LeechingBite.java +++ b/Mage.Sets/src/mage/cards/l/LeechingBite.java @@ -12,7 +12,7 @@ import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/l/Legerdemain.java b/Mage.Sets/src/mage/cards/l/Legerdemain.java index 165ddd4822c..422d59c73c7 100644 --- a/Mage.Sets/src/mage/cards/l/Legerdemain.java +++ b/Mage.Sets/src/mage/cards/l/Legerdemain.java @@ -12,7 +12,7 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java index aceb775e517..379c9785c83 100644 --- a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java +++ b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/l/LensOfClarity.java b/Mage.Sets/src/mage/cards/l/LensOfClarity.java index 528f64cdad9..12f9baa9952 100644 --- a/Mage.Sets/src/mage/cards/l/LensOfClarity.java +++ b/Mage.Sets/src/mage/cards/l/LensOfClarity.java @@ -17,7 +17,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/l/LichsMirror.java b/Mage.Sets/src/mage/cards/l/LichsMirror.java index 4ea3d25c5dc..84c5c7858ac 100644 --- a/Mage.Sets/src/mage/cards/l/LichsMirror.java +++ b/Mage.Sets/src/mage/cards/l/LichsMirror.java @@ -11,7 +11,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java index 30ea51d9c37..c38c7f76f89 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index bf4a19e73fd..f6423ff4b86 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -17,7 +17,7 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; diff --git a/Mage.Sets/src/mage/cards/l/LivingTotem.java b/Mage.Sets/src/mage/cards/l/LivingTotem.java index 5b2c46f1d8b..abe82bcf437 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTotem.java +++ b/Mage.Sets/src/mage/cards/l/LivingTotem.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/l/LivioOathswornSentinel.java b/Mage.Sets/src/mage/cards/l/LivioOathswornSentinel.java index a27f3e0523a..e835b0a746b 100644 --- a/Mage.Sets/src/mage/cards/l/LivioOathswornSentinel.java +++ b/Mage.Sets/src/mage/cards/l/LivioOathswornSentinel.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/l/LordOfThePit.java b/Mage.Sets/src/mage/cards/l/LordOfThePit.java index 9b6cfe5340b..bf22afa10eb 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LordOfThePit.java @@ -10,7 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java index 83e2c4925d1..771737348ab 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java +++ b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java @@ -21,7 +21,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.ExileZone; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 91e3865afe2..87fc95fefd5 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java index f67569aa6f4..ac7e6ffb614 100644 --- a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java +++ b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java @@ -17,7 +17,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInHand; /** diff --git a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java index fe686d6dc41..a0fe313d3c2 100644 --- a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java +++ b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java b/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java index 6a2bb7b977e..6f88d216073 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java @@ -18,7 +18,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java index 99d2ed44696..0a12d596342 100644 --- a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java +++ b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java b/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java index f2b01168acc..1dd80ca1346 100644 --- a/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java +++ b/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.ManaPoolItem; diff --git a/Mage.Sets/src/mage/cards/m/ManifoldKey.java b/Mage.Sets/src/mage/cards/m/ManifoldKey.java index 87cb68873c8..945e196d43d 100644 --- a/Mage.Sets/src/mage/cards/m/ManifoldKey.java +++ b/Mage.Sets/src/mage/cards/m/ManifoldKey.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java index e98c92e5cdd..53b1f98a0bb 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java b/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java index 7d28ae3ecbd..e73ec6b6505 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingRaptor.java @@ -14,7 +14,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java index 55449c15929..a577b51faf3 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MartonStromgald.java b/Mage.Sets/src/mage/cards/m/MartonStromgald.java index a60f3cbe41b..3f8d0dd3396 100644 --- a/Mage.Sets/src/mage/cards/m/MartonStromgald.java +++ b/Mage.Sets/src/mage/cards/m/MartonStromgald.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterBlockingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java index 4b0726a333c..1b1877f011b 100644 --- a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java +++ b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * @author JRHerlehy Created on 4/7/18. diff --git a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java index 2e14f56524d..3ca270952ef 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java b/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java index d29bb37e7ec..7595d7cbfc9 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java index 528d21b7dfa..11bca2321ed 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/m/MemoryTheft.java b/Mage.Sets/src/mage/cards/m/MemoryTheft.java index 3f6c660bb60..ae3d3ec6007 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryTheft.java +++ b/Mage.Sets/src/mage/cards/m/MemoryTheft.java @@ -13,7 +13,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.AdventurePredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; diff --git a/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java b/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java index e3eb3252104..9eedbac13a1 100644 --- a/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index 9af6fd4441b..e5c9a650eff 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/m/MidnightGuard.java b/Mage.Sets/src/mage/cards/m/MidnightGuard.java index 242f9e82524..9f9382195e0 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightGuard.java +++ b/Mage.Sets/src/mage/cards/m/MidnightGuard.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java index b73bf24d40a..4f758ef63dd 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java @@ -20,7 +20,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java index da88da9d58f..54e37df84ca 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/m/Mirrorworks.java b/Mage.Sets/src/mage/cards/m/Mirrorworks.java index 6aec94982e0..79b440dc087 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorworks.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorworks.java @@ -14,7 +14,7 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/m/Misdirection.java b/Mage.Sets/src/mage/cards/m/Misdirection.java index eebf956e838..3e56791c854 100644 --- a/Mage.Sets/src/mage/cards/m/Misdirection.java +++ b/Mage.Sets/src/mage/cards/m/Misdirection.java @@ -14,7 +14,7 @@ import mage.filter.common.FilterOwnedCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; diff --git a/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java b/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java index c784a8a602d..10b3a918d35 100644 --- a/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java +++ b/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/m/MobileGarrison.java b/Mage.Sets/src/mage/cards/m/MobileGarrison.java index 70be4dc56bb..0d1009a69bf 100644 --- a/Mage.Sets/src/mage/cards/m/MobileGarrison.java +++ b/Mage.Sets/src/mage/cards/m/MobileGarrison.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MoggBombers.java b/Mage.Sets/src/mage/cards/m/MoggBombers.java index 6a71b3185f5..49b996e0a82 100644 --- a/Mage.Sets/src/mage/cards/m/MoggBombers.java +++ b/Mage.Sets/src/mage/cards/m/MoggBombers.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; /** diff --git a/Mage.Sets/src/mage/cards/m/MoggSquad.java b/Mage.Sets/src/mage/cards/m/MoggSquad.java index 00fe1a712f0..5b96398b974 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSquad.java +++ b/Mage.Sets/src/mage/cards/m/MoggSquad.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MonstrousStep.java b/Mage.Sets/src/mage/cards/m/MonstrousStep.java index 3f246951555..e873e8e3f9d 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousStep.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousStep.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java b/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java index dae2f4fd675..d255c7140ea 100644 --- a/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java +++ b/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java index fa3298fa213..7bd2ea12799 100644 --- a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/m/MuckDrubb.java b/Mage.Sets/src/mage/cards/m/MuckDrubb.java index 50f7e3fb73a..adecc34727c 100644 --- a/Mage.Sets/src/mage/cards/m/MuckDrubb.java +++ b/Mage.Sets/src/mage/cards/m/MuckDrubb.java @@ -18,7 +18,7 @@ import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java index 4434a2939d2..43bbc351f89 100644 --- a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java +++ b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MummyParamount.java b/Mage.Sets/src/mage/cards/m/MummyParamount.java index 4800eed6126..c061c996ab9 100644 --- a/Mage.Sets/src/mage/cards/m/MummyParamount.java +++ b/Mage.Sets/src/mage/cards/m/MummyParamount.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java b/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java index ca54830561e..9564c8eb642 100644 --- a/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java +++ b/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java @@ -15,7 +15,7 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index fda52ae5156..89040461c49 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -24,7 +24,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.watchers.common.CastFromHandWatcher; /** diff --git a/Mage.Sets/src/mage/cards/m/MysticSanctuary.java b/Mage.Sets/src/mage/cards/m/MysticSanctuary.java index b01e015bd51..1a161a6a49a 100644 --- a/Mage.Sets/src/mage/cards/m/MysticSanctuary.java +++ b/Mage.Sets/src/mage/cards/m/MysticSanctuary.java @@ -18,7 +18,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MythUnbound.java b/Mage.Sets/src/mage/cards/m/MythUnbound.java index ad93e69a47e..14404f3f026 100644 --- a/Mage.Sets/src/mage/cards/m/MythUnbound.java +++ b/Mage.Sets/src/mage/cards/m/MythUnbound.java @@ -11,7 +11,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/n/N1Starfighter.java b/Mage.Sets/src/mage/cards/n/N1Starfighter.java index de31caf071a..c0765cfb952 100644 --- a/Mage.Sets/src/mage/cards/n/N1Starfighter.java +++ b/Mage.Sets/src/mage/cards/n/N1Starfighter.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/n/NayaHushblade.java b/Mage.Sets/src/mage/cards/n/NayaHushblade.java index 60a10061b3a..5a517da0ad8 100644 --- a/Mage.Sets/src/mage/cards/n/NayaHushblade.java +++ b/Mage.Sets/src/mage/cards/n/NayaHushblade.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java b/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java index 7e1891fe429..86ae280231d 100644 --- a/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java +++ b/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java index acbc02188ae..c081c100933 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java b/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java index 86f5f174b23..992447f31f0 100644 --- a/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java +++ b/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java @@ -16,7 +16,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java index eea21cb467d..2d3609755e4 100644 --- a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java +++ b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/n/NestingGrounds.java b/Mage.Sets/src/mage/cards/n/NestingGrounds.java index 7ef79ee7d5f..aad65d99c4e 100644 --- a/Mage.Sets/src/mage/cards/n/NestingGrounds.java +++ b/Mage.Sets/src/mage/cards/n/NestingGrounds.java @@ -17,7 +17,7 @@ import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java b/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java index 83a79d8d9e1..8f609a81c40 100644 --- a/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java +++ b/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java @@ -20,7 +20,7 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java b/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java index dce9352d5a5..fb6d6a6fd58 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java @@ -15,7 +15,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NightmareShepherd.java b/Mage.Sets/src/mage/cards/n/NightmareShepherd.java index d895ef245b4..adbd503fef6 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareShepherd.java +++ b/Mage.Sets/src/mage/cards/n/NightmareShepherd.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NikaraLairScavenger.java b/Mage.Sets/src/mage/cards/n/NikaraLairScavenger.java index f93bd3e489f..cbfc63ea250 100644 --- a/Mage.Sets/src/mage/cards/n/NikaraLairScavenger.java +++ b/Mage.Sets/src/mage/cards/n/NikaraLairScavenger.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/n/NikoDefiesDestiny.java b/Mage.Sets/src/mage/cards/n/NikoDefiesDestiny.java index 70261b9a8f7..6a56e48c04f 100644 --- a/Mage.Sets/src/mage/cards/n/NikoDefiesDestiny.java +++ b/Mage.Sets/src/mage/cards/n/NikoDefiesDestiny.java @@ -24,7 +24,7 @@ import mage.constants.SagaChapter; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java index 2984e9745ba..2919c9aa812 100644 --- a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java +++ b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java @@ -13,7 +13,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/n/NosyGoblin.java b/Mage.Sets/src/mage/cards/n/NosyGoblin.java index 4393397057d..e535e7dbd93 100644 --- a/Mage.Sets/src/mage/cards/n/NosyGoblin.java +++ b/Mage.Sets/src/mage/cards/n/NosyGoblin.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java index edc5b0ed969..6dd0c14a325 100644 --- a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java +++ b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java @@ -13,7 +13,7 @@ import mage.filter.FilterStackObject; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.game.Game; import mage.game.stack.StackObject; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/n/NovablastWurm.java b/Mage.Sets/src/mage/cards/n/NovablastWurm.java index 93ac7aa4485..bf5c0426c50 100644 --- a/Mage.Sets/src/mage/cards/n/NovablastWurm.java +++ b/Mage.Sets/src/mage/cards/n/NovablastWurm.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java b/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java index e97431a4161..8e7ef16071a 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/n/NyxHerald.java b/Mage.Sets/src/mage/cards/n/NyxHerald.java index 1508a343334..e4ce874fcd2 100644 --- a/Mage.Sets/src/mage/cards/n/NyxHerald.java +++ b/Mage.Sets/src/mage/cards/n/NyxHerald.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.EnchantmentOrEnchantedPredicate; +import mage.filter.predicate.permanent.EnchantmentOrEnchantedPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java index 55a51f64242..e692587c55a 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java +++ b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java @@ -18,7 +18,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java index a343fed1d85..89699582bcf 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java @@ -16,10 +16,9 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; diff --git a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java index b6ace0a7fd9..3919a67b1ee 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/o/OblivionRing.java b/Mage.Sets/src/mage/cards/o/OblivionRing.java index 30bdd31adbf..ce970156068 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionRing.java +++ b/Mage.Sets/src/mage/cards/o/OblivionRing.java @@ -12,8 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; -import mage.target.Target; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/OblivionSower.java b/Mage.Sets/src/mage/cards/o/OblivionSower.java index f0d47f4b8a1..0a09125e602 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionSower.java +++ b/Mage.Sets/src/mage/cards/o/OblivionSower.java @@ -18,8 +18,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.FaceDownPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; diff --git a/Mage.Sets/src/mage/cards/o/ObscuringAether.java b/Mage.Sets/src/mage/cards/o/ObscuringAether.java index ff216b52fc6..48cb358a8ec 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuringAether.java +++ b/Mage.Sets/src/mage/cards/o/ObscuringAether.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.FaceDownCastablePredicate; +import mage.filter.predicate.card.FaceDownCastablePredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java index 49265ebae31..d0ac16a8ead 100644 --- a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java +++ b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java @@ -17,7 +17,7 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/o/OgreErrant.java b/Mage.Sets/src/mage/cards/o/OgreErrant.java index 683342b6b43..a48c0222e82 100644 --- a/Mage.Sets/src/mage/cards/o/OgreErrant.java +++ b/Mage.Sets/src/mage/cards/o/OgreErrant.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index be893e3576d..3b9fe8553ee 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.RatToken; diff --git a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java index 0c8231ab56e..10417115381 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java @@ -20,7 +20,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index 17bd99dfef3..4e2e5b3be01 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/o/OrcGeneral.java b/Mage.Sets/src/mage/cards/o/OrcGeneral.java index 7a2c83e0ccf..84c5db9317f 100644 --- a/Mage.Sets/src/mage/cards/o/OrcGeneral.java +++ b/Mage.Sets/src/mage/cards/o/OrcGeneral.java @@ -17,7 +17,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/o/OrcSureshot.java b/Mage.Sets/src/mage/cards/o/OrcSureshot.java index a35f289aec9..6e8e7de87fd 100644 --- a/Mage.Sets/src/mage/cards/o/OrcSureshot.java +++ b/Mage.Sets/src/mage/cards/o/OrcSureshot.java @@ -15,7 +15,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/o/OrchardWarden.java b/Mage.Sets/src/mage/cards/o/OrchardWarden.java index e5be96fc0a7..6db2d014303 100644 --- a/Mage.Sets/src/mage/cards/o/OrchardWarden.java +++ b/Mage.Sets/src/mage/cards/o/OrchardWarden.java @@ -10,7 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/o/OupheVandals.java b/Mage.Sets/src/mage/cards/o/OupheVandals.java index 49fda4397e7..e6befc1402b 100644 --- a/Mage.Sets/src/mage/cards/o/OupheVandals.java +++ b/Mage.Sets/src/mage/cards/o/OupheVandals.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.ability.ArtifactSourcePredicate; +import mage.filter.predicate.other.ArtifactSourcePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/o/OuterRimSlaver.java b/Mage.Sets/src/mage/cards/o/OuterRimSlaver.java index ca6afe57c45..4bfa3462e90 100644 --- a/Mage.Sets/src/mage/cards/o/OuterRimSlaver.java +++ b/Mage.Sets/src/mage/cards/o/OuterRimSlaver.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/o/OvergrowthElemental.java b/Mage.Sets/src/mage/cards/o/OvergrowthElemental.java index 3f8f14806ac..6188872bdbd 100644 --- a/Mage.Sets/src/mage/cards/o/OvergrowthElemental.java +++ b/Mage.Sets/src/mage/cards/o/OvergrowthElemental.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/p/Paleoloth.java b/Mage.Sets/src/mage/cards/p/Paleoloth.java index a176d7bac4c..a7d7bf81dbc 100644 --- a/Mage.Sets/src/mage/cards/p/Paleoloth.java +++ b/Mage.Sets/src/mage/cards/p/Paleoloth.java @@ -14,7 +14,7 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; /** diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index 594160c93b6..677375e1d18 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -22,7 +22,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index c56793f6e10..3642008f526 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index a5392fb99a1..a097a654ad3 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -22,7 +22,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index eb16ead2d39..768bb2d8e8f 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -21,7 +21,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index 3da4b9819b2..005a1a2a2cc 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/PashalikMons.java b/Mage.Sets/src/mage/cards/p/PashalikMons.java index 21e75916877..acf20bd78c7 100644 --- a/Mage.Sets/src/mage/cards/p/PashalikMons.java +++ b/Mage.Sets/src/mage/cards/p/PashalikMons.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetAnyTarget; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java index 375b7ac72c3..7e32a6c2720 100644 --- a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java +++ b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PegasusCourser.java b/Mage.Sets/src/mage/cards/p/PegasusCourser.java index fcf9aa87788..f593ca328d8 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusCourser.java +++ b/Mage.Sets/src/mage/cards/p/PegasusCourser.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetAttackingCreature; /** diff --git a/Mage.Sets/src/mage/cards/p/PhaseDolphin.java b/Mage.Sets/src/mage/cards/p/PhaseDolphin.java index 86173b7b775..f157acc96dd 100644 --- a/Mage.Sets/src/mage/cards/p/PhaseDolphin.java +++ b/Mage.Sets/src/mage/cards/p/PhaseDolphin.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java index 4a72ceb7fba..c8f0c49bc24 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/p/PiousEvangel.java b/Mage.Sets/src/mage/cards/p/PiousEvangel.java index 3b30ad6aa5b..e4dd6ae851d 100644 --- a/Mage.Sets/src/mage/cards/p/PiousEvangel.java +++ b/Mage.Sets/src/mage/cards/p/PiousEvangel.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/PitFight.java b/Mage.Sets/src/mage/cards/p/PitFight.java index 8419d927338..5db874c4030 100644 --- a/Mage.Sets/src/mage/cards/p/PitFight.java +++ b/Mage.Sets/src/mage/cards/p/PitFight.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java index d473fb1a03e..75d7c90e0df 100644 --- a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java +++ b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.TreasureToken; /** diff --git a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java index 8b4a441cb62..822d4429dfb 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/p/PlagueReaver.java b/Mage.Sets/src/mage/cards/p/PlagueReaver.java index 1453d09e7cf..d3c1801198f 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueReaver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueReaver.java @@ -15,7 +15,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java index 1ec2c72fb35..29c1ecaf7ae 100644 --- a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java +++ b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java index 389bcebbd58..083f3092f38 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java index 708a6687f29..81e7a43f1a2 100644 --- a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java +++ b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java @@ -11,7 +11,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index 177aac5e52b..dcb00281a68 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.TokenImpl; /** * diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index ea68b500cee..625d470ed46 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -20,7 +20,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.CatToken2; /** diff --git a/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java b/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java index c24a3c6dde4..639d3647fa0 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java index 379a2d122eb..29b37d06f45 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java @@ -14,7 +14,7 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index eaa8e7d73a7..6d41b7ed3f4 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java index 30dfe356236..b8fe3d083d7 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index 2b9149eed51..ca77430dc39 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -19,7 +19,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index 8b13ecf74e1..4a40f2aca2c 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.RebelToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/ProteanThaumaturge.java b/Mage.Sets/src/mage/cards/p/ProteanThaumaturge.java index 1439abb2c3f..fe288fc25db 100644 --- a/Mage.Sets/src/mage/cards/p/ProteanThaumaturge.java +++ b/Mage.Sets/src/mage/cards/p/ProteanThaumaturge.java @@ -12,9 +12,8 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.util.functions.CopyApplier; diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index b9f4d4d5e11..7994ff3fb6c 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -8,7 +8,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ElfWarriorToken; diff --git a/Mage.Sets/src/mage/cards/p/PullFromEternity.java b/Mage.Sets/src/mage/cards/p/PullFromEternity.java index 0692ce2ff2c..88c9724d555 100644 --- a/Mage.Sets/src/mage/cards/p/PullFromEternity.java +++ b/Mage.Sets/src/mage/cards/p/PullFromEternity.java @@ -12,7 +12,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInExile; diff --git a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java index db290596d0e..03550f18927 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java +++ b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java b/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java index 5af2ccc2c0e..cf9f1d7cce3 100644 --- a/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java +++ b/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java @@ -17,7 +17,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/q/Quickling.java b/Mage.Sets/src/mage/cards/q/Quickling.java index e15b460da42..75eb3ff90af 100644 --- a/Mage.Sets/src/mage/cards/q/Quickling.java +++ b/Mage.Sets/src/mage/cards/q/Quickling.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java index a40a07027e8..0ae4877f4bf 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java @@ -18,7 +18,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java index c3e4f685023..1731130be23 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantSerraArchangel.java @@ -16,7 +16,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/r/RageForger.java b/Mage.Sets/src/mage/cards/r/RageForger.java index 3fcadde5c8e..80e044028a5 100644 --- a/Mage.Sets/src/mage/cards/r/RageForger.java +++ b/Mage.Sets/src/mage/cards/r/RageForger.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java index cb25c77bc6d..720eb803f19 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java +++ b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/RakshasaDebaser.java b/Mage.Sets/src/mage/cards/r/RakshasaDebaser.java index 011c5f8f709..6d0a11e603c 100644 --- a/Mage.Sets/src/mage/cards/r/RakshasaDebaser.java +++ b/Mage.Sets/src/mage/cards/r/RakshasaDebaser.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.DefendingPlayerOwnsCardPredicate; +import mage.filter.predicate.card.DefendingPlayerOwnsCardPredicate; import mage.target.common.TargetCardInGraveyard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RalZarek.java b/Mage.Sets/src/mage/cards/r/RalZarek.java index f3a3e887780..edfebbc8438 100644 --- a/Mage.Sets/src/mage/cards/r/RalZarek.java +++ b/Mage.Sets/src/mage/cards/r/RalZarek.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.turn.TurnMod; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java index 97b700131db..1704036e3e9 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java +++ b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/Ramroller.java b/Mage.Sets/src/mage/cards/r/Ramroller.java index 2797b6ecb77..5aa1b8b6cd7 100644 --- a/Mage.Sets/src/mage/cards/r/Ramroller.java +++ b/Mage.Sets/src/mage/cards/r/Ramroller.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index 1a9a71c8b3e..6292595d294 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java index 97c41551afc..a1a15feb12f 100644 --- a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/r/ReaperKing.java b/Mage.Sets/src/mage/cards/r/ReaperKing.java index bf94ca1f314..7de37168157 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperKing.java +++ b/Mage.Sets/src/mage/cards/r/ReaperKing.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/r/ReaverDrone.java b/Mage.Sets/src/mage/cards/r/ReaverDrone.java index 5de394f7bc0..91699d555c0 100644 --- a/Mage.Sets/src/mage/cards/r/ReaverDrone.java +++ b/Mage.Sets/src/mage/cards/r/ReaverDrone.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/Rebound.java b/Mage.Sets/src/mage/cards/r/Rebound.java index cbd0a1acdeb..eae18ec190e 100644 --- a/Mage.Sets/src/mage/cards/r/Rebound.java +++ b/Mage.Sets/src/mage/cards/r/Rebound.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterSpell; -import mage.filter.predicate.other.TargetsOnlyOnePlayerPredicate; +import mage.filter.predicate.mageobject.TargetsOnlyOnePlayerPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java b/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java index 1874e28791d..23992560c04 100644 --- a/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java +++ b/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java index 2c871f2a904..5d8dc12d4fb 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java +++ b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/RecklessCohort.java b/Mage.Sets/src/mage/cards/r/RecklessCohort.java index 1ac4cef0795..b2bddd03183 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/ReclusiveWight.java b/Mage.Sets/src/mage/cards/r/ReclusiveWight.java index 4c49464a934..11ccd3cd406 100644 --- a/Mage.Sets/src/mage/cards/r/ReclusiveWight.java +++ b/Mage.Sets/src/mage/cards/r/ReclusiveWight.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/Reincarnation.java b/Mage.Sets/src/mage/cards/r/Reincarnation.java index 05dbb8b9570..81250560bda 100644 --- a/Mage.Sets/src/mage/cards/r/Reincarnation.java +++ b/Mage.Sets/src/mage/cards/r/Reincarnation.java @@ -13,10 +13,9 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java index 5e3dee60857..f97d8b80521 100644 --- a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java +++ b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java index c7c1a7e6f3d..9998bdd1d2e 100644 --- a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java b/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java index 817e585bbb2..bf60d72cca1 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java @@ -13,10 +13,9 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; public final class RenegadeKrasis extends CardImpl { diff --git a/Mage.Sets/src/mage/cards/r/RequiemAngel.java b/Mage.Sets/src/mage/cards/r/RequiemAngel.java index 788cbb9cfb4..825c031b53c 100644 --- a/Mage.Sets/src/mage/cards/r/RequiemAngel.java +++ b/Mage.Sets/src/mage/cards/r/RequiemAngel.java @@ -11,7 +11,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/Reroute.java b/Mage.Sets/src/mage/cards/r/Reroute.java index 12dda9cbed2..64d76719cb9 100644 --- a/Mage.Sets/src/mage/cards/r/Reroute.java +++ b/Mage.Sets/src/mage/cards/r/Reroute.java @@ -8,7 +8,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterStackObject; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.common.TargetActivatedAbility; /** diff --git a/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java b/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java index a025fee1a8a..29b5272f92c 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentMarshal.java @@ -19,7 +19,7 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/Retaliate.java b/Mage.Sets/src/mage/cards/r/Retaliate.java index 9ac9c79b18f..6f574bfb031 100644 --- a/Mage.Sets/src/mage/cards/r/Retaliate.java +++ b/Mage.Sets/src/mage/cards/r/Retaliate.java @@ -7,7 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; +import mage.filter.predicate.other.DamagedPlayerThisTurnPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RevealingWind.java b/Mage.Sets/src/mage/cards/r/RevealingWind.java index 3707801030d..a8be10d36c3 100644 --- a/Mage.Sets/src/mage/cards/r/RevealingWind.java +++ b/Mage.Sets/src/mage/cards/r/RevealingWind.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index 6fb88e17f85..a815713ed79 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/Ricochet.java b/Mage.Sets/src/mage/cards/r/Ricochet.java index bba107c5316..d34043ae288 100644 --- a/Mage.Sets/src/mage/cards/r/Ricochet.java +++ b/Mage.Sets/src/mage/cards/r/Ricochet.java @@ -19,7 +19,7 @@ import mage.constants.SetTargetPointer; import mage.filter.FilterSpell; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RicochetTrap.java b/Mage.Sets/src/mage/cards/r/RicochetTrap.java index d5abfea9fd4..91781688ea2 100644 --- a/Mage.Sets/src/mage/cards/r/RicochetTrap.java +++ b/Mage.Sets/src/mage/cards/r/RicochetTrap.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java b/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java index fc69ce92f7d..edd78420772 100644 --- a/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java +++ b/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/Riftsweeper.java b/Mage.Sets/src/mage/cards/r/Riftsweeper.java index e0262b77250..1526ee73a50 100644 --- a/Mage.Sets/src/mage/cards/r/Riftsweeper.java +++ b/Mage.Sets/src/mage/cards/r/Riftsweeper.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInExile; diff --git a/Mage.Sets/src/mage/cards/r/RighteousValkyrie.java b/Mage.Sets/src/mage/cards/r/RighteousValkyrie.java index 2e190be49ef..4b3cb6782e1 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousValkyrie.java +++ b/Mage.Sets/src/mage/cards/r/RighteousValkyrie.java @@ -18,7 +18,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index dacf3385606..f40932215de 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RimeTender.java b/Mage.Sets/src/mage/cards/r/RimeTender.java index cf8c213c6ca..a9f5304388b 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTender.java +++ b/Mage.Sets/src/mage/cards/r/RimeTender.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java index 5d3da3bd872..f878e9c1d86 100644 --- a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java +++ b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index 37728eb9fa2..4dea052699f 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/r/RisingPopulace.java b/Mage.Sets/src/mage/cards/r/RisingPopulace.java index 81622751329..cc2d7c0f86f 100644 --- a/Mage.Sets/src/mage/cards/r/RisingPopulace.java +++ b/Mage.Sets/src/mage/cards/r/RisingPopulace.java @@ -11,7 +11,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RitesOfReaping.java b/Mage.Sets/src/mage/cards/r/RitesOfReaping.java index 106cbbb3d84..faf070f2fe2 100644 --- a/Mage.Sets/src/mage/cards/r/RitesOfReaping.java +++ b/Mage.Sets/src/mage/cards/r/RitesOfReaping.java @@ -12,7 +12,7 @@ import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/r/RiverSneak.java b/Mage.Sets/src/mage/cards/r/RiverSneak.java index 1a185cacf59..d0dd5602a94 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSneak.java +++ b/Mage.Sets/src/mage/cards/r/RiverSneak.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java b/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java index 29cd3f704ae..38dd36c2060 100644 --- a/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java +++ b/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java @@ -16,7 +16,7 @@ import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RookieMistake.java b/Mage.Sets/src/mage/cards/r/RookieMistake.java index 8f9f16512e8..b844915920c 100644 --- a/Mage.Sets/src/mage/cards/r/RookieMistake.java +++ b/Mage.Sets/src/mage/cards/r/RookieMistake.java @@ -11,7 +11,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java index f3e1c941db4..f8625e03d39 100644 --- a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/r/RotShambler.java b/Mage.Sets/src/mage/cards/r/RotShambler.java index 80e255e6015..b20dee87739 100644 --- a/Mage.Sets/src/mage/cards/r/RotShambler.java +++ b/Mage.Sets/src/mage/cards/r/RotShambler.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/r/Rust.java b/Mage.Sets/src/mage/cards/r/Rust.java index cd5877747e4..2ff86879a7f 100644 --- a/Mage.Sets/src/mage/cards/r/Rust.java +++ b/Mage.Sets/src/mage/cards/r/Rust.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterStackObject; -import mage.filter.predicate.ability.ArtifactSourcePredicate; +import mage.filter.predicate.other.ArtifactSourcePredicate; import mage.target.common.TargetActivatedAbility; /** diff --git a/Mage.Sets/src/mage/cards/r/RustElemental.java b/Mage.Sets/src/mage/cards/r/RustElemental.java index 4557d90af08..a68eb8e3cc6 100644 --- a/Mage.Sets/src/mage/cards/r/RustElemental.java +++ b/Mage.Sets/src/mage/cards/r/RustElemental.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/r/RysorianBadger.java b/Mage.Sets/src/mage/cards/r/RysorianBadger.java index bc04b9607b9..ef4eb395a61 100644 --- a/Mage.Sets/src/mage/cards/r/RysorianBadger.java +++ b/Mage.Sets/src/mage/cards/r/RysorianBadger.java @@ -8,7 +8,7 @@ import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect import mage.cards.*; import mage.constants.*; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.permanent.DefendingPlayerOwnsCardPredicate; +import mage.filter.predicate.card.DefendingPlayerOwnsCardPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java index 715fe21771d..2e1c3128667 100644 --- a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java +++ b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java index 211f4342bc0..9f48bc61023 100644 --- a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java @@ -15,7 +15,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPlayer; /** diff --git a/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java b/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java index fea2ab95b1d..64e66980243 100644 --- a/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java +++ b/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java @@ -17,7 +17,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ServoToken; diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java index 659e3ed2dd8..310828ec3fd 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/Saltskitter.java b/Mage.Sets/src/mage/cards/s/Saltskitter.java index b397830303d..673cf8c5c84 100644 --- a/Mage.Sets/src/mage/cards/s/Saltskitter.java +++ b/Mage.Sets/src/mage/cards/s/Saltskitter.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java index 76a11e4a3c8..b121dc6ba62 100644 --- a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java +++ b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java @@ -23,7 +23,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java index 31446794af0..6067078303a 100644 --- a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; import mage.target.common.TargetCardInYourGraveyard; diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java b/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java index bbdfcf23ec0..337759ea92b 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java index aab3c64b8c3..4d65558b431 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java +++ b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SarulfRealmEater.java b/Mage.Sets/src/mage/cards/s/SarulfRealmEater.java index 942179703f8..b58904ea0ad 100644 --- a/Mage.Sets/src/mage/cards/s/SarulfRealmEater.java +++ b/Mage.Sets/src/mage/cards/s/SarulfRealmEater.java @@ -19,7 +19,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/Schismotivate.java b/Mage.Sets/src/mage/cards/s/Schismotivate.java index 131131371f6..c1ded39f941 100644 --- a/Mage.Sets/src/mage/cards/s/Schismotivate.java +++ b/Mage.Sets/src/mage/cards/s/Schismotivate.java @@ -12,7 +12,7 @@ import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java b/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java index 81c6edee740..dc53d5fa91b 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java index 9f8d5fb4f20..ddd7a5237fd 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java index 357f45b6bbb..97cc5f9fc11 100644 --- a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java +++ b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/s/Scrounge.java b/Mage.Sets/src/mage/cards/s/Scrounge.java index 31a6c319983..a41d166a8f2 100644 --- a/Mage.Sets/src/mage/cards/s/Scrounge.java +++ b/Mage.Sets/src/mage/cards/s/Scrounge.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/s/ScroungingBandar.java b/Mage.Sets/src/mage/cards/s/ScroungingBandar.java index 7281614abb4..fe245a17eaf 100644 --- a/Mage.Sets/src/mage/cards/s/ScroungingBandar.java +++ b/Mage.Sets/src/mage/cards/s/ScroungingBandar.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java b/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java index d347018ab50..dcee18948d5 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java +++ b/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.StaticFilters; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SecretPlans.java b/Mage.Sets/src/mage/cards/s/SecretPlans.java index bc584763f6e..de84fb8b472 100644 --- a/Mage.Sets/src/mage/cards/s/SecretPlans.java +++ b/Mage.Sets/src/mage/cards/s/SecretPlans.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index 89ebea7ea55..09e18e4ed23 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -13,7 +13,7 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SekKuarDeathkeeperGravebornToken; diff --git a/Mage.Sets/src/mage/cards/s/SelflessSavior.java b/Mage.Sets/src/mage/cards/s/SelflessSavior.java index b5fd97e4bc1..d336af9c87c 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessSavior.java +++ b/Mage.Sets/src/mage/cards/s/SelflessSavior.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java index e8f60bb7e91..466d32c8015 100644 --- a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java @@ -17,7 +17,7 @@ import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/SepulchralPrimordial.java b/Mage.Sets/src/mage/cards/s/SepulchralPrimordial.java index bec61fb8a4f..96b1178b3e6 100644 --- a/Mage.Sets/src/mage/cards/s/SepulchralPrimordial.java +++ b/Mage.Sets/src/mage/cards/s/SepulchralPrimordial.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java index 6d79ee30706..74dcc964b40 100644 --- a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SerpentineSpike.java b/Mage.Sets/src/mage/cards/s/SerpentineSpike.java index 144b922ef71..069a9f885d3 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineSpike.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineSpike.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/SetessanTactics.java b/Mage.Sets/src/mage/cards/s/SetessanTactics.java index 7f7354f5ccc..b5aa64fb14e 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanTactics.java +++ b/Mage.Sets/src/mage/cards/s/SetessanTactics.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SevenDwarves.java b/Mage.Sets/src/mage/cards/s/SevenDwarves.java index 03a6b1caa1b..56e287d903d 100644 --- a/Mage.Sets/src/mage/cards/s/SevenDwarves.java +++ b/Mage.Sets/src/mage/cards/s/SevenDwarves.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java index 744d0a8244d..bd6ac80cb2a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java +++ b/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/ShadowStinger.java b/Mage.Sets/src/mage/cards/s/ShadowStinger.java index 50b349c95ca..124b92e78b6 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowStinger.java +++ b/Mage.Sets/src/mage/cards/s/ShadowStinger.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; diff --git a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java index dc30824c252..14cce8d24e6 100644 --- a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java +++ b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java index 2d30a7940c9..ba0c0cde1cc 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SharedAnimosity.java b/Mage.Sets/src/mage/cards/s/SharedAnimosity.java index 6bfed432a6c..e0c8972e591 100644 --- a/Mage.Sets/src/mage/cards/s/SharedAnimosity.java +++ b/Mage.Sets/src/mage/cards/s/SharedAnimosity.java @@ -11,7 +11,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java index 17794b91600..1ce2bcf9176 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java +++ b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java index 23df3d2fe03..79bd73c9b26 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/ShimmerwingChimera.java b/Mage.Sets/src/mage/cards/s/ShimmerwingChimera.java index 9693375b449..d9a47c7913f 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerwingChimera.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerwingChimera.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/ShriekingMogg.java b/Mage.Sets/src/mage/cards/s/ShriekingMogg.java index c6e3392d4a0..1bb287ad28e 100644 --- a/Mage.Sets/src/mage/cards/s/ShriekingMogg.java +++ b/Mage.Sets/src/mage/cards/s/ShriekingMogg.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/ShroudedLore.java b/Mage.Sets/src/mage/cards/s/ShroudedLore.java index 96059b9da56..1d74a8a34d5 100644 --- a/Mage.Sets/src/mage/cards/s/ShroudedLore.java +++ b/Mage.Sets/src/mage/cards/s/ShroudedLore.java @@ -11,7 +11,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/s/Shunt.java b/Mage.Sets/src/mage/cards/s/Shunt.java index 6e61949402f..f06a560d7e8 100644 --- a/Mage.Sets/src/mage/cards/s/Shunt.java +++ b/Mage.Sets/src/mage/cards/s/Shunt.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/s/SickleDancer.java b/Mage.Sets/src/mage/cards/s/SickleDancer.java index db82b07fd55..ab3a5a2e01e 100644 --- a/Mage.Sets/src/mage/cards/s/SickleDancer.java +++ b/Mage.Sets/src/mage/cards/s/SickleDancer.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterTeamPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java index 94e5b381003..aef294ea7c5 100644 --- a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java +++ b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.EldraziScionToken; diff --git a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java index f9051210089..da317c81584 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index 8d339588936..06cd89b6126 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -19,7 +19,7 @@ import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java b/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java index 21501ed8663..1d275019af2 100644 --- a/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java +++ b/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java b/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java index ccd8731446b..3f3cc3eca48 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java +++ b/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java @@ -19,7 +19,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/Skitterskin.java b/Mage.Sets/src/mage/cards/s/Skitterskin.java index f98e4c404ee..ed40db6bfc4 100644 --- a/Mage.Sets/src/mage/cards/s/Skitterskin.java +++ b/Mage.Sets/src/mage/cards/s/Skitterskin.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SkophosWarleader.java b/Mage.Sets/src/mage/cards/s/SkophosWarleader.java index 114b2bb080d..f943dc1a5e0 100644 --- a/Mage.Sets/src/mage/cards/s/SkophosWarleader.java +++ b/Mage.Sets/src/mage/cards/s/SkophosWarleader.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/Skullsnatcher.java b/Mage.Sets/src/mage/cards/s/Skullsnatcher.java index 7b98a150a87..ab749110042 100644 --- a/Mage.Sets/src/mage/cards/s/Skullsnatcher.java +++ b/Mage.Sets/src/mage/cards/s/Skullsnatcher.java @@ -15,12 +15,11 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.UnblockedPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCardInOpponentsGraveyard; /** diff --git a/Mage.Sets/src/mage/cards/s/SkycatSovereign.java b/Mage.Sets/src/mage/cards/s/SkycatSovereign.java index 9991c2032b6..4586b90fa23 100644 --- a/Mage.Sets/src/mage/cards/s/SkycatSovereign.java +++ b/Mage.Sets/src/mage/cards/s/SkycatSovereign.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.CatBirdToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java index 1ab4b0e8392..0c646acf190 100644 --- a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java +++ b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SlashTheRanks.java b/Mage.Sets/src/mage/cards/s/SlashTheRanks.java index 879c182a304..5d68622a4ec 100644 --- a/Mage.Sets/src/mage/cards/s/SlashTheRanks.java +++ b/Mage.Sets/src/mage/cards/s/SlashTheRanks.java @@ -7,7 +7,7 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SlaughterPriestOfMogis.java b/Mage.Sets/src/mage/cards/s/SlaughterPriestOfMogis.java index 1c6a1ba33b4..c6834e23dc0 100644 --- a/Mage.Sets/src/mage/cards/s/SlaughterPriestOfMogis.java +++ b/Mage.Sets/src/mage/cards/s/SlaughterPriestOfMogis.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/s/Slitherwisp.java b/Mage.Sets/src/mage/cards/s/Slitherwisp.java index 5a7c9721626..d1dc58327aa 100644 --- a/Mage.Sets/src/mage/cards/s/Slitherwisp.java +++ b/Mage.Sets/src/mage/cards/s/Slitherwisp.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SliverLegion.java b/Mage.Sets/src/mage/cards/s/SliverLegion.java index cab7d50d2ac..0b5ec240544 100644 --- a/Mage.Sets/src/mage/cards/s/SliverLegion.java +++ b/Mage.Sets/src/mage/cards/s/SliverLegion.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SludgeStrider.java b/Mage.Sets/src/mage/cards/s/SludgeStrider.java index 3b0fe581c62..53e6fdb4ad0 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeStrider.java +++ b/Mage.Sets/src/mage/cards/s/SludgeStrider.java @@ -10,10 +10,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/SmokeTeller.java b/Mage.Sets/src/mage/cards/s/SmokeTeller.java index 52aece52e8f..d015a603401 100644 --- a/Mage.Sets/src/mage/cards/s/SmokeTeller.java +++ b/Mage.Sets/src/mage/cards/s/SmokeTeller.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/SorceressQueen.java b/Mage.Sets/src/mage/cards/s/SorceressQueen.java index 6e498ff6623..c47d4fc81f3 100644 --- a/Mage.Sets/src/mage/cards/s/SorceressQueen.java +++ b/Mage.Sets/src/mage/cards/s/SorceressQueen.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java index 54857abbb67..fbdbd033dd0 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java @@ -14,7 +14,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; diff --git a/Mage.Sets/src/mage/cards/s/SoulWarden.java b/Mage.Sets/src/mage/cards/s/SoulWarden.java index c70e7080787..a966eac90e1 100644 --- a/Mage.Sets/src/mage/cards/s/SoulWarden.java +++ b/Mage.Sets/src/mage/cards/s/SoulWarden.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/Soulherder.java b/Mage.Sets/src/mage/cards/s/Soulherder.java index aabf3f94181..8bf19ea2a0c 100644 --- a/Mage.Sets/src/mage/cards/s/Soulherder.java +++ b/Mage.Sets/src/mage/cards/s/Soulherder.java @@ -15,7 +15,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage.Sets/src/mage/cards/s/SoulsAttendant.java b/Mage.Sets/src/mage/cards/s/SoulsAttendant.java index 1e95da95062..efa1d0fccc9 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsAttendant.java +++ b/Mage.Sets/src/mage/cards/s/SoulsAttendant.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java index 199ac02d3be..450ac7f5828 100644 --- a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java index 9b02d9d6269..85c6cdb6134 100644 --- a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java +++ b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java @@ -15,10 +15,9 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; diff --git a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java index c416501a563..797f9d09579 100644 --- a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.other.ExpansionSetPredicate; +import mage.filter.predicate.card.ExpansionSetPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java index 96e755b5c53..16dc4a435e1 100644 --- a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; +import mage.filter.predicate.other.DamagedPlayerThisTurnPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/SpectralSteel.java b/Mage.Sets/src/mage/cards/s/SpectralSteel.java index 10290953bf8..a9dd8a75bfc 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSteel.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSteel.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfTheAldergard.java b/Mage.Sets/src/mage/cards/s/SpiritOfTheAldergard.java index 5bd8561dc05..a53b5cd1a52 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfTheAldergard.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfTheAldergard.java @@ -18,7 +18,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SpyNetwork.java b/Mage.Sets/src/mage/cards/s/SpyNetwork.java index 5e15c4be94b..abb405b5e97 100644 --- a/Mage.Sets/src/mage/cards/s/SpyNetwork.java +++ b/Mage.Sets/src/mage/cards/s/SpyNetwork.java @@ -14,7 +14,7 @@ import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/s/StagBeetle.java b/Mage.Sets/src/mage/cards/s/StagBeetle.java index 37ceafab538..ed936e859c9 100644 --- a/Mage.Sets/src/mage/cards/s/StagBeetle.java +++ b/Mage.Sets/src/mage/cards/s/StagBeetle.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java index 33467946b77..13a66a3d40c 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java +++ b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java @@ -9,7 +9,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetPlayerOrPlaneswalker; diff --git a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java index 641d5b98bc3..85afd557a90 100644 --- a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java +++ b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index b189985bdc7..66046ec62c3 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -15,7 +15,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/s/StealStrength.java b/Mage.Sets/src/mage/cards/s/StealStrength.java index e758f5ff55d..74584aa9391 100644 --- a/Mage.Sets/src/mage/cards/s/StealStrength.java +++ b/Mage.Sets/src/mage/cards/s/StealStrength.java @@ -12,7 +12,7 @@ import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java index 7228dde43ad..00e88ddd5a1 100644 --- a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java @@ -11,7 +11,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java index 67e60abc6fc..a7b8fb87588 100644 --- a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java +++ b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/StormwingDragon.java b/Mage.Sets/src/mage/cards/s/StormwingDragon.java index 86336d9ea84..2ab90cea19f 100644 --- a/Mage.Sets/src/mage/cards/s/StormwingDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormwingDragon.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/s/StromkirkMentor.java b/Mage.Sets/src/mage/cards/s/StromkirkMentor.java index 834d31f7147..679f3672eed 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkMentor.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkMentor.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java index 2d17fa4d45a..f9cb1084411 100644 --- a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java +++ b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java @@ -15,7 +15,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/s/SubiraTulzidiCaravanner.java b/Mage.Sets/src/mage/cards/s/SubiraTulzidiCaravanner.java index 15a359a4fd7..abc8cb8022c 100644 --- a/Mage.Sets/src/mage/cards/s/SubiraTulzidiCaravanner.java +++ b/Mage.Sets/src/mage/cards/s/SubiraTulzidiCaravanner.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java index d3f70b0cb39..6b485352234 100644 --- a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java +++ b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * @author JayDi85 diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index 3f3525e4b2a..8a3280081e3 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -19,7 +19,7 @@ import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/s/SupplyRunners.java b/Mage.Sets/src/mage/cards/s/SupplyRunners.java index 72ed35e23b3..031346ecbbb 100644 --- a/Mage.Sets/src/mage/cards/s/SupplyRunners.java +++ b/Mage.Sets/src/mage/cards/s/SupplyRunners.java @@ -10,7 +10,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java b/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java index 01c722ddd3a..f9d93c4b5b9 100644 --- a/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java +++ b/Mage.Sets/src/mage/cards/s/SureFootedInfiltrator.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java b/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java index 001037336c9..cc908553689 100644 --- a/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java +++ b/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/Swerve.java b/Mage.Sets/src/mage/cards/s/Swerve.java index 6d72521bdf7..dd3907f8273 100644 --- a/Mage.Sets/src/mage/cards/s/Swerve.java +++ b/Mage.Sets/src/mage/cards/s/Swerve.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/s/SyrFarenTheHengehammer.java b/Mage.Sets/src/mage/cards/s/SyrFarenTheHengehammer.java index 85b8461de3d..adfcc139e8f 100644 --- a/Mage.Sets/src/mage/cards/s/SyrFarenTheHengehammer.java +++ b/Mage.Sets/src/mage/cards/s/SyrFarenTheHengehammer.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java index 7c04df25e71..27009e243dd 100644 --- a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java +++ b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java @@ -22,7 +22,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java index dbbce78adcb..6f4eb03c20d 100644 --- a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java +++ b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/TajuruParagon.java b/Mage.Sets/src/mage/cards/t/TajuruParagon.java index b0f32651495..33f030c5255 100644 --- a/Mage.Sets/src/mage/cards/t/TajuruParagon.java +++ b/Mage.Sets/src/mage/cards/t/TajuruParagon.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TaranikaAkroanVeteran.java b/Mage.Sets/src/mage/cards/t/TaranikaAkroanVeteran.java index 0dcd4d2fb61..f1f4e9ee4b2 100644 --- a/Mage.Sets/src/mage/cards/t/TaranikaAkroanVeteran.java +++ b/Mage.Sets/src/mage/cards/t/TaranikaAkroanVeteran.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java index b0c56f90fcd..ff96c8e4996 100644 --- a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java +++ b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java index 1f6987b9c9a..d7e72dafa7b 100644 --- a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java +++ b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java @@ -17,7 +17,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.ability.ArtifactSourcePredicate; +import mage.filter.predicate.other.ArtifactSourcePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackAbility; diff --git a/Mage.Sets/src/mage/cards/t/TeferisResponse.java b/Mage.Sets/src/mage/cards/t/TeferisResponse.java index 21868a6633e..a4b2150844a 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisResponse.java +++ b/Mage.Sets/src/mage/cards/t/TeferisResponse.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterStackObject; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/t/TempleThief.java b/Mage.Sets/src/mage/cards/t/TempleThief.java index 9bac89047fd..ecc1d0ead6f 100644 --- a/Mage.Sets/src/mage/cards/t/TempleThief.java +++ b/Mage.Sets/src/mage/cards/t/TempleThief.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.EnchantmentOrEnchantedPredicate; +import mage.filter.predicate.permanent.EnchantmentOrEnchantedPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java index b70e273cfb8..fb7dfcc85ec 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java @@ -12,7 +12,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java index de2ca63dd06..2f8058a3b60 100644 --- a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java +++ b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java b/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java index 820e9e57b3b..3ad5eafe434 100644 --- a/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java +++ b/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/Terminus.java b/Mage.Sets/src/mage/cards/t/Terminus.java index 56622c23042..1bd33f97f03 100644 --- a/Mage.Sets/src/mage/cards/t/Terminus.java +++ b/Mage.Sets/src/mage/cards/t/Terminus.java @@ -12,7 +12,7 @@ import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java b/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java index 0866bc1dd97..ad3f2dbe87e 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java b/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java index 3869b403f7e..67a9ae5eb04 100644 --- a/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java +++ b/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java @@ -15,8 +15,8 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.BreedingPitThrullToken; diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index fa46a42dd60..e66437a06a0 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java index 6b3f6f188d3..a5329812e5a 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java +++ b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java index dd0345c002b..4fd1af7f4bd 100644 --- a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java +++ b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java @@ -21,7 +21,7 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index 0ef3c0a62bf..dca5111e31b 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -19,7 +19,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java index aaed9259bc9..f7e40ecea7d 100644 --- a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java @@ -24,10 +24,9 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/t/TheWanderer.java b/Mage.Sets/src/mage/cards/t/TheWanderer.java index 12c10959e96..1b4a1bc002a 100644 --- a/Mage.Sets/src/mage/cards/t/TheWanderer.java +++ b/Mage.Sets/src/mage/cards/t/TheWanderer.java @@ -16,7 +16,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java index bdeb8121834..3effabdba55 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java +++ b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.ThopterColorlessToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java index 3fd6416614b..5020ada93e2 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java +++ b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java @@ -20,7 +20,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.ThopterColorlessToken; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/t/ThousandWinds.java b/Mage.Sets/src/mage/cards/t/ThousandWinds.java index 8a284b368f5..6d1fc4f2d4d 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandWinds.java +++ b/Mage.Sets/src/mage/cards/t/ThousandWinds.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** diff --git a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java index a1392c47b57..ae96a235cf3 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java +++ b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java @@ -17,7 +17,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java index 1a924963b78..e0a0e42685a 100644 --- a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java +++ b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java @@ -18,7 +18,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/Thundermare.java b/Mage.Sets/src/mage/cards/t/Thundermare.java index a4986b24c55..d25e51e23c7 100644 --- a/Mage.Sets/src/mage/cards/t/Thundermare.java +++ b/Mage.Sets/src/mage/cards/t/Thundermare.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/TideforceElemental.java b/Mage.Sets/src/mage/cards/t/TideforceElemental.java index 303c1c3f4e6..bf19b55ea2b 100644 --- a/Mage.Sets/src/mage/cards/t/TideforceElemental.java +++ b/Mage.Sets/src/mage/cards/t/TideforceElemental.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java b/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java index ef161eeda5d..61e0995a031 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TimberProtector.java b/Mage.Sets/src/mage/cards/t/TimberProtector.java index 4d99c51bcab..35ab5f860e8 100644 --- a/Mage.Sets/src/mage/cards/t/TimberProtector.java +++ b/Mage.Sets/src/mage/cards/t/TimberProtector.java @@ -17,7 +17,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/Timbermare.java b/Mage.Sets/src/mage/cards/t/Timbermare.java index cab292c920b..07b038c034d 100644 --- a/Mage.Sets/src/mage/cards/t/Timbermare.java +++ b/Mage.Sets/src/mage/cards/t/Timbermare.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/TimelyWard.java b/Mage.Sets/src/mage/cards/t/TimelyWard.java index 7aac35dac34..70e43418731 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyWard.java +++ b/Mage.Sets/src/mage/cards/t/TimelyWard.java @@ -14,7 +14,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/t/TimidDrake.java b/Mage.Sets/src/mage/cards/t/TimidDrake.java index db36a29e181..109c69a5f4a 100644 --- a/Mage.Sets/src/mage/cards/t/TimidDrake.java +++ b/Mage.Sets/src/mage/cards/t/TimidDrake.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/TomeOfLegends.java b/Mage.Sets/src/mage/cards/t/TomeOfLegends.java index a3f2e15a96f..35e6bf1f55b 100644 --- a/Mage.Sets/src/mage/cards/t/TomeOfLegends.java +++ b/Mage.Sets/src/mage/cards/t/TomeOfLegends.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.CommanderPredicate; +import mage.filter.predicate.mageobject.CommanderPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TorchCourier.java b/Mage.Sets/src/mage/cards/t/TorchCourier.java index 6730e16d8c4..d97f2b033fb 100644 --- a/Mage.Sets/src/mage/cards/t/TorchCourier.java +++ b/Mage.Sets/src/mage/cards/t/TorchCourier.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/t/TrailOfMystery.java b/Mage.Sets/src/mage/cards/t/TrailOfMystery.java index 8fcf6cd1240..396d2d8720a 100644 --- a/Mage.Sets/src/mage/cards/t/TrailOfMystery.java +++ b/Mage.Sets/src/mage/cards/t/TrailOfMystery.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TrainedCondor.java b/Mage.Sets/src/mage/cards/t/TrainedCondor.java index 8b365aae6c5..c07841354b1 100644 --- a/Mage.Sets/src/mage/cards/t/TrainedCondor.java +++ b/Mage.Sets/src/mage/cards/t/TrainedCondor.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/t/TranquilGrove.java b/Mage.Sets/src/mage/cards/t/TranquilGrove.java index bb1fa541c52..8e59930e7da 100644 --- a/Mage.Sets/src/mage/cards/t/TranquilGrove.java +++ b/Mage.Sets/src/mage/cards/t/TranquilGrove.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/t/TriadOfFates.java b/Mage.Sets/src/mage/cards/t/TriadOfFates.java index be701cb65e5..bcf55fefcfd 100644 --- a/Mage.Sets/src/mage/cards/t/TriadOfFates.java +++ b/Mage.Sets/src/mage/cards/t/TriadOfFates.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java b/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java index ced6663a908..55989f46f1b 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java @@ -24,7 +24,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierLifelinkToken; diff --git a/Mage.Sets/src/mage/cards/t/TurnAside.java b/Mage.Sets/src/mage/cards/t/TurnAside.java index 5276d737bf6..434b90d55d3 100644 --- a/Mage.Sets/src/mage/cards/t/TurnAside.java +++ b/Mage.Sets/src/mage/cards/t/TurnAside.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/cards/t/TurretOgre.java b/Mage.Sets/src/mage/cards/t/TurretOgre.java index 8a60e55e73d..4e46052f666 100644 --- a/Mage.Sets/src/mage/cards/t/TurretOgre.java +++ b/Mage.Sets/src/mage/cards/t/TurretOgre.java @@ -16,7 +16,7 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index 6a207c92dde..31cf77fb035 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -24,7 +24,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SaprolingToken; diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldTracker.java b/Mage.Sets/src/mage/cards/u/UlvenwaldTracker.java index ba822b5f05a..5eace8f7904 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldTracker.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldTracker.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/u/UnbenderTine.java b/Mage.Sets/src/mage/cards/u/UnbenderTine.java index 7f708320fdc..1e8b4484aa8 100644 --- a/Mage.Sets/src/mage/cards/u/UnbenderTine.java +++ b/Mage.Sets/src/mage/cards/u/UnbenderTine.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java b/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java index 3c919b4473f..739a1181e00 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java +++ b/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/u/UndercityScavenger.java b/Mage.Sets/src/mage/cards/u/UndercityScavenger.java index a985d82e089..22bf1616c12 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityScavenger.java +++ b/Mage.Sets/src/mage/cards/u/UndercityScavenger.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/u/UnrulyMob.java b/Mage.Sets/src/mage/cards/u/UnrulyMob.java index 84024dfa103..97add7d85cf 100644 --- a/Mage.Sets/src/mage/cards/u/UnrulyMob.java +++ b/Mage.Sets/src/mage/cards/u/UnrulyMob.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java index a005cd06a1d..9a6b24adad4 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java +++ b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.functions.EmptyCopyApplier; diff --git a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java index 616bd9c44ab..898f3d12812 100644 --- a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java +++ b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java @@ -21,7 +21,7 @@ import mage.constants.Outcome; import mage.filter.FilterStackObject; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java index 165d8404aa8..b0b6ee45b17 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java @@ -18,7 +18,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java index e9e1f5415fe..778c9361504 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java +++ b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java @@ -22,7 +22,7 @@ import mage.choices.ChoiceImpl; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/v/VictorysEnvoy.java b/Mage.Sets/src/mage/cards/v/VictorysEnvoy.java index e7ef5946adb..8f205787a91 100644 --- a/Mage.Sets/src/mage/cards/v/VictorysEnvoy.java +++ b/Mage.Sets/src/mage/cards/v/VictorysEnvoy.java @@ -11,7 +11,7 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java index 4865a6eb252..bad0fef4536 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java +++ b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.StaticFilters; -import mage.filter.predicate.other.TargetsPermanentPredicate; +import mage.filter.predicate.mageobject.TargetsPermanentPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/v/VindictiveLich.java b/Mage.Sets/src/mage/cards/v/VindictiveLich.java index bca605a1965..23608e37504 100644 --- a/Mage.Sets/src/mage/cards/v/VindictiveLich.java +++ b/Mage.Sets/src/mage/cards/v/VindictiveLich.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterOpponent; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.target.Target; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/v/VindictiveVampire.java b/Mage.Sets/src/mage/cards/v/VindictiveVampire.java index 617078741a3..858676e73c7 100644 --- a/Mage.Sets/src/mage/cards/v/VindictiveVampire.java +++ b/Mage.Sets/src/mage/cards/v/VindictiveVampire.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage.Sets/src/mage/cards/v/VirtussManeuver.java b/Mage.Sets/src/mage/cards/v/VirtussManeuver.java index 11e29ff4872..8a31c0587e9 100644 --- a/Mage.Sets/src/mage/cards/v/VirtussManeuver.java +++ b/Mage.Sets/src/mage/cards/v/VirtussManeuver.java @@ -17,7 +17,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java index 62d32be27b1..316131bcea3 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; /** diff --git a/Mage.Sets/src/mage/cards/v/VoidGrafter.java b/Mage.Sets/src/mage/cards/v/VoidGrafter.java index a64020de297..44f57c6e57a 100644 --- a/Mage.Sets/src/mage/cards/v/VoidGrafter.java +++ b/Mage.Sets/src/mage/cards/v/VoidGrafter.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java index 4cf90e5459b..09dbf6d09aa 100644 --- a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java +++ b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java @@ -17,7 +17,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java index 071c77d450c..658de83b6e1 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java +++ b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java @@ -20,7 +20,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.command.emblems.VraskaGolgariQueenEmblem; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheChained.java b/Mage.Sets/src/mage/cards/w/WardenOfTheChained.java index e91d79992da..fe71b3fd5f8 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheChained.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheChained.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java index 828f6625cef..951def8948a 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java @@ -16,7 +16,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java b/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java index 31db6a1d356..e811aefba93 100644 --- a/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java +++ b/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/w/WaywardServant.java b/Mage.Sets/src/mage/cards/w/WaywardServant.java index e861e268022..a3b6fb49d4f 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardServant.java +++ b/Mage.Sets/src/mage/cards/w/WaywardServant.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java index a7fe419fd27..d5c53665d30 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java @@ -18,7 +18,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java b/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java index 7af6ef83c17..fed421972e0 100644 --- a/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java +++ b/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index 80d41598119..c8fae8d52f5 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -16,7 +16,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.SharesCreatureTypePredicate; +import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java index 417c2d707b5..05e94095c1a 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java @@ -20,7 +20,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.FaceDownPredicate; +import mage.filter.predicate.card.FaceDownPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** diff --git a/Mage.Sets/src/mage/cards/w/WickedGuardian.java b/Mage.Sets/src/mage/cards/w/WickedGuardian.java index 927389b34e6..cb562cf9af9 100644 --- a/Mage.Sets/src/mage/cards/w/WickedGuardian.java +++ b/Mage.Sets/src/mage/cards/w/WickedGuardian.java @@ -11,7 +11,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java index 2a34ec63014..04608291c29 100644 --- a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java +++ b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java @@ -20,7 +20,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/w/WildwoodTracker.java b/Mage.Sets/src/mage/cards/w/WildwoodTracker.java index 28ab06ef891..80efe9ee458 100644 --- a/Mage.Sets/src/mage/cards/w/WildwoodTracker.java +++ b/Mage.Sets/src/mage/cards/w/WildwoodTracker.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/Willbender.java b/Mage.Sets/src/mage/cards/w/Willbender.java index 1e8247bb5b6..e5549ae89f6 100644 --- a/Mage.Sets/src/mage/cards/w/Willbender.java +++ b/Mage.Sets/src/mage/cards/w/Willbender.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterStackObject; -import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; +import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.target.TargetStackObject; /** diff --git a/Mage.Sets/src/mage/cards/w/WintermoorCommander.java b/Mage.Sets/src/mage/cards/w/WintermoorCommander.java index 4ebf50678ae..389a4b4c7bd 100644 --- a/Mage.Sets/src/mage/cards/w/WintermoorCommander.java +++ b/Mage.Sets/src/mage/cards/w/WintermoorCommander.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.TargetPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/WintersRest.java b/Mage.Sets/src/mage/cards/w/WintersRest.java index e133795cdf8..546d6443a72 100644 --- a/Mage.Sets/src/mage/cards/w/WintersRest.java +++ b/Mage.Sets/src/mage/cards/w/WintersRest.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java index 4a72125097d..50d849e6085 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.InsectToken; diff --git a/Mage.Sets/src/mage/cards/w/WispweaverAngel.java b/Mage.Sets/src/mage/cards/w/WispweaverAngel.java index 0fc98102cd4..cf28a17d89f 100644 --- a/Mage.Sets/src/mage/cards/w/WispweaverAngel.java +++ b/Mage.Sets/src/mage/cards/w/WispweaverAngel.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/WitchsCottage.java b/Mage.Sets/src/mage/cards/w/WitchsCottage.java index bf659a2d3b1..797d8eb2743 100644 --- a/Mage.Sets/src/mage/cards/w/WitchsCottage.java +++ b/Mage.Sets/src/mage/cards/w/WitchsCottage.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/w/Withdraw.java b/Mage.Sets/src/mage/cards/w/Withdraw.java index 1f09431e206..322a228deab 100644 --- a/Mage.Sets/src/mage/cards/w/Withdraw.java +++ b/Mage.Sets/src/mage/cards/w/Withdraw.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.filter.predicate.other.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/w/WizardMentor.java b/Mage.Sets/src/mage/cards/w/WizardMentor.java index 702482bd921..7b088e906bc 100644 --- a/Mage.Sets/src/mage/cards/w/WizardMentor.java +++ b/Mage.Sets/src/mage/cards/w/WizardMentor.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/w/WoeStrider.java b/Mage.Sets/src/mage/cards/w/WoeStrider.java index 88b5e5e173a..25828d07f55 100644 --- a/Mage.Sets/src/mage/cards/w/WoeStrider.java +++ b/Mage.Sets/src/mage/cards/w/WoeStrider.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.GoatToken; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/w/WolverineRiders.java b/Mage.Sets/src/mage/cards/w/WolverineRiders.java index 8c1143ca0c1..bfe059cd22a 100644 --- a/Mage.Sets/src/mage/cards/w/WolverineRiders.java +++ b/Mage.Sets/src/mage/cards/w/WolverineRiders.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ElfWarriorToken; diff --git a/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java b/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java index 81f435b6577..0681c9ad256 100644 --- a/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java +++ b/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java index c3e8b176ec0..b86c549b73d 100644 --- a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java +++ b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java @@ -21,7 +21,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.PermanentToken; diff --git a/Mage.Sets/src/mage/cards/w/WormfangDrake.java b/Mage.Sets/src/mage/cards/w/WormfangDrake.java index 38f5943c8d5..3d839dddab0 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangDrake.java +++ b/Mage.Sets/src/mage/cards/w/WormfangDrake.java @@ -19,7 +19,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/w/WormfangNewt.java b/Mage.Sets/src/mage/cards/w/WormfangNewt.java index e1db3ff284a..cffc8262179 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangNewt.java +++ b/Mage.Sets/src/mage/cards/w/WormfangNewt.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java index 43301bfabc7..2b79abb22f7 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java +++ b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/w/WretchedAnurid.java b/Mage.Sets/src/mage/cards/w/WretchedAnurid.java index 42819f66cf2..618a35ee8fc 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedAnurid.java +++ b/Mage.Sets/src/mage/cards/w/WretchedAnurid.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java index 45b5279a172..2acdaa76228 100644 --- a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java @@ -15,11 +15,10 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.stack.StackObject; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/x/XathridDemon.java b/Mage.Sets/src/mage/cards/x/XathridDemon.java index 609a69d9aae..503eae7aa9c 100644 --- a/Mage.Sets/src/mage/cards/x/XathridDemon.java +++ b/Mage.Sets/src/mage/cards/x/XathridDemon.java @@ -17,7 +17,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java index e0e485e3bb0..d1b0519ab7c 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java +++ b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java b/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java index a0f527cdec4..c0f1d664a7e 100644 --- a/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java +++ b/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java index 4b86ae3aaee..f1d3a4b06da 100644 --- a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java +++ b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java @@ -22,7 +22,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.command.emblems.YodaEmblem; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java index 64227c7db51..f7655b7cab3 100644 --- a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java +++ b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/y/YorionSkyNomad.java b/Mage.Sets/src/mage/cards/y/YorionSkyNomad.java index b808b8c6162..a25c2e61cbf 100644 --- a/Mage.Sets/src/mage/cards/y/YorionSkyNomad.java +++ b/Mage.Sets/src/mage/cards/y/YorionSkyNomad.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentMeld; diff --git a/Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java b/Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java index 00df41a828a..a7e73119e4c 100644 --- a/Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java +++ b/Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java @@ -14,7 +14,7 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/y/YouthfulValkyrie.java b/Mage.Sets/src/mage/cards/y/YouthfulValkyrie.java index 34367405b76..86aa57f3429 100644 --- a/Mage.Sets/src/mage/cards/y/YouthfulValkyrie.java +++ b/Mage.Sets/src/mage/cards/y/YouthfulValkyrie.java @@ -11,7 +11,7 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java b/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java index 6f9caa8dcfd..e4e3b1a2199 100644 --- a/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java +++ b/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.UnblockedPredicate; import mage.game.Game; import mage.game.events.DamagedEvent; diff --git a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java index 44f82c559ee..3056f65c7a6 100644 --- a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java +++ b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java @@ -15,7 +15,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java index cda76f02e03..d63ee87cd86 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java index 7603da58232..68bcb34ffda 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java @@ -6,7 +6,7 @@ import mage.abilities.effects.Effect; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/MeldCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MeldCondition.java index 603d43cc69f..a0a3f552d20 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/MeldCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/MeldCondition.java @@ -6,7 +6,7 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java index 37921cb89f9..66c0873e2c1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java @@ -8,7 +8,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; -import mage.filter.predicate.mageobject.FromSetPredicate; +import mage.filter.predicate.other.FromSetPredicate; import mage.game.Game; import mage.game.events.CopiedStackObjectEvent; import mage.game.stack.Spell; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java index 42afec4095a..459df5ba064 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java @@ -7,7 +7,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java index 86bb3d81429..e81d2526dea 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java @@ -10,7 +10,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; +import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java index ee8a5f517a0..c0e785dd9af 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java @@ -22,7 +22,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java index f569d074c04..f4a009a3cfd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java @@ -7,7 +7,7 @@ import mage.cards.Card; import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index 5eae2caeac2..d09693c89e8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -14,7 +14,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java index 63fec0c7187..11561359cd2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java @@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.keyword.SupportEffect; import mage.cards.Card; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 566db4eac9f..089357b3b82 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -8,7 +8,7 @@ import mage.filter.common.*; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.KickedSpellPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.TokenPredicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java b/Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToLKIPermanentId.java similarity index 96% rename from Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToLKIPermanentId.java index 9f4f7040d04..202b421c8ce 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToLKIPermanentId.java @@ -1,6 +1,6 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import java.util.UUID; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToPermanentId.java similarity index 97% rename from Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToPermanentId.java index 54d3c490ed4..f8d5b2e490c 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToPermanentId.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import java.util.UUID; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/card/CardCanTargetPermanentId.java similarity index 95% rename from Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/card/CardCanTargetPermanentId.java index d87cb515c73..e20266c45a2 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CardCanTargetPermanentId.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import java.util.UUID; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/CardOnTopOfLibraryPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java similarity index 94% rename from Mage/src/main/java/mage/filter/predicate/mageobject/CardOnTopOfLibraryPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java index f423c5552ac..6024ed0c905 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/CardOnTopOfLibraryPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.card; import mage.cards.Card; import mage.filter.predicate.ObjectPlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java similarity index 99% rename from Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java index 33b78bcb933..e081b02ff50 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import mage.cards.AdventureCard; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/other/CastFromZonePredicate.java b/Mage/src/main/java/mage/filter/predicate/card/CastFromZonePredicate.java similarity index 96% rename from Mage/src/main/java/mage/filter/predicate/other/CastFromZonePredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/CastFromZonePredicate.java index fa684cf8ac2..c4fe12860c0 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CastFromZonePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CastFromZonePredicate.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import mage.cards.Card; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java similarity index 93% rename from Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java index b16b59b3b81..b4eeb609e5b 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.permanent; +package mage.filter.predicate.card; import mage.cards.Card; import mage.filter.predicate.ObjectPlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/ExpansionSetPredicate.java similarity index 93% rename from Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/ExpansionSetPredicate.java index fbe4966edda..6afe314eed2 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/ExpansionSetPredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import mage.cards.Card; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/FaceDownCastablePredicate.java b/Mage/src/main/java/mage/filter/predicate/card/FaceDownCastablePredicate.java similarity index 93% rename from Mage/src/main/java/mage/filter/predicate/other/FaceDownCastablePredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/FaceDownCastablePredicate.java index e7d3d55f5b3..61f7fee6605 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/FaceDownCastablePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/FaceDownCastablePredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import mage.abilities.keyword.MorphAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/FaceDownPredicate.java similarity index 91% rename from Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/FaceDownPredicate.java index 47caf232580..69ae289397e 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/FaceDownPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import mage.cards.Card; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/OwnerIdPredicate.java similarity index 93% rename from Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/card/OwnerIdPredicate.java index 15c2a46491c..dce85dc3e4d 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/OwnerIdPredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.card; import java.util.UUID; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java similarity index 92% rename from Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java index b0f42114f27..1c104eb326e 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.permanent; +package mage.filter.predicate.mageobject; import mage.MageObject; import mage.filter.predicate.ObjectSourcePlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/CommanderPredicate.java similarity index 92% rename from Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/CommanderPredicate.java index dc4dd234bcb..2608bcecc8b 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/CommanderPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.permanent; +package mage.filter.predicate.mageobject; import mage.MageObject; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/SharesCreatureTypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesCreatureTypePredicate.java similarity index 92% rename from Mage/src/main/java/mage/filter/predicate/permanent/SharesCreatureTypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/SharesCreatureTypePredicate.java index 59b22fa7434..636bf584d24 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/SharesCreatureTypePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesCreatureTypePredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.permanent; +package mage.filter.predicate.mageobject; import mage.MageObject; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java similarity index 97% rename from Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java index 7d5a6820d22..ce14cf21dce 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package mage.filter.predicate.other; +package mage.filter.predicate.mageobject; import java.util.UUID; import mage.MageObject; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java similarity index 97% rename from Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java index a78546f22e0..5b6cfe3714b 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.mageobject; import mage.MageObject; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java similarity index 97% rename from Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java index 45abc29cf3f..8037d33b742 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package mage.filter.predicate.other; +package mage.filter.predicate.mageobject; import java.util.UUID; import mage.MageObject; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java similarity index 98% rename from Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java index ee93a32a909..5383ed5731e 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.other; import java.util.UUID; import mage.MageItem; diff --git a/Mage/src/main/java/mage/filter/predicate/ability/ArtifactSourcePredicate.java b/Mage/src/main/java/mage/filter/predicate/other/ArtifactSourcePredicate.java similarity index 94% rename from Mage/src/main/java/mage/filter/predicate/ability/ArtifactSourcePredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/ArtifactSourcePredicate.java index e5deb8194e2..f9b91af2036 100644 --- a/Mage/src/main/java/mage/filter/predicate/ability/ArtifactSourcePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/ArtifactSourcePredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.ability; +package mage.filter.predicate.other; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java similarity index 98% rename from Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java index 3fb4305a6b5..c45dc5815c3 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.permanent; +package mage.filter.predicate.other; import mage.constants.TargetController; import mage.filter.predicate.ObjectPlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/FromSetPredicate.java similarity index 91% rename from Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/FromSetPredicate.java index 0acf3d1faa5..1393761af93 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/FromSetPredicate.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.other; import java.util.Set; import java.util.UUID; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/NumberOfTargetsPredicate.java similarity index 96% rename from Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/NumberOfTargetsPredicate.java index 97cfe4d37ff..8236bb12852 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/NumberOfTargetsPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.other; import java.util.UUID; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java deleted file mode 100644 index 46b073d965a..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java +++ /dev/null @@ -1,36 +0,0 @@ - -package mage.filter.predicate.other; - -import java.util.UUID; -import mage.filter.predicate.Predicate; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.target.Target; - -/** - * - * @author LevelIX - */ -public class PermanentCanTargetPermanentId implements Predicate { - - private final UUID toBeCheckedPermanentId; - - public PermanentCanTargetPermanentId(UUID toBeCheckedPermanentId) { - this.toBeCheckedPermanentId = toBeCheckedPermanentId; - } - - @Override - public boolean apply(Permanent input, Game game) { - for (Target target : input.getSpellAbility().getTargets()) { - if (target.canTarget(toBeCheckedPermanentId, input.getSpellAbility(), game)) { - return true; - } - } - return false; - } - - @Override - public String toString() { - return "PermanentCanTargetPermanentId(" + toBeCheckedPermanentId + ')'; - } -} \ No newline at end of file diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/AttachmentAttachedToCardTypePredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachmentAttachedToCardTypePredicate.java similarity index 95% rename from Mage/src/main/java/mage/filter/predicate/mageobject/AttachmentAttachedToCardTypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/AttachmentAttachedToCardTypePredicate.java index 943a49d467f..fdafeffdaf6 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AttachmentAttachedToCardTypePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachmentAttachedToCardTypePredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.permanent; import mage.constants.CardType; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/permanent/AuraPermanentCanAttachToPermanentId.java similarity index 96% rename from Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/permanent/AuraPermanentCanAttachToPermanentId.java index a52633c2b56..3f0c69acebf 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AuraPermanentCanAttachToPermanentId.java @@ -1,5 +1,5 @@ -package mage.filter.predicate.other; +package mage.filter.predicate.permanent; import java.util.UUID; import mage.filter.Filter; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/EnchantmentOrEnchantedPredicate.java similarity index 95% rename from Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/EnchantmentOrEnchantedPredicate.java index ab282fc21a1..a37ee68d4dc 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/EnchantmentOrEnchantedPredicate.java @@ -1,4 +1,4 @@ -package mage.filter.predicate.mageobject; +package mage.filter.predicate.permanent; import mage.constants.SubType; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index 50e8f0c1500..7965e2b21b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -13,7 +13,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/target/common/TargetDiscard.java b/Mage/src/main/java/mage/target/common/TargetDiscard.java index a88be8445f9..0fe0fe718af 100644 --- a/Mage/src/main/java/mage/target/common/TargetDiscard.java +++ b/Mage/src/main/java/mage/target/common/TargetDiscard.java @@ -10,7 +10,7 @@ import mage.target.TargetCard; import java.util.UUID; import mage.filter.StaticFilters; -import mage.filter.predicate.other.OwnerIdPredicate; +import mage.filter.predicate.card.OwnerIdPredicate; /** *