External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 13:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: correct predicate packages

Browse source
This commit is contained in:
Oleg Agafonov 2021-02-21 08:00:21 +04:00
parent d343511d73
commit 2dfde7f41a
766 changed files with 771 additions and 830 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/condition/common/MeldCondition.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java
View file

@ -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;

2
Mage/src/main/java/mage/abilities/keyword/SupportAbility.java
View file

@ -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;
/**

2
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -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;

2
Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java → Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToLKIPermanentId.java
View file

@ -1,6 +1,6 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import java.util.UUID;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java → Mage/src/main/java/mage/filter/predicate/card/AuraCardCanAttachToPermanentId.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import java.util.UUID;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java → Mage/src/main/java/mage/filter/predicate/card/CardCanTargetPermanentId.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import java.util.UUID;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/mageobject/CardOnTopOfLibraryPredicate.java → Mage/src/main/java/mage/filter/predicate/card/CardOnTopOfLibraryPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.card;
import mage.cards.Card;
import mage.filter.predicate.ObjectPlayer;

2
Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java → Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import mage.cards.AdventureCard;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/other/CastFromZonePredicate.java → Mage/src/main/java/mage/filter/predicate/card/CastFromZonePredicate.java
View file

@ -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;

2
Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java → Mage/src/main/java/mage/filter/predicate/card/DefendingPlayerOwnsCardPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.permanent;
package mage.filter.predicate.card;
import mage.cards.Card;
import mage.filter.predicate.ObjectPlayer;

2
Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java → Mage/src/main/java/mage/filter/predicate/card/ExpansionSetPredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import mage.cards.Card;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/filter/predicate/other/FaceDownCastablePredicate.java → Mage/src/main/java/mage/filter/predicate/card/FaceDownCastablePredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import mage.abilities.keyword.MorphAbility;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java → Mage/src/main/java/mage/filter/predicate/card/FaceDownPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import mage.cards.Card;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java → Mage/src/main/java/mage/filter/predicate/card/OwnerIdPredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.other;
package mage.filter.predicate.card;
import java.util.UUID;
import mage.cards.Card;

2
Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/AnotherPredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.permanent;
package mage.filter.predicate.mageobject;
import mage.MageObject;
import mage.filter.predicate.ObjectSourcePlayer;

2
Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/CommanderPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.permanent;
package mage.filter.predicate.mageobject;
import mage.MageObject;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/filter/predicate/permanent/SharesCreatureTypePredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/SharesCreatureTypePredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.permanent;
package mage.filter.predicate.mageobject;
import mage.MageObject;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/TargetsOnlyOnePlayerPredicate.java
View file

@ -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;

2
Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPermanentPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.other;
package mage.filter.predicate.mageobject;
import mage.MageObject;
import mage.abilities.Mode;

2
Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java → Mage/src/main/java/mage/filter/predicate/mageobject/TargetsPlayerPredicate.java
View file

@ -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;

2
Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java → Mage/src/main/java/mage/filter/predicate/other/AnotherTargetPredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.other;
import java.util.UUID;
import mage.MageItem;

2
Mage/src/main/java/mage/filter/predicate/ability/ArtifactSourcePredicate.java → Mage/src/main/java/mage/filter/predicate/other/ArtifactSourcePredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.ability;
package mage.filter.predicate.other;
import mage.filter.predicate.Predicate;
import mage.game.Game;

2
Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java → Mage/src/main/java/mage/filter/predicate/other/DamagedPlayerThisTurnPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.permanent;
package mage.filter.predicate.other;
import mage.constants.TargetController;
import mage.filter.predicate.ObjectPlayer;

2
Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java → Mage/src/main/java/mage/filter/predicate/other/FromSetPredicate.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.other;
import java.util.Set;
import java.util.UUID;

2
Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java → Mage/src/main/java/mage/filter/predicate/other/NumberOfTargetsPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.other;
import java.util.UUID;
import mage.abilities.Mode;

36
Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java
View file

@ -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<Permanent> {
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 + ')';
}
}

2
Mage/src/main/java/mage/filter/predicate/mageobject/AttachmentAttachedToCardTypePredicate.java → Mage/src/main/java/mage/filter/predicate/permanent/AttachmentAttachedToCardTypePredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.permanent;
import mage.constants.CardType;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java → Mage/src/main/java/mage/filter/predicate/permanent/AuraPermanentCanAttachToPermanentId.java
View file

@ -1,5 +1,5 @@
package mage.filter.predicate.other;
package mage.filter.predicate.permanent;
import java.util.UUID;
import mage.filter.Filter;

2
Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java → Mage/src/main/java/mage/filter/predicate/permanent/EnchantmentOrEnchantedPredicate.java
View file

@ -1,4 +1,4 @@
package mage.filter.predicate.mageobject;
package mage.filter.predicate.permanent;
import mage.constants.SubType;
import mage.filter.predicate.Predicate;

2
Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
View file

@ -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;

2
Mage/src/main/java/mage/target/common/TargetDiscard.java
View file

@ -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;
/**
*