* Changed all references to EmptyEffect.

Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java

@@ -31,7 +31,6 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.StateTriggeredAbility;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SkipUntapOptionalAbility;
 import mage.abilities.condition.CompoundCondition;
@@ -39,6 +38,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.SourceTappedCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.GainControlTargetEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -126,7 +126,7 @@ result is save to a state value to be available for the condition of the continu
 class OldManOfTheSeaStateBasedTriggeredAbility extends StateTriggeredAbility {
 
     public OldManOfTheSeaStateBasedTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new EmptyEffect(""));
+        super(Zone.BATTLEFIELD, new InfoEffect(""));
         this.setRuleVisible(false);
         this.usesStack = false;
     }

Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java

@@ -31,9 +31,9 @@ package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.BoostAllEffect;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
@@ -69,7 +69,7 @@ public class KondasBanner extends CardImpl {
         this.subtype.add("Equipment");
 
         // Konda's Banner can be attached only to a legendary creature.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect("{this} can be attached only to a legendary creature")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("{this} can be attached only to a legendary creature")));
 
         // Creatures that share a color with equipped creature get +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerColorBoostEffect()));

Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java

@@ -29,13 +29,13 @@ package mage.sets.coldsnap;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.DiscardTargetCost;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
@@ -71,7 +71,7 @@ public class LightningStorm extends CardImpl {
                 new LightningStormAddCounterEffect() ,
                 new DiscardTargetCost(new TargetCardInHand(new FilterLandCard())));
         ability.setMayActivate(TargetController.ANY);
-        ability.addEffect(new EmptyEffect("Any player may activate this ability but only if {this} is on the stack"));
+        ability.addEffect(new InfoEffect("Any player may activate this ability but only if {this} is on the stack"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/commander2013/OpalPalace.java

@@ -30,21 +30,15 @@ package mage.sets.commander2013;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.ReplacementEffectImpl;
-import mage.abilities.effects.common.ManaEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.abilities.mana.CommanderColorIdentityManaAbility;
-import mage.abilities.mana.ManaAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
-import mage.choices.Choice;
-import mage.choices.ChoiceImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;

Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java

@@ -27,23 +27,24 @@
  */
 package mage.sets.darkascension;
 
-import mage.constants.CardType;
+import java.util.UUID;
-import mage.constants.Rarity;
 import mage.MageInt;
 import mage.abilities.TriggeredAbility;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.keyword.TransformAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 
-import java.util.UUID;
+
 
 /**
  *
@@ -70,7 +71,7 @@ public class RavagerOfTheFells extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Whenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect(rule)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect(rule)));
 
         // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ravager of the Fells.
         TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false);

Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java

@@ -35,11 +35,11 @@ import mage.abilities.Ability;
 import mage.abilities.TriggeredAbility;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.keyword.TransformAbility;
 import mage.cards.CardImpl;
@@ -72,7 +72,7 @@ public class WerewolfRansacker extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Whenever this creature transforms into Werewolf Ransacker, you may destroy target artifact. If that artifact is put into a graveyard this way, Werewolf Ransacker deals 3 damage to that artifact's controller.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect(WerewolfRansackerAbility.RULE_TEXT)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect(WerewolfRansackerAbility.RULE_TEXT)));
 
         // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Werewolf Ransacker.
         TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false);

Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java

@@ -30,12 +30,12 @@ package mage.sets.journeyintonyx;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.common.DevotionCount;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect;
 import mage.abilities.keyword.IndestructibleAbility;
 import mage.cards.Card;
@@ -99,7 +99,7 @@ class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl {
     private int lastTriggeredTurn;
     
     KeranosGodOfStormsTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new EmptyEffect(""), false);
+        super(Zone.BATTLEFIELD, new InfoEffect(""), false);
     }
 
     KeranosGodOfStormsTriggeredAbility(final KeranosGodOfStormsTriggeredAbility ability) {

Mage.Sets/src/mage/sets/khansoftarkir/GhostfireBlade.java

@@ -29,9 +29,9 @@ package mage.sets.khansoftarkir;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
@@ -61,7 +61,7 @@ public class GhostfireBlade extends CardImpl {
         this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3)));
 
         // Ghostfire Blade's equip ability costs {2} less to activate if it targets a colorless creature.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect("{this}'s equip ability costs {2} less to activate if it targets a colorless creature")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("{this}'s equip ability costs {2} less to activate if it targets a colorless creature")));
     }
   @Override
     public void adjustCosts(Ability ability, Game game) {

Mage.Sets/src/mage/sets/lorwyn/OonasProwler.java

@@ -29,10 +29,9 @@ package mage.sets.lorwyn;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.DiscardCardCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -41,7 +40,6 @@ import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.counters.CounterType;
 
 /**
  *
@@ -64,7 +62,7 @@ public class OonasProwler extends CardImpl {
         // Discard a card: Oona's Prowler gets -2/-0 until end of turn. Any player may activate this ability.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-2,-0, Duration.EndOfTurn) , new DiscardCardCost());
         ability.setMayActivate(TargetController.ANY);
-        ability.addEffect(new EmptyEffect("Any player may activate this ability"));
+        ability.addEffect(new InfoEffect("Any player may activate this ability"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java

@@ -30,12 +30,11 @@ package mage.sets.odyssey;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -65,7 +64,7 @@ public class DiligentFarmhand extends CardImpl {
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
         // If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst.
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new EmptyEffect("If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst")));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst")));
     }
 
     public DiligentFarmhand(final DiligentFarmhand card) {

Mage.Sets/src/mage/sets/saviorsofkamigawa/Evermind.java

@@ -29,9 +29,9 @@ package mage.sets.saviorsofkamigawa;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.keyword.SpliceOntoArcaneAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -52,7 +52,7 @@ public class Evermind extends CardImpl {
         this.color.setBlue(true);
 
         // <i>(Nonexistent mana costs can't be paid.)</i>
-        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect("<i>(Nonexistent mana costs can't be paid.)</i>"));
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("<i>(Nonexistent mana costs can't be paid.)</i>"));
         ability.setRuleAtTheTop(true);
         this.addAbility(ability);
 

Mage.Sets/src/mage/sets/saviorsofkamigawa/ONaginata.java

@@ -29,10 +29,10 @@ package mage.sets.saviorsofkamigawa;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EquipAbility;
@@ -66,7 +66,7 @@ public class ONaginata extends CardImpl {
         this.subtype.add("Equipment");
 
         // O-Naginata can be attached only to a creature with 3 or more power.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect("{this} can be attached only to a creature with 3 or more power")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("{this} can be attached only to a creature with 3 or more power")));
         
         // Equipped creature gets +3/+0 and has trample.
         Effect effect = new BoostEquippedEffect(3, 0);

Mage.Sets/src/mage/sets/seventhedition/Rowen.java

@@ -29,8 +29,8 @@ package mage.sets.seventhedition;
 
 import java.util.UUID;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardsImpl;
@@ -73,7 +73,7 @@ class RowenAbility extends TriggeredAbilityImpl {
     private int lastTriggeredTurn;
 
     RowenAbility() {
-        super(Zone.BATTLEFIELD, new EmptyEffect(""), false);
+        super(Zone.BATTLEFIELD, new InfoEffect(""), false);
     }
 
     RowenAbility(final RowenAbility ability) {

Mage.Sets/src/mage/sets/shardsofalara/FeralHydra.java

@@ -28,18 +28,22 @@
 package mage.sets.shardsofalara;
 
 import java.util.UUID;
-
+import static javax.xml.bind.JAXBIntrospector.getValue;
-import mage.constants.*;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.SpellAbility;
-import mage.abilities.common.EmptyEffect;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -65,7 +69,7 @@ public class FeralHydra extends CardImpl {
         // {3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()) , new ManaCostsImpl("{3}"));
         ability.setMayActivate(TargetController.ANY);
-        ability.addEffect(new EmptyEffect("Any player may activate this ability"));
+        ability.addEffect(new InfoEffect("Any player may activate this ability"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java

@@ -33,7 +33,7 @@ import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.common.EmptyEffect;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.constants.Duration;
@@ -77,7 +77,7 @@ public class Manaplasm extends CardImpl {
 class ManaplasmAbility extends TriggeredAbilityImpl {
 
     public ManaplasmAbility() {
-        super(Zone.BATTLEFIELD, new EmptyEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false);
+        super(Zone.BATTLEFIELD, new InfoEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false);
     }
 
 

Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java

@@ -29,15 +29,15 @@
 package mage.sets.shardsofalara;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.ExileTargetForSourceEffect;
 import mage.abilities.effects.common.ReturnFromExileForSourceEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.common.FilterNonlandPermanent;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.target.Target;
@@ -58,7 +58,6 @@ public class OblivionRing extends CardImpl {
     public OblivionRing(UUID ownerId) {
         super(ownerId, 20, "Oblivion Ring", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
         this.expansionSetCode = "ALA";
-        this.color.setWhite(true);
 
         // When Oblivion Ring enters the battlefield, exile another target nonland permanent.
         Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false);