rewrote singleton to enum where applicable

Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java

@@ -40,14 +40,14 @@ import mage.constants.Zone;
 
 public class CanBeYourCommanderAbility extends StaticAbility implements MageSingleton {
 
-    private static final CanBeYourCommanderAbility fINSTANCE =  new CanBeYourCommanderAbility();
+    private static final CanBeYourCommanderAbility instance =  new CanBeYourCommanderAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static CanBeYourCommanderAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private CanBeYourCommanderAbility() {
@@ -56,7 +56,7 @@ public class CanBeYourCommanderAbility extends StaticAbility implements MageSing
 
     @Override
     public CanBeYourCommanderAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java

@@ -40,14 +40,14 @@ import mage.constants.Zone;
  */
 public class DamageAsThoughNotBlockedAbility extends StaticAbility implements MageSingleton {
 
-    private static final DamageAsThoughNotBlockedAbility fINSTANCE =  new DamageAsThoughNotBlockedAbility();
+    private static final DamageAsThoughNotBlockedAbility instance =  new DamageAsThoughNotBlockedAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static DamageAsThoughNotBlockedAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private DamageAsThoughNotBlockedAbility() {
@@ -61,7 +61,7 @@ public class DamageAsThoughNotBlockedAbility extends StaticAbility implements Ma
 
     @Override
     public DamageAsThoughNotBlockedAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/condition/common/AfterBlockersAreDeclaredCondition.java

@@ -16,13 +16,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class AfterBlockersAreDeclaredCondition implements Condition {
+public enum AfterBlockersAreDeclaredCondition implements Condition {
 
-    private static final AfterBlockersAreDeclaredCondition fInstance = new AfterBlockersAreDeclaredCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/AfterUpkeepStepCondtion.java

@@ -13,15 +13,11 @@ import mage.game.Game;
 /**
  * @author LevelX2
  */
-public class AfterUpkeepStepCondtion implements Condition {
-
-    private static final AfterUpkeepStepCondtion fInstance = new AfterUpkeepStepCondtion();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+public enum AfterUpkeepStepCondtion implements Condition {
 
+    instance;
     @Override
+
     public boolean apply(Game game, Ability source) {
         return game.getStep().getType().isAfter(PhaseStep.UPKEEP);
     }

Mage/src/main/java/mage/abilities/condition/common/AttachedCondition.java

@@ -9,13 +9,9 @@ import mage.game.permanent.Permanent;
  *
  * @author Quercitron
  */
-public class AttachedCondition implements Condition {
+public enum AttachedCondition implements Condition {
 
-    private static final AttachedCondition fInstance = new AttachedCondition();
-
-    public static AttachedCondition getInstance() {
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/AttachedToTappedCondition.java

@@ -34,16 +34,11 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 
 /**
- *
  * @author LevelX2
  */
-public class AttachedToTappedCondition implements Condition {
+public enum AttachedToTappedCondition implements Condition {
+    instance;
 
-    private static final AttachedToTappedCondition fInstance = new AttachedToTappedCondition();
-
-    public static AttachedToTappedCondition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/AttackedOrBlockedThisCombatSourceCondition.java

@@ -16,13 +16,9 @@ import mage.watchers.common.AttackedOrBlockedThisCombatWatcher;
  *
  * @author LevelX2
  */
-public class AttackedOrBlockedThisCombatSourceCondition implements Condition {
+public enum AttackedOrBlockedThisCombatSourceCondition implements Condition {
 
-    private static final AttackedOrBlockedThisCombatSourceCondition fInstance = new AttackedOrBlockedThisCombatSourceCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/BeforeAttackersAreDeclaredCondition.java

@@ -13,14 +13,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class BeforeAttackersAreDeclaredCondition implements Condition {
-
-    private static final BeforeAttackersAreDeclaredCondition fInstance = new BeforeAttackersAreDeclaredCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+public enum BeforeAttackersAreDeclaredCondition implements Condition {
 
+    instance;
     @Override
     public boolean apply(Game game, Ability source) {
         return !game.getTurn().isDeclareAttackersStepStarted();

Mage/src/main/java/mage/abilities/condition/common/BeforeBlockersAreDeclaredCondition.java

@@ -18,10 +18,10 @@ import mage.game.Game;
  */
 public class BeforeBlockersAreDeclaredCondition implements Condition {
 
-    private static final BeforeBlockersAreDeclaredCondition fInstance = new BeforeBlockersAreDeclaredCondition();
+    private static final BeforeBlockersAreDeclaredCondition instance = new BeforeBlockersAreDeclaredCondition();
 
     public static Condition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java

@@ -41,16 +41,16 @@ import mage.players.Player;
  */
 public class CommanderInPlayCondition implements Condition {
 
-    private static CommanderInPlayCondition fInstance = null;
+    private static CommanderInPlayCondition instance = null;
 
     private CommanderInPlayCondition() {
     }
 
     public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new CommanderInPlayCondition();
+        if (instance == null) {
+            instance = new CommanderInPlayCondition();
         }
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java

@@ -43,15 +43,11 @@ import mage.game.permanent.Permanent;
  *
  * @author noxx
  */
-public class ControlsCreatureGreatestPowerCondition implements Condition {
-
-    private static final ControlsCreatureGreatestPowerCondition fInstance = new ControlsCreatureGreatestPowerCondition();
+public enum ControlsCreatureGreatestPowerCondition implements Condition {
 
+    instance;
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
-    public static Condition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java

@@ -43,16 +43,11 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class ControlsCreatureGreatestToughnessCondition implements Condition {
-
-    private static final ControlsCreatureGreatestToughnessCondition fInstance = new ControlsCreatureGreatestToughnessCondition();
+public enum ControlsCreatureGreatestToughnessCondition implements Condition {
 
+    instance;
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
-    public static Condition getInstance() {
-        return fInstance;
-    }
-
     @Override
     public boolean apply(Game game, Ability source) {
         Set<UUID> controllers = new HashSet<>();

Mage/src/main/java/mage/abilities/condition/common/DashedCondition.java

@@ -34,30 +34,20 @@ import mage.cards.Card;
 import mage.game.Game;
 
 /**
- *
  * @author LevelX2
  */
 
-public class DashedCondition implements Condition {
+public enum DashedCondition implements Condition {
 
-    private static DashedCondition fInstance = null;
-
-    private DashedCondition() {}
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new DashedCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {
         Card card = game.getCard(source.getSourceId());
         if (card != null) {
-            for (Ability ability: card.getAbilities()) {
+            for (Ability ability : card.getAbilities()) {
                 if (ability instanceof DashAbility) {
-                    if(((DashAbility) ability).isActivated(source, game)) {
+                    if (((DashAbility) ability).isActivated(source, game)) {
                         return true;
                     }
                 }

Mage/src/main/java/mage/abilities/condition/common/DeliriumCondition.java

@@ -27,6 +27,7 @@
  */
 package mage.abilities.condition.common;
 
+import java.util.EnumSet;
 import java.util.HashSet;
 import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
@@ -40,24 +41,19 @@ import mage.players.Player;
  *
  * @author fireshoes
  */
-public class DeliriumCondition implements Condition {
+public enum DeliriumCondition implements Condition {
 
-    private final static DeliriumCondition INSTANCE = new DeliriumCondition();
-
-    public static Condition getInstance() {
-        return INSTANCE;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            HashSet<CardType> foundCardTypes = new HashSet<>();
+            EnumSet<CardType> foundCardTypes = EnumSet.noneOf(CardType.class);
             for (Card card : controller.getGraveyard().getCards(game)) {
                 foundCardTypes.addAll(card.getCardType());
             }
-            int number = foundCardTypes.size();
-            return number > 3;
+            return foundCardTypes.size() >= 4;
         }
         return false;
     }

Mage/src/main/java/mage/abilities/condition/common/EnchantedTargetCondition.java

@@ -1,6 +1,7 @@
 package mage.abilities.condition.common;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.constants.CardType;
@@ -9,16 +10,11 @@ import mage.game.permanent.Permanent;
 import mage.target.Target;
 
 /**
- *
  * @author Jeff
  */
-public class EnchantedTargetCondition implements Condition {
+public enum EnchantedTargetCondition implements Condition {
 
-    private static final EnchantedTargetCondition fInstance = new EnchantedTargetCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/EquipmentAttachedCondition.java

@@ -38,13 +38,9 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class EquipmentAttachedCondition implements Condition {
+public enum EquipmentAttachedCondition implements Condition {
 
-    private static final EquipmentAttachedCondition fInstance = new EquipmentAttachedCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java

@@ -40,10 +40,10 @@ import mage.game.permanent.Permanent;
  */
 public class EquippedSourceCondition implements Condition {
 
-    private static final EquippedSourceCondition fInstance = new EquippedSourceCondition();
+    private static final EquippedSourceCondition instance = new EquippedSourceCondition();
 
     public static Condition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/EvokedCondition.java

@@ -40,18 +40,9 @@ import mage.game.Game;
  * @author LevelX2
  */
 
-public class EvokedCondition implements Condition {
+public enum EvokedCondition implements Condition {
 
-    private static EvokedCondition fInstance = null;
-
-    private EvokedCondition() {}
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new EvokedCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/FaceDownSourceCondition.java

@@ -39,13 +39,9 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class FaceDownSourceCondition implements Condition {
+public enum FaceDownSourceCondition implements Condition {
 
-    private final static FaceDownSourceCondition fInstance = new FaceDownSourceCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/FatefulHourCondition.java

@@ -8,12 +8,8 @@ import mage.players.Player;
 /**
  * @author Loki
  */
-public class FatefulHourCondition implements Condition {
-    private static FatefulHourCondition fInstance = new FatefulHourCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+public enum FatefulHourCondition implements Condition {
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java

@@ -36,24 +36,16 @@ import mage.filter.predicate.mageobject.PowerPredicate;
 import mage.game.Game;
 
 /**
- *
  * @author LevelX2
  */
-public class FerociousCondition  implements Condition {
-
+public enum FerociousCondition implements Condition {
+    instance;
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
     static {
         filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 3));
     }
 
-    private static final FerociousCondition fInstance = new FerociousCondition();
-
-    private FerociousCondition() {}
-
-    public static FerociousCondition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/FlippedCondition.java

@@ -34,10 +34,10 @@ import mage.game.permanent.Permanent;
 
 public class FlippedCondition implements Condition {
 
-    private static FlippedCondition fInstance = new FlippedCondition();
+    private static FlippedCondition instance = new FlippedCondition();
 
     public static Condition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/FormidableCondition.java

@@ -38,15 +38,12 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class FormidableCondition implements Condition {
+public enum FormidableCondition implements Condition {
 
-    private static final FormidableCondition fInstance = new FormidableCondition();
+   instance;
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
-    public static Condition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/HateCondition.java

@@ -38,19 +38,9 @@ import mage.watchers.common.LifeLossOtherFromCombatWatcher;
  *
  * @author Styxo
  */
-public class HateCondition implements Condition {
+public enum HateCondition implements Condition {
 
-    private static HateCondition fInstance = null;
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new HateCondition();
-        }
-        return fInstance;
-    }
-
-    private HateCondition() {
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/HellbentCondition.java

@@ -31,13 +31,9 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.game.Game;
 
-public class HellbentCondition implements Condition {
+public enum HellbentCondition implements Condition {
 
-    private static HellbentCondition fInstance = new HellbentCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java

@@ -40,18 +40,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class KickedCondition implements Condition {
+public enum KickedCondition implements Condition {
 
-    private static KickedCondition fInstance = null;
-
-    private KickedCondition() {}
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new KickedCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/LastTimeCounterRemovedCondition.java

@@ -10,14 +10,9 @@ import mage.game.permanent.Permanent;
 /**
  * Created by glerman on 20/6/15.
  */
-public class LastTimeCounterRemovedCondition implements Condition{
+public enum LastTimeCounterRemovedCondition implements Condition{
 
-
-  private static final LastTimeCounterRemovedCondition fInstance = new LastTimeCounterRemovedCondition();
-
-  public static LastTimeCounterRemovedCondition getInstance() {
-    return fInstance;
-  }
+instance;
 
   @Override
   public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/MetalcraftCondition.java

@@ -12,19 +12,14 @@ import mage.game.Game;
  *
  * @author nantuko
  */
-public class MetalcraftCondition implements Condition {
-
+public enum MetalcraftCondition implements Condition {
+    instance;
     private static final FilterPermanent filter = new FilterPermanent("artifact");
 
     static {
         filter.add(new CardTypePredicate(CardType.ARTIFACT));
     }
 
-    private static final MetalcraftCondition fInstance = new MetalcraftCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {
@@ -35,5 +30,5 @@ public class MetalcraftCondition implements Condition {
     public String toString() {
         return "you control three or more artifacts";
     }
-    
+
 }

Mage/src/main/java/mage/abilities/condition/common/MonarchIsSourceControllerCondition.java

@@ -37,10 +37,10 @@ import mage.game.Game;
  */
 public class MonarchIsSourceControllerCondition implements Condition {
 
-    private final static MonarchIsSourceControllerCondition fInstance = new MonarchIsSourceControllerCondition();
+    private final static MonarchIsSourceControllerCondition instance = new MonarchIsSourceControllerCondition();
 
     public static Condition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/MonstrousCondition.java

@@ -39,19 +39,9 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class MonstrousCondition implements Condition {
-
-    private static MonstrousCondition fInstance = null;
-
-    private MonstrousCondition() {}
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new MonstrousCondition();
-        }
-        return fInstance;
-    }
+public enum MonstrousCondition implements Condition {
 
+    instance;
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());

Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java

@@ -35,13 +35,9 @@ import mage.watchers.Watcher;
 /**
  * @author nantuko
  */
-public class MorbidCondition implements Condition {
+public enum MorbidCondition implements Condition {
 
-    private static final MorbidCondition fInstance = new MorbidCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/MyMainPhaseCondition.java

@@ -27,30 +27,23 @@
  */
 package mage.abilities.condition.common;
 
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
+
 import mage.constants.TurnPhase;
 import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.game.Game;
 
 /**
- *
  * @author LevelX2
  */
 
-public class MyMainPhaseCondition implements Condition {
+public enum MyMainPhaseCondition implements Condition {
 
-    private static final MyMainPhaseCondition fInstance = new MyMainPhaseCondition();
-
-    private static final  Set<TurnPhase> turnPhases = new HashSet<TurnPhase>() {{
-        add(TurnPhase.PRECOMBAT_MAIN);
-        add(TurnPhase.POSTCOMBAT_MAIN);
-    }};
-    
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
+    private static final Set<TurnPhase> turnPhases = EnumSet.of(TurnPhase.PRECOMBAT_MAIN, TurnPhase.POSTCOMBAT_MAIN);
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/MyTurnBeforeAttackersDeclaredCondition.java

@@ -38,10 +38,10 @@ import mage.game.Game;
  * @author LevelX2
  */
 public class MyTurnBeforeAttackersDeclaredCondition implements Condition {
-    private static final MyTurnBeforeAttackersDeclaredCondition fInstance = new MyTurnBeforeAttackersDeclaredCondition();
+    private static final MyTurnBeforeAttackersDeclaredCondition instance = new MyTurnBeforeAttackersDeclaredCondition();
 
     public static Condition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/MyTurnCondition.java

@@ -31,12 +31,8 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.game.Game;
 
-public class MyTurnCondition implements Condition {
-    private final static MyTurnCondition fInstance = new MyTurnCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+public enum MyTurnCondition implements Condition {
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/NoSpellsWereCastLastTurnCondition.java

@@ -35,13 +35,11 @@ import mage.watchers.common.CastSpellLastTurnWatcher;
 /**
  * @author nantuko
  */
-public class NoSpellsWereCastLastTurnCondition implements Condition {
+public enum NoSpellsWereCastLastTurnCondition implements Condition {
+
+    instance;
 
-    private static NoSpellsWereCastLastTurnCondition fInstance = new NoSpellsWereCastLastTurnCondition();
 
-    public static Condition getInstance() {
-        return fInstance;
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java

@@ -32,13 +32,9 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.game.Game;
 
-public class NotMyTurnCondition implements Condition {
+public enum NotMyTurnCondition implements Condition {
 
-    private static final NotMyTurnCondition fInstance = new NotMyTurnCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/OnOpponentsTurnCondition.java

@@ -13,13 +13,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class OnOpponentsTurnCondition implements Condition {
+public enum OnOpponentsTurnCondition implements Condition {
 
-    private static final OnOpponentsTurnCondition F_INSTANCE = new OnOpponentsTurnCondition();
-
-    public static Condition getInstance() {
-        return F_INSTANCE;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/ProwlCondition.java

@@ -38,19 +38,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class ProwlCondition implements Condition {
+public enum ProwlCondition implements Condition {
 
-    private static ProwlCondition fInstance = null;
-
-    private ProwlCondition() {
-    }
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new ProwlCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java

@@ -34,21 +34,11 @@ import mage.game.Game;
 import mage.watchers.common.PlayerAttackedWatcher;
 
 /**
- *
  * @author LevelX2
  */
-public class RaidCondition implements Condition {
+public enum RaidCondition implements Condition {
 
-    private static RaidCondition fInstance = null;
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new RaidCondition();
-        }
-        return fInstance;
-    }
-
-    private RaidCondition() {}
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/RenownedSourceCondition.java

@@ -16,19 +16,9 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class RenownedSourceCondition implements Condition {
-
-    private static RenownedSourceCondition fInstance = null;
-
-    private RenownedSourceCondition() {}
-
-    public static RenownedSourceCondition getInstance() {
-        if (fInstance == null) {
-            fInstance = new RenownedSourceCondition();
-        }
-        return fInstance;
-    }
+public enum RenownedSourceCondition implements Condition {
 
+    instance;
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());

Mage/src/main/java/mage/abilities/condition/common/RenownedTargetCondition.java

@@ -38,16 +38,16 @@ import mage.game.permanent.Permanent;
  */
 public class RenownedTargetCondition implements Condition {
 
-    private static RenownedTargetCondition fInstance = null;
+    private static RenownedTargetCondition instance = null;
 
     private RenownedTargetCondition() {
     }
 
     public static RenownedTargetCondition getInstance() {
-        if (fInstance == null) {
-            fInstance = new RenownedTargetCondition();
+        if (instance == null) {
+            instance = new RenownedTargetCondition();
         }
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java

@@ -35,13 +35,9 @@ import mage.watchers.common.RevoltWatcher;
 /**
  * @author emerald000
  */
-public class RevoltCondition implements Condition {
+public enum RevoltCondition implements Condition {
 
-    private static final RevoltCondition fInstance = new RevoltCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/SourceAttackingCondition.java

@@ -39,10 +39,10 @@ import mage.game.permanent.Permanent;
 
 public class SourceAttackingCondition implements Condition {
 
-    private static final SourceAttackingCondition fInstance = new SourceAttackingCondition();
+    private static final SourceAttackingCondition instance = new SourceAttackingCondition();
 
     public static SourceAttackingCondition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/SourceIsSpellCondition.java

@@ -38,13 +38,9 @@ import mage.game.Game;
  * @author LevelX2
  */
 
-public class SourceIsSpellCondition implements Condition {
+public enum  SourceIsSpellCondition implements Condition {
 
-    private static final SourceIsSpellCondition fInstance = new SourceIsSpellCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldCondition.java

@@ -40,10 +40,10 @@ import mage.game.Game;
  */
 public class SourceOnBattlefieldCondition implements Condition {
 
-    private static final SourceOnBattlefieldCondition fInstance = new SourceOnBattlefieldCondition();
+    private static final SourceOnBattlefieldCondition instance = new SourceOnBattlefieldCondition();
 
     public static SourceOnBattlefieldCondition getInstance() {
-        return fInstance;
+        return instance;
     }
     
     @Override

Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java

@@ -44,14 +44,14 @@ import mage.game.turn.Step;
 
 public class SourceTappedBeforeUntapStepCondition implements Condition {
 
-    private static final SourceTappedBeforeUntapStepCondition fInstance = new SourceTappedBeforeUntapStepCondition();
+    private static final SourceTappedBeforeUntapStepCondition instance = new SourceTappedBeforeUntapStepCondition();
     UUID permanentId = null;
     boolean permanentWasTappedBeforeUntapStep = false;
     int lastTurnNum = -1;
     
 
     public static SourceTappedBeforeUntapStepCondition getInstance() {
-        return fInstance;
+        return instance;
     }
 
     public void setPermanentId(UUID permanentId) {

Mage/src/main/java/mage/abilities/condition/common/SourceTappedCondition.java

@@ -39,13 +39,9 @@ import mage.game.permanent.Permanent;
  */
 
 
-public class SourceTappedCondition implements Condition {
+public enum SourceTappedCondition implements Condition {
 
-    private static final SourceTappedCondition fInstance = new SourceTappedCondition();
-
-    public static SourceTappedCondition getInstance() {
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/SpellMasteryCondition.java

@@ -19,25 +19,15 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class SpellMasteryCondition implements Condition {
+public enum SpellMasteryCondition implements Condition {
 
+    instance;
     private static final FilterCard filter = new FilterCard();
     
     static {
         filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY)));
     }
-    
-    private static SpellMasteryCondition fInstance = null;
 
-    public static SpellMasteryCondition getInstance() {
-        if (fInstance == null) {
-            fInstance = new SpellMasteryCondition();
-        }
-        return fInstance;
-    }
-    
-    private SpellMasteryCondition() {}
-    
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());

Mage/src/main/java/mage/abilities/condition/common/SurgedCondition.java

@@ -38,19 +38,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class SurgedCondition implements Condition {
+public enum SurgedCondition implements Condition {
 
-    private static SurgedCondition fInstance = null;
-
-    private SurgedCondition() {
-    }
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new SurgedCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java

@@ -47,15 +47,15 @@ import mage.game.Game;
 
 public class SuspendedCondition implements Condition {
 
-    private static SuspendedCondition fInstance = null;
+    private static SuspendedCondition instance = null;
 
     private SuspendedCondition() {}
 
     public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new SuspendedCondition();
+        if (instance == null) {
+            instance = new SuspendedCondition();
         }
-        return fInstance;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/condition/common/TargetAttackedThisTurnCondition.java

@@ -34,10 +34,10 @@ import mage.game.permanent.Permanent;
 import mage.watchers.common.AttackedThisTurnWatcher;
 
 /**
- *
  * @author MTGfan
  */
-public class TargetAttackedThisTurnCondition implements Condition {
+public enum TargetAttackedThisTurnCondition implements Condition {
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java

@@ -36,19 +36,9 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class TributeNotPaidCondition implements Condition {
+public enum TributeNotPaidCondition implements Condition {
 
-    private static TributeNotPaidCondition fInstance = null;
-
-    private TributeNotPaidCondition() {
-    }
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new TributeNotPaidCondition();
-        }
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreSpellsWereCastLastTurnCondition.java

@@ -35,13 +35,9 @@ import mage.watchers.common.CastSpellLastTurnWatcher;
 /**
  * @author nantuko
  */
-public class TwoOrMoreSpellsWereCastLastTurnCondition implements Condition {
+public enum TwoOrMoreSpellsWereCastLastTurnCondition implements Condition {
 
-    private static TwoOrMoreSpellsWereCastLastTurnCondition fInstance = new TwoOrMoreSpellsWereCastLastTurnCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
+   instance;
 
     @Override
     public boolean apply(Game game, Ability source) {

Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java

@@ -21,14 +21,14 @@ import mage.game.stack.Spell;
  */
 public class ColorsOfManaSpentToCastCount implements DynamicValue {
 
-    private static final ColorsOfManaSpentToCastCount fINSTANCE = new ColorsOfManaSpentToCastCount();
+    private static final ColorsOfManaSpentToCastCount instance = new ColorsOfManaSpentToCastCount();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ColorsOfManaSpentToCastCount getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java

@@ -47,14 +47,14 @@ import mage.players.Player;
  */
 public class ParleyCount implements DynamicValue, MageSingleton {
 
-    private static final ParleyCount fINSTANCE = new ParleyCount();
+    private static final ParleyCount instance = new ParleyCount();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ParleyCount getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override
@@ -82,7 +82,7 @@ public class ParleyCount implements DynamicValue, MageSingleton {
 
     @Override
     public ParleyCount copy() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java

@@ -44,14 +44,14 @@ import java.io.ObjectStreamException;
 
 public class SourcePermanentToughnessValue implements DynamicValue {
     
-    private static final SourcePermanentToughnessValue fINSTANCE =  new SourcePermanentToughnessValue();
+    private static final SourcePermanentToughnessValue instance =  new SourcePermanentToughnessValue();
     
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }   
     
     public static SourcePermanentToughnessValue getInstance() {
-        return fINSTANCE;
+        return instance;
     }
     
     @Override

Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java

@@ -44,14 +44,14 @@ import java.io.ObjectStreamException;
 
 public class TargetPermanenToughnessValue implements DynamicValue {
     
-    private static final TargetPermanenToughnessValue fINSTANCE =  new TargetPermanenToughnessValue();
+    private static final TargetPermanenToughnessValue instance =  new TargetPermanenToughnessValue();
     
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }   
     
     public static TargetPermanenToughnessValue getInstance() {
-        return fINSTANCE;
+        return instance;
     }
     
     @Override

Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java

@@ -83,10 +83,10 @@ import mage.target.common.TargetOpponent;
  */
 public class ClashEffect extends OneShotEffect implements MageSingleton {
 
-    private static final ClashEffect fINSTANCE = new ClashEffect();
+    private static final ClashEffect instance = new ClashEffect();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     private ClashEffect() {
@@ -95,7 +95,7 @@ public class ClashEffect extends OneShotEffect implements MageSingleton {
     }
 
     public static ClashEffect getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     public ClashEffect(final ClashEffect effect) {

Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java

@@ -42,10 +42,10 @@ import mage.players.Player;
  */
 public class ClashWinReturnToHandSpellEffect extends OneShotEffect implements MageSingleton {
 
-    private static final ClashWinReturnToHandSpellEffect fINSTANCE = new ClashWinReturnToHandSpellEffect();
+    private static final ClashWinReturnToHandSpellEffect instance = new ClashWinReturnToHandSpellEffect();
 
     public static ClashWinReturnToHandSpellEffect getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ClashWinReturnToHandSpellEffect() {
@@ -70,6 +70,6 @@ public class ClashWinReturnToHandSpellEffect extends OneShotEffect implements Ma
 
     @Override
     public ClashWinReturnToHandSpellEffect copy() {
-        return fINSTANCE;
+        return instance;
     }
 }

Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java

@@ -43,7 +43,7 @@ import mage.game.events.GameEvent;
 public class DontUntapAsLongAsSourceTappedEffect extends ConditionalContinuousRuleModifyingEffect {
 
     public DontUntapAsLongAsSourceTappedEffect() {
-        super(new DontUntapInControllersUntapStepTargetEffect(Duration.Custom), SourceTappedCondition.getInstance());
+        super(new DontUntapInControllersUntapStepTargetEffect(Duration.Custom), SourceTappedCondition.instance);
         staticText = "It doesn't untap during its controller's untap step for as long as {source} remains tapped.";
     }
 

Mage/src/main/java/mage/abilities/effects/common/ExileSpellEffect.java

@@ -43,10 +43,10 @@ import mage.players.Player;
  */
 public class ExileSpellEffect extends OneShotEffect implements MageSingleton {
 
-    private static final ExileSpellEffect fINSTANCE = new ExileSpellEffect();
+    private static final ExileSpellEffect instance = new ExileSpellEffect();
 
     public static ExileSpellEffect getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ExileSpellEffect() {
@@ -56,7 +56,7 @@ public class ExileSpellEffect extends OneShotEffect implements MageSingleton {
 
     @Override
     public ExileSpellEffect copy() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java

@@ -15,10 +15,10 @@ import mage.players.Player;
  */
 public class ReturnToHandSpellEffect extends OneShotEffect implements MageSingleton {
 
-    private static final ReturnToHandSpellEffect fINSTANCE = new ReturnToHandSpellEffect();
+    private static final ReturnToHandSpellEffect instance = new ReturnToHandSpellEffect();
 
     public static ReturnToHandSpellEffect getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ReturnToHandSpellEffect() {
@@ -39,6 +39,6 @@ public class ReturnToHandSpellEffect extends OneShotEffect implements MageSingle
 
     @Override
     public ReturnToHandSpellEffect copy() {
-        return fINSTANCE;
+        return instance;
     }
 }

Mage/src/main/java/mage/abilities/effects/common/ShuffleSpellEffect.java

@@ -42,10 +42,10 @@ import mage.players.Player;
  */
 public class ShuffleSpellEffect extends OneShotEffect implements MageSingleton {
 
-    private static final ShuffleSpellEffect fINSTANCE = new ShuffleSpellEffect();
+    private static final ShuffleSpellEffect instance = new ShuffleSpellEffect();
 
     public static ShuffleSpellEffect getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ShuffleSpellEffect() {
@@ -75,6 +75,6 @@ public class ShuffleSpellEffect extends OneShotEffect implements MageSingleton {
 
     @Override
     public ShuffleSpellEffect copy() {
-        return fINSTANCE;
+        return instance;
     }
 }

Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java

@@ -38,7 +38,7 @@ public class CastFromHandWithoutPayingManaCostEffect extends ContinuousEffectImp
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
             controller.getAlternativeSourceCosts().add(new AlternativeCostSourceAbility(
-                    null, new CompoundCondition(SourceIsSpellCondition.getInstance(), new IsBeingCastFromHandCondition()), null, new FilterNonlandCard(), true));
+                    null, new CompoundCondition(SourceIsSpellCondition.instance, new IsBeingCastFromHandCondition()), null, new FilterNonlandCard(), true));
             return true;
         }
         return false;

Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java

@@ -42,14 +42,14 @@ import java.io.ObjectStreamException;
  */
 public class AttacksThisTurnMarkerAbility extends StaticAbility implements MageSingleton {
 
-    private static final AttacksThisTurnMarkerAbility fINSTANCE =  new AttacksThisTurnMarkerAbility();
+    private static final AttacksThisTurnMarkerAbility instance =  new AttacksThisTurnMarkerAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static AttacksThisTurnMarkerAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private AttacksThisTurnMarkerAbility() {
@@ -63,7 +63,7 @@ public class AttacksThisTurnMarkerAbility extends StaticAbility implements MageS
 
     @Override
     public AttacksThisTurnMarkerAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java

@@ -42,14 +42,14 @@ import java.io.ObjectStreamException;
  */
 public class BlocksThisTurnMarkerAbility extends StaticAbility implements MageSingleton {
 
-    private static final BlocksThisTurnMarkerAbility fINSTANCE =  new BlocksThisTurnMarkerAbility();
+    private static final BlocksThisTurnMarkerAbility instance =  new BlocksThisTurnMarkerAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static BlocksThisTurnMarkerAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private BlocksThisTurnMarkerAbility() {
@@ -63,7 +63,7 @@ public class BlocksThisTurnMarkerAbility extends StaticAbility implements MageSi
 
     @Override
     public BlocksThisTurnMarkerAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java

@@ -16,14 +16,14 @@ import mage.constants.Zone;
  */
 public class CanBlockSpaceflightAbility extends StaticAbility implements MageSingleton {
 
-    private static final CanBlockSpaceflightAbility fINSTANCE = new CanBlockSpaceflightAbility();
+    private static final CanBlockSpaceflightAbility instance = new CanBlockSpaceflightAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static CanBlockSpaceflightAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private CanBlockSpaceflightAbility() {
@@ -37,7 +37,7 @@ public class CanBlockSpaceflightAbility extends StaticAbility implements MageSin
 
     @Override
     public CanBlockSpaceflightAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java

@@ -39,14 +39,14 @@ import java.io.ObjectStreamException;
  */
 public class CantBlockAloneAbility extends StaticAbility implements MageSingleton {
 
-    private static final CantBlockAloneAbility fINSTANCE = new CantBlockAloneAbility();
+    private static final CantBlockAloneAbility instance = new CantBlockAloneAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static CantBlockAloneAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private CantBlockAloneAbility() {
@@ -60,7 +60,7 @@ public class CantBlockAloneAbility extends StaticAbility implements MageSingleto
 
     @Override
     public CantBlockAloneAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java

@@ -45,14 +45,14 @@ import mage.constants.Zone;
  */
 public class ChangelingAbility extends StaticAbility implements MageSingleton {
     public static final String ALL_CREATURE_TYPE = "All Creature Type";
-    private static final ChangelingAbility fINSTANCE =  new ChangelingAbility();
+    private static final ChangelingAbility instance =  new ChangelingAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ChangelingAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ChangelingAbility() {
@@ -66,6 +66,6 @@ public class ChangelingAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public ChangelingAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 }

Mage/src/main/java/mage/abilities/keyword/DashAbility.java

@@ -76,7 +76,7 @@ public class DashAbility extends StaticAbility implements AlternativeSourceCosts
         this.addDashCost(manaString);
         Ability ability = new EntersBattlefieldAbility(
                 new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.Custom, false),
-                DashedCondition.getInstance(), "", "");
+                DashedCondition.instance, "", "");
         ability.addEffect(new DashAddDelayedTriggeredAbilityEffect());
         addSubAbility(ability);
 

Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class DeathtouchAbility extends StaticAbility implements MageSingleton {
 
-    private static final DeathtouchAbility fINSTANCE =  new DeathtouchAbility();
+    private static final DeathtouchAbility instance =  new DeathtouchAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static DeathtouchAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private DeathtouchAbility() {
@@ -61,7 +61,7 @@ public class DeathtouchAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public DeathtouchAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 

Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class DefenderAbility extends StaticAbility implements MageSingleton {
 
-    private static final DefenderAbility fINSTANCE =  new DefenderAbility();
+    private static final DefenderAbility instance =  new DefenderAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static DefenderAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private DefenderAbility() {
@@ -61,7 +61,7 @@ public class DefenderAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public DefenderAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java

@@ -38,14 +38,14 @@ import mage.constants.Zone;
  */
 public class DoubleStrikeAbility extends StaticAbility implements MageSingleton {
 
-    private static final DoubleStrikeAbility fINSTANCE = new DoubleStrikeAbility();
+    private static final DoubleStrikeAbility instance = new DoubleStrikeAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static DoubleStrikeAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private DoubleStrikeAbility() {
@@ -59,7 +59,7 @@ public class DoubleStrikeAbility extends StaticAbility implements MageSingleton
 
     @Override
     public DoubleStrikeAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java

@@ -68,7 +68,7 @@ public class EvokeAbility extends StaticAbility implements AlternativeSourceCost
         super(Zone.ALL, null);
         name = EVOKE_KEYWORD;
         this.addEvokeCost(manaString);
-        Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceEffect()), EvokedCondition.getInstance(), "Sacrifice {this} when it enters the battlefield and was evoked.");
+        Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceEffect()), EvokedCondition.instance, "Sacrifice {this} when it enters the battlefield and was evoked.");
         ability.setRuleVisible(false);
         addSubAbility(ability);
 

Mage/src/main/java/mage/abilities/keyword/FearAbility.java

@@ -45,14 +45,14 @@ import java.io.ObjectStreamException;
  */
 public class FearAbility extends EvasionAbility implements MageSingleton {
 
-    private static final FearAbility fINSTANCE =  new FearAbility();
+    private static final FearAbility instance =  new FearAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static FearAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private FearAbility() {
@@ -66,7 +66,7 @@ public class FearAbility extends EvasionAbility implements MageSingleton {
 
     @Override
     public FearAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java

@@ -38,14 +38,14 @@ import mage.constants.Zone;
  */
 public class FirstStrikeAbility extends StaticAbility implements MageSingleton {
 
-    private static final FirstStrikeAbility fINSTANCE = new FirstStrikeAbility();
+    private static final FirstStrikeAbility instance = new FirstStrikeAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static FirstStrikeAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private FirstStrikeAbility() {
@@ -59,7 +59,7 @@ public class FirstStrikeAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public FirstStrikeAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/FlashAbility.java

@@ -39,14 +39,14 @@ import mage.constants.Zone;
  */
 public class FlashAbility extends StaticAbility implements MageSingleton {
 
-    private static final FlashAbility fINSTANCE =  new FlashAbility();
+    private static final FlashAbility instance =  new FlashAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static FlashAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private FlashAbility() {
@@ -60,7 +60,7 @@ public class FlashAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public FlashAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java

@@ -45,14 +45,14 @@ import mage.constants.AsThoughEffectType;
  */
 public class FlyingAbility extends EvasionAbility implements MageSingleton {
 
-    private static final FlyingAbility fINSTANCE =  new FlyingAbility();
+    private static final FlyingAbility instance =  new FlyingAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static FlyingAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private FlyingAbility() {
@@ -66,7 +66,7 @@ public class FlyingAbility extends EvasionAbility implements MageSingleton {
 
     @Override
     public FlyingAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/HasteAbility.java

@@ -38,14 +38,14 @@ import mage.constants.Zone;
  */
 public class HasteAbility extends StaticAbility implements MageSingleton {
 
-    private static final HasteAbility fINSTANCE = new HasteAbility();
+    private static final HasteAbility instance = new HasteAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static HasteAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private HasteAbility() {
@@ -59,7 +59,7 @@ public class HasteAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public HasteAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java

@@ -13,18 +13,18 @@ import mage.constants.Zone;
  */
 public class HexproofAbility extends SimpleStaticAbility implements MageSingleton {
 
-    private static final HexproofAbility fINSTANCE;
+    private static final HexproofAbility instance;
 
     static {
-        fINSTANCE = new HexproofAbility();
+        instance = new HexproofAbility();
     }
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static HexproofAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private HexproofAbility() {
@@ -33,7 +33,7 @@ public class HexproofAbility extends SimpleStaticAbility implements MageSingleto
 
     @Override
     public HexproofAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java

@@ -43,14 +43,14 @@ import mage.game.permanent.Permanent;
  */
 
 public class HorsemanshipAbility extends EvasionAbility implements MageSingleton {
-    private static final HorsemanshipAbility fINSTANCE =  new HorsemanshipAbility();
+    private static final HorsemanshipAbility instance =  new HorsemanshipAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static HorsemanshipAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private HorsemanshipAbility() {
@@ -64,7 +64,7 @@ public class HorsemanshipAbility extends EvasionAbility implements MageSingleton
 
     @Override
     public HorsemanshipAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java

@@ -54,18 +54,18 @@ import mage.abilities.StaticAbility;
 
 public class IndestructibleAbility extends StaticAbility {
 
-    private static final IndestructibleAbility fINSTANCE;
+    private static final IndestructibleAbility instance;
 
     static {
-        fINSTANCE = new IndestructibleAbility();
+        instance = new IndestructibleAbility();
     }
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static IndestructibleAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private IndestructibleAbility() {
@@ -74,7 +74,7 @@ public class IndestructibleAbility extends StaticAbility {
 
     @Override
     public IndestructibleAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/keyword/InfectAbility.java

@@ -59,14 +59,14 @@ import java.io.ObjectStreamException;
  */
 public class InfectAbility extends StaticAbility implements MageSingleton {
 
-    private static final InfectAbility fINSTANCE =  new InfectAbility();
+    private static final InfectAbility instance =  new InfectAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static InfectAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private InfectAbility() {
@@ -80,7 +80,7 @@ public class InfectAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public InfectAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java

@@ -23,10 +23,10 @@ import mage.game.permanent.Permanent;
  *
  */
 public class IntimidateAbility extends EvasionAbility implements MageSingleton  {
-    private static final IntimidateAbility fInstance = new IntimidateAbility();
+    private static final IntimidateAbility instance = new IntimidateAbility();
 
     public static IntimidateAbility getInstance() {
-        return fInstance;
+        return instance;
     }
 
     private IntimidateAbility() {
@@ -40,7 +40,7 @@ public class IntimidateAbility extends EvasionAbility implements MageSingleton
 
     @Override
     public IntimidateAbility copy() {
-        return fInstance;
+        return instance;
     }
 }
 

Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java

@@ -43,14 +43,14 @@ import mage.players.Player;
  */
 public class LeylineAbility extends StaticAbility implements MageSingleton, OpeningHandAction {
 
-    private static final LeylineAbility fINSTANCE = new LeylineAbility();
+    private static final LeylineAbility instance = new LeylineAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static LeylineAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private LeylineAbility() {
@@ -64,7 +64,7 @@ public class LeylineAbility extends StaticAbility implements MageSingleton, Open
 
     @Override
     public LeylineAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
     @Override

Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class LifelinkAbility extends StaticAbility implements MageSingleton {
 
-    private static final LifelinkAbility fINSTANCE =  new LifelinkAbility();
+    private static final LifelinkAbility instance =  new LifelinkAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static LifelinkAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private LifelinkAbility() {
@@ -61,7 +61,7 @@ public class LifelinkAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public LifelinkAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java

@@ -67,7 +67,7 @@ public class MadnessAbility extends StaticAbility {
     }
 
     public static Condition GetCondition() {
-        return MadnessCondition.getInstance();
+        return MadnessCondition.instance;
     }
 
     @Override
@@ -248,19 +248,9 @@ class MadnessCastEffect extends OneShotEffect {
     }
 }
 
-class MadnessCondition implements Condition {
+enum MadnessCondition implements Condition {
 
-    private static MadnessCondition fInstance = null;
-
-    private MadnessCondition() {
-    }
-
-    public static Condition getInstance() {
-        if (fInstance == null) {
-            fInstance = new MadnessCondition();
-        }
-        return fInstance;
-    }
+    instance;
 
     @Override
     public boolean apply(Game game, Ability source) {
@@ -268,7 +258,7 @@ class MadnessCondition implements Condition {
         if (card != null) {
             for (Ability ability : card.getAbilities()) {
                 if (ability instanceof MadnessTriggeredAbility) {
-                    if (((MadnessTriggeredAbility) ability).isActivated()) {
+                    if (ability.isActivated()) {
                         return true;
                     }
                 }

Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java

@@ -16,14 +16,14 @@ import mage.constants.Zone;
  */
 public class PartnerAbility extends StaticAbility implements MageSingleton {
 
-    private static final PartnerAbility fINSTANCE = new PartnerAbility();
+    private static final PartnerAbility instance = new PartnerAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static PartnerAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private PartnerAbility() {
@@ -37,7 +37,7 @@ public class PartnerAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public PartnerAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java

@@ -39,14 +39,14 @@ import mage.constants.Zone;
  */
 public class PhasingAbility extends StaticAbility implements MageSingleton {
 
-    private static final PhasingAbility fINSTANCE =  new PhasingAbility();
+    private static final PhasingAbility instance =  new PhasingAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static PhasingAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private PhasingAbility() {
@@ -60,7 +60,7 @@ public class PhasingAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public PhasingAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/ReachAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class ReachAbility extends StaticAbility implements MageSingleton {
 
-    private static final ReachAbility fINSTANCE =  new ReachAbility();
+    private static final ReachAbility instance =  new ReachAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ReachAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ReachAbility() {
@@ -61,7 +61,7 @@ public class ReachAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public ReachAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java

@@ -168,7 +168,7 @@ class ReboundEffectCastFromExileDelayedTrigger extends DelayedTriggeredAbility {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        return MyTurnCondition.getInstance().apply(game, this);
+        return MyTurnCondition.instance.apply(game, this);
     }
 
     @Override

Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java

@@ -15,14 +15,14 @@ import mage.game.permanent.Permanent;
  * @author Loki
  */
 public class ShadowAbility extends EvasionAbility implements MageSingleton {
-    private static final ShadowAbility fINSTANCE =  new ShadowAbility();
+    private static final ShadowAbility instance =  new ShadowAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ShadowAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ShadowAbility() {
@@ -36,7 +36,7 @@ public class ShadowAbility extends EvasionAbility implements MageSingleton {
 
     @Override
     public ShadowAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class ShroudAbility extends StaticAbility implements MageSingleton {
 
-    private static final ShroudAbility fINSTANCE =  new ShroudAbility();
+    private static final ShroudAbility instance =  new ShroudAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static ShroudAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private ShroudAbility() {
@@ -61,7 +61,7 @@ public class ShroudAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public ShroudAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java

@@ -42,14 +42,14 @@ import mage.game.permanent.Permanent;
  */
 public class SpaceflightAbility extends EvasionAbility implements MageSingleton {
 
-    private static final SpaceflightAbility fINSTANCE = new SpaceflightAbility();
+    private static final SpaceflightAbility instance = new SpaceflightAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static SpaceflightAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private SpaceflightAbility() {
@@ -63,7 +63,7 @@ public class SpaceflightAbility extends EvasionAbility implements MageSingleton
 
     @Override
     public SpaceflightAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java

@@ -38,14 +38,14 @@ import mage.constants.Zone;
  */
 public class TrampleAbility extends StaticAbility implements MageSingleton {
 
-    private static final TrampleAbility fINSTANCE = new TrampleAbility();
+    private static final TrampleAbility instance = new TrampleAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static TrampleAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private TrampleAbility() {
@@ -59,7 +59,7 @@ public class TrampleAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public TrampleAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java

@@ -40,14 +40,14 @@ import java.io.ObjectStreamException;
  */
 public class VigilanceAbility extends StaticAbility implements MageSingleton {
 
-    private static final VigilanceAbility fINSTANCE =  new VigilanceAbility();
+    private static final VigilanceAbility instance =  new VigilanceAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static VigilanceAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private VigilanceAbility() {
@@ -61,7 +61,7 @@ public class VigilanceAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public VigilanceAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/abilities/keyword/WitherAbility.java

@@ -49,14 +49,14 @@ import java.io.ObjectStreamException;
  */
 public class WitherAbility extends StaticAbility implements MageSingleton {
 
-    private static final WitherAbility fINSTANCE =  new WitherAbility();
+    private static final WitherAbility instance =  new WitherAbility();
 
     private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+        return instance;
     }
 
     public static WitherAbility getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private WitherAbility() {
@@ -70,7 +70,7 @@ public class WitherAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public WitherAbility copy() {
-        return fINSTANCE;
+        return instance;
     }
 
 }

Mage/src/main/java/mage/cards/Sets.java

@@ -50,10 +50,10 @@ import java.util.*;
 public class Sets extends HashMap<String, ExpansionSet> {
 
     private static final Logger logger = Logger.getLogger(Sets.class);
-    private static final Sets fINSTANCE = new Sets();
+    private static final Sets instance = new Sets();
 
     public static Sets getInstance() {
-        return fINSTANCE;
+        return instance;
     }
 
     private Set<String> customSets = new HashSet<>();
@@ -136,8 +136,8 @@ public class Sets extends HashMap<String, ExpansionSet> {
     }
 
     public static ExpansionSet findSet(String code) {
-        if (fINSTANCE.containsKey(code)) {
-            return fINSTANCE.get(code);
+        if (instance.containsKey(code)) {
+            return instance.get(code);
         }
         return null;
     }

Mage/src/main/java/mage/game/GameOptions.java

@@ -11,10 +11,10 @@ import mage.constants.PhaseStep;
  */
 public class GameOptions implements Serializable {
 
-    private static final GameOptions defInstance = new GameOptions();
+    private static final GameOptions deinstance = new GameOptions();
 
     public static GameOptions getDefault() {
-        return defInstance;
+        return deinstance;
     }
 
     /**