[refactor] removed generic parameter from Effects

Mage/src/mage/abilities/abilityword/KinshipAbility.java

@@ -87,7 +87,7 @@ public class KinshipAbility extends TriggeredAbilityImpl {
     
 }
 
-class KinshipBaseEffect extends OneShotEffect<KinshipBaseEffect> {
+class KinshipBaseEffect extends OneShotEffect {
     
     private final Effects kinshipEffects = new Effects();
     

Mage/src/mage/abilities/common/ChancellorAbility.java

@@ -65,7 +65,7 @@ public class ChancellorAbility extends StaticAbility {
 
 }
 
-class ChancellorEffect extends OneShotEffect<ChancellorEffect> {
+class ChancellorEffect extends OneShotEffect {
 
     private DelayedTriggeredAbility ability;
 

Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java

@@ -80,7 +80,7 @@ public class DealsDamageGainLifeSourceTriggeredAbility extends TriggeredAbilityI
     }
 }
 
-class GainThatMuchLifeEffect extends OneShotEffect<GainThatMuchLifeEffect> {
+class GainThatMuchLifeEffect extends OneShotEffect {
 
     public GainThatMuchLifeEffect() {
         super(Outcome.GainLife);

Mage/src/mage/abilities/common/EmptyEffect.java

@@ -38,7 +38,7 @@ import mage.game.Game;
  *
  * @author magenoxx_at_gmail.com
  */
-public class EmptyEffect extends OneShotEffect<EmptyEffect> {
+public class EmptyEffect extends OneShotEffect {
 
     public EmptyEffect(String rule) {
         super(Outcome.Neutral);

Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java

@@ -69,7 +69,7 @@ public class PactDelayedTriggeredAbility extends DelayedTriggeredAbility {
     }
 }
 
-class PactEffect extends OneShotEffect<PactEffect> {
+class PactEffect extends OneShotEffect {
 
     private ManaCosts cost;
 

Mage/src/mage/abilities/decorator/ConditionalAsThoughEffect.java

@@ -41,7 +41,7 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class ConditionalAsThoughEffect extends AsThoughEffectImpl<ConditionalAsThoughEffect>  {
+public class ConditionalAsThoughEffect extends AsThoughEffectImpl  {
 
     protected AsThoughEffect effect;
     protected AsThoughEffect otherwiseEffect;

Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java

@@ -16,7 +16,7 @@ import mage.game.Game;
  *
  * @author nantuko
  */
-public class ConditionalContinousEffect extends ContinuousEffectImpl<ConditionalContinousEffect> {
+public class ConditionalContinousEffect extends ContinuousEffectImpl {
 
     protected ContinuousEffect effect;
     protected ContinuousEffect otherwiseEffect;

Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java

@@ -38,7 +38,7 @@ import mage.game.Game;
  *
  * @author maurer.it_at_gmail.com
  */
-public class ConditionalOneShotEffect extends OneShotEffect<ConditionalOneShotEffect> {
+public class ConditionalOneShotEffect extends OneShotEffect {
 
     private OneShotEffect effect;
     private OneShotEffect otherwiseEffect;

Mage/src/mage/abilities/decorator/ConditionalReplacementEffect.java

@@ -41,7 +41,7 @@ import mage.game.events.GameEvent;
  *
  * @author LevelX2
  */
-public class ConditionalReplacementEffect extends ReplacementEffectImpl<ConditionalReplacementEffect>  {
+public class ConditionalReplacementEffect extends ReplacementEffectImpl  {
 
     protected ReplacementEffect effect;
     protected ReplacementEffect otherwiseEffect;

Mage/src/mage/abilities/effects/ApplyCountersEffect.java

@@ -42,7 +42,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ApplyCountersEffect extends ContinuousEffectImpl<ApplyCountersEffect> {
+public class ApplyCountersEffect extends ContinuousEffectImpl {
 
     public ApplyCountersEffect() {
         super(Duration.EndOfGame, Layer.PTChangingEffects_7, SubLayer.Counters_7d, Outcome.BoostCreature);

Mage/src/mage/abilities/effects/AsThoughEffect.java

@@ -37,9 +37,11 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public interface AsThoughEffect<T extends AsThoughEffect<T>> extends ContinuousEffect<T> {
+public interface AsThoughEffect extends ContinuousEffect {
 
     boolean applies(UUID sourceId, Ability source, Game game);
     AsThoughEffectType getAsThoughEffectType();
 
+    @Override
+    AsThoughEffect copy();
 }

Mage/src/mage/abilities/effects/AsThoughEffectImpl.java

@@ -37,7 +37,7 @@ import mage.constants.Outcome;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class AsThoughEffectImpl<T extends AsThoughEffectImpl<T>> extends ContinuousEffectImpl<T> implements AsThoughEffect<T> {
+public abstract class AsThoughEffectImpl extends ContinuousEffectImpl implements AsThoughEffect {
 
     protected AsThoughEffectType type;
 

Mage/src/mage/abilities/effects/AuraReplacementEffect.java

@@ -57,7 +57,7 @@ import mage.game.stack.Spell;
  *
  * @author North
  */
-public class AuraReplacementEffect extends ReplacementEffectImpl<AuraReplacementEffect> {
+public class AuraReplacementEffect extends ReplacementEffectImpl {
 
     public AuraReplacementEffect() {
         super(Duration.EndOfGame, Outcome.Neutral);

Mage/src/mage/abilities/effects/ContinuousEffect.java

@@ -41,9 +41,8 @@ import java.util.UUID;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public interface ContinuousEffect<T extends ContinuousEffect<T>> extends Effect<T> {
+public interface ContinuousEffect extends Effect {
 
     boolean isUsed();
     boolean isDiscarded();
@@ -62,4 +61,6 @@ public interface ContinuousEffect<T extends ContinuousEffect<T>> extends Effect<
 
     @Override
     void newId();
+    @Override
+    ContinuousEffect copy();
 }

Mage/src/mage/abilities/effects/ContinuousEffectImpl.java

@@ -53,9 +53,8 @@ import mage.game.Game;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class ContinuousEffectImpl<T extends ContinuousEffectImpl<T>> extends EffectImpl<T> implements ContinuousEffect<T> {
+public abstract class ContinuousEffectImpl extends EffectImpl implements ContinuousEffect {
 
     protected Duration duration;
     protected Layer layer;
@@ -80,7 +79,7 @@ public abstract class ContinuousEffectImpl<T extends ContinuousEffectImpl<T>> ex
         this.sublayer = sublayer;
     }
 
-    public ContinuousEffectImpl(final ContinuousEffectImpl<T> effect) {
+    public ContinuousEffectImpl(final ContinuousEffectImpl effect) {
         super(effect);
         this.duration = effect.duration;
         this.layer = effect.layer;

Mage/src/mage/abilities/effects/CostModificationEffect.java

@@ -43,7 +43,7 @@ import mage.game.Game;
  * @author maurer.it_at_gmail.com
  */
 //20101001 - 601.2e/613.10
-public interface CostModificationEffect<T extends CostModificationEffect<T>> extends ContinuousEffect<T> {
+public interface CostModificationEffect<T extends CostModificationEffect<T>> extends ContinuousEffect {
     /**
      * Called by the {@link ContinuousEffects#costModification(java.util.UUID, mage.abilities.Ability, mage.game.Game) ContinuousEffects.costModification}
      * method.

Mage/src/mage/abilities/effects/CostModificationEffectImpl.java

@@ -42,7 +42,7 @@ import mage.game.Game;
  * @author maurer.it_at_gmail.com
  * @param <T>
  */
-public abstract class CostModificationEffectImpl<T extends CostModificationEffectImpl<T>> extends ContinuousEffectImpl<T> implements CostModificationEffect<T> {
+public abstract class CostModificationEffectImpl<T extends CostModificationEffectImpl<T>> extends ContinuousEffectImpl implements CostModificationEffect<T> {
 
     private final CostModificationType modificationType;
     

Mage/src/mage/abilities/effects/Effect.java

@@ -40,9 +40,8 @@ import mage.target.targetpointer.TargetPointer;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public interface Effect<T extends Effect<T>> extends Serializable {
+public interface Effect extends Serializable {
 
     UUID getId();
     void newId();
@@ -58,6 +57,6 @@ public interface Effect<T extends Effect<T>> extends Serializable {
     void setApplyEffectsAfter();
     boolean applyEffectsAfter();
 
-    T copy();
+    Effect copy();
 
 }

Mage/src/mage/abilities/effects/EffectImpl.java

@@ -42,9 +42,8 @@ import java.util.UUID;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
+public abstract class EffectImpl implements Effect {
 
     protected UUID id;
     protected final Outcome outcome;

Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java

@@ -43,7 +43,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlefieldEffect> {
+public class EntersBattlefieldEffect extends ReplacementEffectImpl {
 
     protected Effects baseEffects = new Effects();
     protected String text;

Mage/src/mage/abilities/effects/OneShotEffect.java

@@ -35,14 +35,14 @@ import mage.constants.Outcome;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class OneShotEffect<T extends OneShotEffect<T>> extends EffectImpl<T> {
+public abstract class OneShotEffect extends EffectImpl {
 
     public OneShotEffect(Outcome outcome) {
         super(outcome);
         this.effectType = EffectType.ONESHOT;
     }
 
-    public OneShotEffect(final OneShotEffect<T> effect) {
+    public OneShotEffect(final OneShotEffect effect) {
         super(effect);
     }
 

Mage/src/mage/abilities/effects/PlaneswalkerRedirectionEffect.java

@@ -47,7 +47,7 @@ import mage.target.TargetPermanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PlaneswalkerRedirectionEffect extends RedirectionEffect<PlaneswalkerRedirectionEffect> {
+public class PlaneswalkerRedirectionEffect extends RedirectionEffect {
 
     private static FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent();
 

Mage/src/mage/abilities/effects/PostResolveEffect.java

@@ -37,7 +37,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class PostResolveEffect<T extends PostResolveEffect<T>> extends OneShotEffect<T> {
+public abstract class PostResolveEffect<T extends PostResolveEffect<T>> extends OneShotEffect {
 
     public PostResolveEffect() {
         super(Outcome.Neutral);

Mage/src/mage/abilities/effects/PreventionEffect.java

@@ -32,6 +32,6 @@ package mage.abilities.effects;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public interface PreventionEffect<T extends PreventionEffect<T>> extends ReplacementEffect<T> {
+public interface PreventionEffect extends ReplacementEffect {
 
 }

Mage/src/mage/abilities/effects/PreventionEffectImpl.java

@@ -40,9 +40,8 @@ import mage.game.events.GameEvent;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class PreventionEffectImpl<T extends PreventionEffectImpl<T>> extends ReplacementEffectImpl<T> implements PreventionEffect<T> {
+public abstract class PreventionEffectImpl extends ReplacementEffectImpl implements PreventionEffect {
    
     protected int amountToPrevent;
     protected final boolean onlyCombat;

Mage/src/mage/abilities/effects/RedirectionEffect.java

@@ -43,7 +43,7 @@ import mage.target.TargetPermanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class RedirectionEffect<T extends RedirectionEffect<T>> extends ReplacementEffectImpl<T> {
+public abstract class RedirectionEffect extends ReplacementEffectImpl {
 
     protected TargetPermanent redirectTarget;
 

Mage/src/mage/abilities/effects/ReplacementEffect.java

@@ -35,13 +35,14 @@ import mage.game.events.GameEvent;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public interface ReplacementEffect<T extends ReplacementEffect<T>> extends ContinuousEffect<T> {
+public interface ReplacementEffect extends ContinuousEffect {
 
     boolean replaceEvent(GameEvent event, Ability source, Game game);
     boolean applies(GameEvent event, Ability source, Game game);
 
     boolean hasSelfScope();
 
+    @Override
+    public ContinuousEffect copy();
 }

Mage/src/mage/abilities/effects/ReplacementEffectImpl.java

@@ -35,9 +35,8 @@ import mage.constants.Outcome;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class ReplacementEffectImpl<T extends ReplacementEffectImpl<T>> extends ContinuousEffectImpl<T> implements ReplacementEffect<T> {
+public abstract class ReplacementEffectImpl extends ContinuousEffectImpl implements ReplacementEffect {
 
     // 614.12
     // Some replacement effects modify how a permanent enters the battlefield. (See rules 614.1c-d.)

Mage/src/mage/abilities/effects/RequirementEffect.java

@@ -41,7 +41,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class RequirementEffect<T extends RequirementEffect<T>> extends ContinuousEffectImpl<T> {
+public abstract class RequirementEffect<T extends RequirementEffect<T>> extends ContinuousEffectImpl {
 
     public RequirementEffect(Duration duration) {
         super(duration, Outcome.Detriment);

Mage/src/mage/abilities/effects/RestrictionEffect.java

@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  * @author BetaSteward_at_googlemail.com
  * @param <T>
  */
-public abstract class RestrictionEffect<T extends RestrictionEffect<T>> extends ContinuousEffectImpl<T> {
+public abstract class RestrictionEffect<T extends RestrictionEffect<T>> extends ContinuousEffectImpl {
 
     public RestrictionEffect(Duration duration) {
         this(duration, Outcome.Detriment);

Mage/src/mage/abilities/effects/RestrictionUntapNotMoreThanEffect.java

@@ -40,7 +40,7 @@ import mage.players.Player;
  *
  * @author LevelX2
  */
-public abstract class RestrictionUntapNotMoreThanEffect<T extends RestrictionUntapNotMoreThanEffect<T>> extends ContinuousEffectImpl<T> {
+public abstract class RestrictionUntapNotMoreThanEffect<T extends RestrictionUntapNotMoreThanEffect<T>> extends ContinuousEffectImpl {
 
     private int number;
     private FilterControlledPermanent filter;

Mage/src/mage/abilities/effects/SearchEffect.java

@@ -36,7 +36,7 @@ import mage.target.common.TargetCardInLibrary;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class SearchEffect<T extends SearchEffect<T>> extends OneShotEffect<T> {
+public abstract class SearchEffect<T extends SearchEffect<T>> extends OneShotEffect {
 
     protected TargetCardInLibrary target;
 

Mage/src/mage/abilities/effects/SpliceCardEffect.java

@@ -41,7 +41,7 @@ import mage.game.Game;
  * @author levelX2
  */
 
-public interface SpliceCardEffect<T extends SpliceCardEffect<T>> extends ContinuousEffect<T> {
+public interface SpliceCardEffect<T extends SpliceCardEffect<T>> extends ContinuousEffect {
     /**
      * Called by the {@link ContinuousEffects#costModification(Ability abilityToModify, Game game) ContinuousEffects.costModification}
      * method.

Mage/src/mage/abilities/effects/SpliceCardEffectImpl.java

@@ -41,7 +41,7 @@ import mage.game.Game;
 
  * @author LevelX2
  */
-public abstract class SpliceCardEffectImpl<T extends SpliceCardEffectImpl<T>> extends ContinuousEffectImpl<T> implements SpliceCardEffect<T> {
+public abstract class SpliceCardEffectImpl<T extends SpliceCardEffectImpl<T>> extends ContinuousEffectImpl implements SpliceCardEffect<T> {
 
     public SpliceCardEffectImpl ( Duration duration, Outcome outcome ) {
         super(duration, outcome);

Mage/src/mage/abilities/effects/WhileConditionContiniousEffect.java

@@ -8,7 +8,7 @@ import mage.constants.Outcome;
 import mage.constants.SubLayer;
 import mage.game.Game;
 
-public abstract class WhileConditionContiniousEffect<T extends WhileConditionContiniousEffect<T>> extends ContinuousEffectImpl<T> {
+public abstract class WhileConditionContiniousEffect<T extends WhileConditionContiniousEffect<T>> extends ContinuousEffectImpl {
     protected Condition condition;
 
     public WhileConditionContiniousEffect(Duration duration, Layer layer, SubLayer sublayer, Condition condition, Outcome outcome) {

Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java

@@ -37,7 +37,7 @@ import mage.game.Game;
 /**
  * @author noxx
  */
-public class AddContinuousEffectToGame extends OneShotEffect<AddContinuousEffectToGame> {
+public class AddContinuousEffectToGame extends OneShotEffect {
 
     private ContinuousEffect effect;
 

Mage/src/mage/abilities/effects/common/AttachEffect.java

@@ -39,7 +39,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class AttachEffect extends OneShotEffect<AttachEffect> {
+public class AttachEffect extends OneShotEffect {
 
     public AttachEffect(Outcome outcome) {
         super(outcome);

Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java

@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class CantActivateAbilitiesAttachedEffect extends ReplacementEffectImpl<CantActivateAbilitiesAttachedEffect> {
+public class CantActivateAbilitiesAttachedEffect extends ReplacementEffectImpl {
 
     public CantActivateAbilitiesAttachedEffect() {
         super(Duration.WhileOnBattlefield, Outcome.UnboostCreature);

Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java

@@ -44,7 +44,7 @@ import mage.game.stack.Spell;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CantCounterControlledEffect extends ReplacementEffectImpl<CantCounterControlledEffect> {
+public class CantCounterControlledEffect extends ReplacementEffectImpl {
 
     private FilterSpell filterTarget;
     private FilterObject filterSource;

Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java

@@ -42,7 +42,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CantCounterSourceEffect extends ReplacementEffectImpl<CantCounterSourceEffect> {
+public class CantCounterSourceEffect extends ReplacementEffectImpl {
 
     public CantCounterSourceEffect() {
         super(Duration.WhileOnStack, Outcome.Benefit);

Mage/src/mage/abilities/effects/common/CantTargetEffect.java

@@ -44,7 +44,7 @@ import mage.game.stack.StackObject;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CantTargetEffect extends ReplacementEffectImpl<CantTargetEffect> {
+public class CantTargetEffect extends ReplacementEffectImpl {
 
     private FilterPermanent filterTarget;
     private FilterStackObject filterSource;

Mage/src/mage/abilities/effects/common/CantTargetSourceEffect.java

@@ -42,7 +42,7 @@ import mage.game.stack.StackObject;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CantTargetSourceEffect extends ReplacementEffectImpl<CantTargetSourceEffect> {
+public class CantTargetSourceEffect extends ReplacementEffectImpl {
 
     private FilterStackObject filterSource;
 

Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java

@@ -44,7 +44,7 @@ import java.util.Set;
 /**
  * @author magenoxx_at_gmail.com
  */
-public class CastCardFromOutsideTheGameEffect extends OneShotEffect<CastCardFromOutsideTheGameEffect> {
+public class CastCardFromOutsideTheGameEffect extends OneShotEffect {
 
     private static final String choiceText = "Cast a card from outside the game?";
 

Mage/src/mage/abilities/effects/common/ChooseNewTargetsTargetEffect.java

@@ -39,7 +39,7 @@ import mage.game.stack.Spell;
  * @author BetaSteward_at_googlemail.com
  *
  */
-public class ChooseNewTargetsTargetEffect extends OneShotEffect<ChooseNewTargetsTargetEffect> {
+public class ChooseNewTargetsTargetEffect extends OneShotEffect {
 
     private boolean forceChange;
     private boolean onlyOneTarget;

Mage/src/mage/abilities/effects/common/CipherEffect.java

@@ -72,7 +72,7 @@ import mage.target.targetpointer.FixedTarget;
  */
 
 
-public class CipherEffect extends OneShotEffect<CipherEffect> {
+public class CipherEffect extends OneShotEffect {
 
     public CipherEffect() {
         super(Outcome.Copy);
@@ -116,7 +116,7 @@ public class CipherEffect extends OneShotEffect<CipherEffect> {
     }
 }
 
-class CipherStoreEffect extends OneShotEffect<CipherStoreEffect> {
+class CipherStoreEffect extends OneShotEffect {
 
     private UUID  cipherCardId;
 

Mage/src/mage/abilities/effects/common/CopyEffect.java

@@ -46,7 +46,7 @@ import mage.game.permanent.PermanentToken;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CopyEffect extends ContinuousEffectImpl<CopyEffect> {
+public class CopyEffect extends ContinuousEffectImpl {
 
     /**
      * Object we copy from

Mage/src/mage/abilities/effects/common/CopyPermanentEffect.java

@@ -44,7 +44,7 @@ import mage.util.functions.EmptyApplyToPermanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CopyPermanentEffect extends OneShotEffect<CopyPermanentEffect> {
+public class CopyPermanentEffect extends OneShotEffect {
 
     private FilterPermanent filter;
     private ApplyToPermanent applier;

Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java

@@ -42,7 +42,7 @@ import mage.players.Player;
  * @author BetaSteward_at_googlemail.com
  *
  */
-public class CopyTargetSpellEffect extends OneShotEffect<CopyTargetSpellEffect> {
+public class CopyTargetSpellEffect extends OneShotEffect {
 
     public CopyTargetSpellEffect() {
         super(Outcome.Copy);

Mage/src/mage/abilities/effects/common/CopyTokenEffect.java

@@ -11,7 +11,7 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.Token;
 
-public class CopyTokenEffect extends ContinuousEffectImpl<CopyTokenEffect> {
+public class CopyTokenEffect extends ContinuousEffectImpl {
     protected Token token;
 
     public CopyTokenEffect(Token token) {

Mage/src/mage/abilities/effects/common/CounterTargetEffect.java

@@ -38,7 +38,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CounterTargetEffect extends OneShotEffect<CounterTargetEffect> {
+public class CounterTargetEffect extends OneShotEffect {
 
     public CounterTargetEffect() {
         super(Outcome.Detriment);

Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java

@@ -45,7 +45,7 @@ import mage.constants.Zone;
 /**
  * @author nantuko, North
  */
-public class CounterTargetWithReplacementEffect extends OneShotEffect<CounterTargetWithReplacementEffect> {
+public class CounterTargetWithReplacementEffect extends OneShotEffect {
 
     private Zone targetZone;
     private boolean flag;

Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java

@@ -43,7 +43,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CounterUnlessPaysEffect extends OneShotEffect<CounterUnlessPaysEffect> {
+public class CounterUnlessPaysEffect extends OneShotEffect {
 
     protected Cost cost;
     protected DynamicValue genericMana;

Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java

@@ -39,7 +39,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect<CreateDelayedTriggeredAbilityEffect> {
+public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
 
     protected DelayedTriggeredAbility ability;
     protected boolean copyTargets;

Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java

@@ -40,7 +40,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CreateSpecialActionEffect extends OneShotEffect<CreateSpecialActionEffect> {
+public class CreateSpecialActionEffect extends OneShotEffect {
 
     protected SpecialAction action;
 

Mage/src/mage/abilities/effects/common/CreateTokenEffect.java

@@ -42,7 +42,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CreateTokenEffect extends OneShotEffect<CreateTokenEffect> {
+public class CreateTokenEffect extends OneShotEffect {
 
     private Token token;
     private DynamicValue amount;

Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java

@@ -17,7 +17,7 @@ import mage.util.CardUtil;
  * @author Loki
  */
 
-public class CreateTokenTargetEffect extends OneShotEffect<CreateTokenTargetEffect> {
+public class CreateTokenTargetEffect extends OneShotEffect {
     private Token token;
     private DynamicValue amount;
     private boolean tapped;

Mage/src/mage/abilities/effects/common/DamageAllControlledTargetEffect.java

@@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamageAllControlledTargetEffect extends OneShotEffect<DamageAllControlledTargetEffect> {
+public class DamageAllControlledTargetEffect extends OneShotEffect {
 
     private FilterCreaturePermanent filter;
     private int amount;

Mage/src/mage/abilities/effects/common/DamageAllEffect.java

@@ -42,7 +42,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamageAllEffect extends OneShotEffect<DamageAllEffect> {
+public class DamageAllEffect extends OneShotEffect {
 
     private FilterPermanent filter;
     private DynamicValue amount;

Mage/src/mage/abilities/effects/common/DamageControllerEffect.java

@@ -41,7 +41,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamageControllerEffect extends OneShotEffect<DamageControllerEffect> {
+public class DamageControllerEffect extends OneShotEffect {
 
     protected DynamicValue amount;
     protected boolean preventable;

Mage/src/mage/abilities/effects/common/DamageEverythingEffect.java

@@ -45,7 +45,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamageEverythingEffect extends OneShotEffect<DamageEverythingEffect> {
+public class DamageEverythingEffect extends OneShotEffect {
 
     private DynamicValue amount;
     private FilterPermanent filter;

Mage/src/mage/abilities/effects/common/DamageMultiEffect.java

@@ -44,7 +44,7 @@ import mage.target.Target;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamageMultiEffect extends OneShotEffect<DamageMultiEffect> {
+public class DamageMultiEffect extends OneShotEffect {
 
     protected DynamicValue amount;
 

Mage/src/mage/abilities/effects/common/DamagePlayersEffect.java

@@ -41,7 +41,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamagePlayersEffect extends OneShotEffect<DamagePlayersEffect> {
+public class DamagePlayersEffect extends OneShotEffect {
     private DynamicValue amount;
     private TargetController controller;
 

Mage/src/mage/abilities/effects/common/DamageSelfEffect.java

@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author North, Quercitron
  */
-public class DamageSelfEffect extends OneShotEffect<DamageSelfEffect> {
+public class DamageSelfEffect extends OneShotEffect {
     
     protected int amount;
 

Mage/src/mage/abilities/effects/common/DamageTargetEffect.java

@@ -44,7 +44,7 @@ import mage.target.Target;
  * @author BetaSteward_at_googlemail.com
  * @author North
  */
-public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
+public class DamageTargetEffect extends OneShotEffect {
 
     protected DynamicValue amount;
     protected boolean preventable;

Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java

@@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DestroyAllControlledTargetEffect extends OneShotEffect<DestroyAllControlledTargetEffect> {
+public class DestroyAllControlledTargetEffect extends OneShotEffect {
 
     private FilterPermanent filter;
 

Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java

@@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DestroyAllNamedPermanentsEffect extends OneShotEffect<DestroyAllNamedPermanentsEffect> {
+public class DestroyAllNamedPermanentsEffect extends OneShotEffect {
 
     public DestroyAllNamedPermanentsEffect() {
         super(Outcome.DestroyPermanent);

Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java

@@ -41,7 +41,7 @@ import mage.target.Target;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DestroyMultiTargetEffect extends OneShotEffect<DestroyMultiTargetEffect> {
+public class DestroyMultiTargetEffect extends OneShotEffect {
     protected boolean noRegen;
 
     public DestroyMultiTargetEffect() {

Mage/src/mage/abilities/effects/common/DestroySourceEffect.java

@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DestroySourceEffect extends OneShotEffect<DestroySourceEffect> {
+public class DestroySourceEffect extends OneShotEffect {
 
     protected boolean noRegen;
 

Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java

@@ -43,7 +43,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DestroyTargetEffect extends OneShotEffect<DestroyTargetEffect> {
+public class DestroyTargetEffect extends OneShotEffect {
 
     protected boolean noRegen;
 

Mage/src/mage/abilities/effects/common/DetainAllEffect.java

@@ -49,7 +49,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class DetainAllEffect extends OneShotEffect<DetainAllEffect> {
+public class DetainAllEffect extends OneShotEffect {
 
     private FilterPermanent filter = new FilterPermanent();
 

Mage/src/mage/abilities/effects/common/DetainTargetEffect.java

@@ -57,7 +57,7 @@ import mage.util.CardUtil;
 //    or block and its activated abilities can’t be activated.
 //
 
-public class DetainTargetEffect extends OneShotEffect<DetainTargetEffect> {
+public class DetainTargetEffect extends OneShotEffect {
 
     public DetainTargetEffect() {
         super(Outcome.LoseAbility);

Mage/src/mage/abilities/effects/common/DevourEffect.java

@@ -50,7 +50,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
  * 
  * @author LevelX2
  */
-public class DevourEffect extends ReplacementEffectImpl<DevourEffect> {
+public class DevourEffect extends ReplacementEffectImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures to devour");
     static {

Mage/src/mage/abilities/effects/common/DoIfCostPaid.java

@@ -10,7 +10,7 @@ import mage.game.Game;
 import mage.players.Player;
 import mage.util.CardUtil;
 
-public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
+public class DoIfCostPaid extends OneShotEffect {
     private final OneShotEffect executingEffect;
     private final Cost cost;
     private String chooseUseText;

Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java

@@ -43,7 +43,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DrawCardAllEffect extends OneShotEffect<DrawCardAllEffect> {
+public class DrawCardAllEffect extends OneShotEffect {
 
     private TargetController targetController;
     protected DynamicValue amount;

Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java

@@ -41,7 +41,7 @@ import mage.util.CardUtil;
 /**
  * @author BetaSteward_at_googlemail.com
  */
-public class DrawCardSourceControllerEffect extends OneShotEffect<DrawCardSourceControllerEffect> {
+public class DrawCardSourceControllerEffect extends OneShotEffect {
 
     protected DynamicValue amount;
 

Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java

@@ -42,7 +42,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DrawCardTargetEffect extends OneShotEffect<DrawCardTargetEffect> {
+public class DrawCardTargetEffect extends OneShotEffect {
 
     protected DynamicValue amount;
     protected boolean optional;

Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java

@@ -39,7 +39,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DrawDiscardControllerEffect extends OneShotEffect<DrawDiscardControllerEffect> {
+public class DrawDiscardControllerEffect extends OneShotEffect {
 
     private int cardsToDraw;
     private int cardsToDiscard;

Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java

@@ -39,7 +39,7 @@ import mage.util.CardUtil;
  *
  * @author LevelX2
  */
-public class DrawDiscardTargetEffect extends OneShotEffect<DrawDiscardTargetEffect> {
+public class DrawDiscardTargetEffect extends OneShotEffect {
 
     private int cardsToDraw;
     private int cardsToDiscard;

Mage/src/mage/abilities/effects/common/EndTurnEffect.java

@@ -33,7 +33,7 @@ import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.game.Game;
 
-public class EndTurnEffect extends OneShotEffect<EndTurnEffect> {
+public class EndTurnEffect extends OneShotEffect {
 
     public EndTurnEffect() {
         super(Outcome.Detriment);

Mage/src/mage/abilities/effects/common/EpicEffect.java

@@ -32,7 +32,7 @@ import mage.players.Player;
  * resolves, but effects (such as the epic ability itself) can still put copies
  * of spells onto the stack. *
  */
-public class EpicEffect extends OneShotEffect<EpicEffect> {
+public class EpicEffect extends OneShotEffect {
 
     final String rule = "<br><br/>Epic <i>(For the rest of the game, you can't cast spells.  At the beginning of each of your upkeeps for the rest of the game, copy this spell except for its epic ability.  If the spell has targets, you may choose new targets for the copy)";
 
@@ -79,7 +79,7 @@ public class EpicEffect extends OneShotEffect<EpicEffect> {
     }
 }
 
-class EpicReplacementEffect extends ReplacementEffectImpl<EpicReplacementEffect> {
+class EpicReplacementEffect extends ReplacementEffectImpl {
 
     public EpicReplacementEffect() {
         super(Duration.EndOfGame, Outcome.Neutral);
@@ -123,7 +123,7 @@ class EpicReplacementEffect extends ReplacementEffectImpl<EpicReplacementEffect>
     }
 }
 
-class EpicPushEffect extends OneShotEffect<EpicPushEffect> {
+class EpicPushEffect extends OneShotEffect {
 
     final private Spell spell;
 

Mage/src/mage/abilities/effects/common/ExileAllEffect.java

@@ -43,7 +43,7 @@ import mage.players.Player;
  *
  * @author LevelX2
  */
-public class ExileAllEffect extends OneShotEffect<ExileAllEffect> {
+public class ExileAllEffect extends OneShotEffect {
 
     private FilterPermanent filter;
     private String exileZone = null;

Mage/src/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java

@@ -43,7 +43,7 @@ import mage.util.CardUtil;
  *
  * @author LevelX2
  */
-public class ExileCardFromOwnGraveyardControllerEffect extends OneShotEffect<ExileCardFromOwnGraveyardControllerEffect> {
+public class ExileCardFromOwnGraveyardControllerEffect extends OneShotEffect {
     private int amount;
 
     public ExileCardFromOwnGraveyardControllerEffect(int amount) {

Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java

@@ -41,7 +41,7 @@ import mage.target.TargetCard;
  *
  * @author LevelX2
  */
-public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect<ExileCardYouChooseTargetOpponentEffect> {
+public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect {
 
     private FilterCard filter;
 

Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java

@@ -44,7 +44,7 @@ import mage.target.common.TargetCardInYourGraveyard;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ExileFromZoneTargetEffect extends OneShotEffect<ExileFromZoneTargetEffect> {
+public class ExileFromZoneTargetEffect extends OneShotEffect {
 
     private Zone zone;
     private FilterCard filter;

Mage/src/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java

@@ -42,7 +42,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class ExileGraveyardAllTargetPlayerEffect extends OneShotEffect<ExileGraveyardAllTargetPlayerEffect> {
+public class ExileGraveyardAllTargetPlayerEffect extends OneShotEffect {
 
     public ExileGraveyardAllTargetPlayerEffect() {
         super(Outcome.Exile);

Mage/src/mage/abilities/effects/common/ExileSourceEffect.java

@@ -41,7 +41,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ExileSourceEffect extends OneShotEffect<ExileSourceEffect> {
+public class ExileSourceEffect extends OneShotEffect {
 
     private Zone onlyfromZone;
 

Mage/src/mage/abilities/effects/common/ExileTargetEffect.java

@@ -43,7 +43,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ExileTargetEffect extends OneShotEffect<ExileTargetEffect> {
+public class ExileTargetEffect extends OneShotEffect {
 
     private Zone onlyFromZone;
     private String exileZone = null;

Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java

@@ -43,7 +43,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ExileTargetForSourceEffect extends OneShotEffect<ExileTargetForSourceEffect> {
+public class ExileTargetForSourceEffect extends OneShotEffect {
 
     private String exileZone = null;
 

Mage/src/mage/abilities/effects/common/FightTargetSourceEffect.java

@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class FightTargetSourceEffect extends OneShotEffect<FightTargetSourceEffect> {
+public class FightTargetSourceEffect extends OneShotEffect {
 
     public FightTargetSourceEffect() {
         super(Outcome.Damage);

Mage/src/mage/abilities/effects/common/FightTargetsEffect.java

@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FightTargetsEffect extends OneShotEffect<FightTargetsEffect> {
+public class FightTargetsEffect extends OneShotEffect {
 
     public FightTargetsEffect() {
         super(Outcome.Damage);

Mage/src/mage/abilities/effects/common/FlipSourceEffect.java

@@ -15,7 +15,7 @@ import mage.players.Player;
 /**
  * @author Loki
  */
-public class FlipSourceEffect extends OneShotEffect<FlipSourceEffect> {
+public class FlipSourceEffect extends OneShotEffect {
 
     private final Token flipToken;
 

Mage/src/mage/abilities/effects/common/GainLifeEffect.java

@@ -40,7 +40,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class GainLifeEffect extends OneShotEffect<GainLifeEffect> {
+public class GainLifeEffect extends OneShotEffect {
 
     private DynamicValue life;
 

Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java

@@ -43,7 +43,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class GainLifeTargetEffect extends OneShotEffect<GainLifeTargetEffect> {
+public class GainLifeTargetEffect extends OneShotEffect {
 
     private DynamicValue life;
 

Mage/src/mage/abilities/effects/common/GetEmblemEffect.java

@@ -38,7 +38,7 @@ import mage.game.command.Emblem;
  *
  * @author nantuko
  */
-public class GetEmblemEffect extends OneShotEffect<GetEmblemEffect> {
+public class GetEmblemEffect extends OneShotEffect {
 
     private Emblem emblem;
 

Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java

@@ -41,7 +41,7 @@ import mage.util.CardUtil;
  * @author LevelX2
  *
  */
-public class HideawayPlayEffect extends OneShotEffect<HideawayPlayEffect> {
+public class HideawayPlayEffect extends OneShotEffect {
 
     public HideawayPlayEffect() {
         super(Outcome.Benefit);

Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java

@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  *
  * @author noxx
  */
-public class ImprintTargetEffect extends OneShotEffect<ImprintTargetEffect> {
+public class ImprintTargetEffect extends OneShotEffect {
 
     public ImprintTargetEffect() {
         super(Outcome.Neutral);

Mage/src/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java

@@ -39,7 +39,7 @@ import mage.players.Player;
  *
  * @author Quercitron
  */
-public class LookAtTargetPlayerHandEffect extends OneShotEffect<LookAtTargetPlayerHandEffect> {
+public class LookAtTargetPlayerHandEffect extends OneShotEffect {
 
     public LookAtTargetPlayerHandEffect() {
         super(Outcome.Benefit);

Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java

@@ -49,7 +49,7 @@ import mage.util.CardUtil;
  *
  * @author LevelX
  */
-public class LookLibraryControllerEffect extends OneShotEffect<LookLibraryControllerEffect> {
+public class LookLibraryControllerEffect extends OneShotEffect {
 
     protected DynamicValue numberOfCards;
     protected boolean mayShuffleAfter = false;

Mage/src/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java

@@ -38,7 +38,7 @@ import mage.players.Player;
  *
  * @author nantuko
  */
-public class LoseControlOnOtherPlayersControllerEffect extends OneShotEffect<LoseControlOnOtherPlayersControllerEffect> {
+public class LoseControlOnOtherPlayersControllerEffect extends OneShotEffect {
 
     public LoseControlOnOtherPlayersControllerEffect() {
         super(Outcome.Detriment);

Mage/src/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java

@@ -41,7 +41,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LoseLifeAllPlayersEffect extends OneShotEffect<LoseLifeAllPlayersEffect> {
+public class LoseLifeAllPlayersEffect extends OneShotEffect {
 
     private final DynamicValue amount;