[refactor] removed generic parameter from remaining Effect classes

Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java

@@ -69,7 +69,7 @@ public class IntimidationBolt extends CardImpl {
     }
 }
 
-class IntimidationEffect extends RestrictionEffect<IntimidationEffect> {
+class IntimidationEffect extends RestrictionEffect {
 
     public IntimidationEffect(Duration duration) {
         super(duration);

Mage.Sets/src/mage/sets/alarareborn/TraceOfAbundance.java

@@ -125,7 +125,7 @@ class TraceOfAbundanceTriggeredAbility extends TriggeredManaAbility<TraceOfAbund
     }
 }
 
-class TraceOfAbundanceEffect extends ManaEffect<TraceOfAbundanceEffect> {
+class TraceOfAbundanceEffect extends ManaEffect {
 
     public TraceOfAbundanceEffect() {
         super();

Mage.Sets/src/mage/sets/antiquities/DampingField.java

@@ -67,7 +67,7 @@ public class DampingField extends CardImpl {
     }
 }
 
-class DampingFieldEffect extends RestrictionUntapNotMoreThanEffect<DampingFieldEffect> {
+class DampingFieldEffect extends RestrictionUntapNotMoreThanEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledArtifactPermanent("an artifact");
 

Mage.Sets/src/mage/sets/antiquities/TransmuteArtifact.java

@@ -73,7 +73,7 @@ public class TransmuteArtifact extends CardImpl {
     }
 }
 
-class TransmuteArtifactEffect extends SearchEffect<TransmuteArtifactEffect> {
+class TransmuteArtifactEffect extends SearchEffect {
 
 
     public TransmuteArtifactEffect() {

Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java

@@ -107,7 +107,7 @@ class AggraveteEffect extends OneShotEffect {
     }
 }
 
-class AggravateRequirementEffect extends RequirementEffect<AggravateRequirementEffect> {
+class AggravateRequirementEffect extends RequirementEffect {
 
     public AggravateRequirementEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/avacynrestored/ArcaneMelee.java

@@ -67,7 +67,7 @@ public class ArcaneMelee extends CardImpl {
     }
 }
 
-class ArcaneMeleeCostReductionEffect extends CostModificationEffectImpl<ArcaneMeleeCostReductionEffect> {
+class ArcaneMeleeCostReductionEffect extends CostModificationEffectImpl {
 
     ArcaneMeleeCostReductionEffect ( ) {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);

Mage.Sets/src/mage/sets/avacynrestored/BowerPassage.java

@@ -66,7 +66,7 @@ public class BowerPassage extends CardImpl {
     }
 }
 
-class BowerPassageEffect extends RestrictionEffect<BowerPassageEffect> {
+class BowerPassageEffect extends RestrictionEffect {
 
     BowerPassageEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java

@@ -76,7 +76,7 @@ public class ChampionOfLambholt extends CardImpl {
     }
 }
 
-class ChampionOfLambholtEffect extends RestrictionEffect<ChampionOfLambholtEffect> {
+class ChampionOfLambholtEffect extends RestrictionEffect {
 
     ChampionOfLambholtEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/avacynrestored/FloweringLumberknot.java

@@ -70,7 +70,7 @@ public class FloweringLumberknot extends CardImpl {
     }
 }
 
-class FloweringLumberknotEffect extends RestrictionEffect<FloweringLumberknotEffect> {
+class FloweringLumberknotEffect extends RestrictionEffect {
 
     public FloweringLumberknotEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java

@@ -80,7 +80,7 @@ public class HeraldOfWar extends CardImpl {
     }
 }
 
-class HeraldOfWarCostReductionEffect extends CostModificationEffectImpl<HeraldOfWarCostReductionEffect> {
+class HeraldOfWarCostReductionEffect extends CostModificationEffectImpl {
 
     HeraldOfWarCostReductionEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);

Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java

@@ -94,7 +94,7 @@ class HuntedGhoulAbility extends EvasionAbility {
     }
 }
 
-class HuntedGhoulEffect extends RestrictionEffect<HuntedGhoulEffect> {
+class HuntedGhoulEffect extends RestrictionEffect {
 
     public HuntedGhoulEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java

@@ -81,7 +81,7 @@ public class GoblinCohort extends CardImpl {
     }
 }
 
-class GoblinCohortEffect extends RestrictionEffect<GoblinCohortEffect> {
+class GoblinCohortEffect extends RestrictionEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("another artifact");
 

Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java

@@ -77,7 +77,7 @@ public class KentaroTheSmilingCat extends CardImpl {
     }
 
     //TODO : change CostModification to AlternativCost
-    private class KentaroTheSmilingCatCostReductionEffect extends CostModificationEffectImpl<KentaroTheSmilingCatCostReductionEffect> {
+    private class KentaroTheSmilingCatCostReductionEffect extends CostModificationEffectImpl {
 
         private static final String effectText = "You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost";
 

Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java

@@ -98,7 +98,7 @@ public class PetalmaneBaku extends CardImpl {
         }
 }
 
-    private class PetalmaneBakuManaEffect extends ManaEffect<PetalmaneBakuManaEffect> {
+    private class PetalmaneBakuManaEffect extends ManaEffect {
 
         PetalmaneBakuManaEffect() {
             super();

Mage.Sets/src/mage/sets/bornofthegods/FelhideBrawler.java

@@ -72,7 +72,7 @@ public class FelhideBrawler extends CardImpl {
     }
 }
 
-class FelhideBrawlerRestrictionEffect extends RestrictionEffect<FelhideBrawlerRestrictionEffect> {
+class FelhideBrawlerRestrictionEffect extends RestrictionEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Minotaur");
 

Mage.Sets/src/mage/sets/bornofthegods/KrakenOfTheStraits.java

@@ -73,7 +73,7 @@ public class KrakenOfTheStraits extends CardImpl {
     }
 }
 
-class CantBeBlockedByCreaturesWithLessPowerEffect extends RestrictionEffect<CantBeBlockedByCreaturesWithLessPowerEffect> {
+class CantBeBlockedByCreaturesWithLessPowerEffect extends RestrictionEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands");
     

Mage.Sets/src/mage/sets/bornofthegods/MarshmistTitan.java

@@ -74,7 +74,7 @@ public class MarshmistTitan extends CardImpl {
     }
 }
 
-class MarshmistTitanCostReductionEffect extends CostModificationEffectImpl<MarshmistTitanCostReductionEffect> {
+class MarshmistTitanCostReductionEffect extends CostModificationEffectImpl {
 
     public MarshmistTitanCostReductionEffect() {
         super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);

Mage.Sets/src/mage/sets/bornofthegods/Tromokratis.java

@@ -91,7 +91,7 @@ public class Tromokratis extends CardImpl {
 }
 
 
-class CantBeBlockedUnlessAllEffect extends RestrictionEffect<CantBeBlockedUnlessAllEffect> {
+class CantBeBlockedUnlessAllEffect extends RestrictionEffect {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();   
             

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

@@ -75,7 +75,7 @@ public class CageOfHands extends CardImpl {
     }
 }
 
-class CageOfHandsEffect extends RestrictionEffect<CageOfHandsEffect> {
+class CageOfHandsEffect extends RestrictionEffect {
 
     public CageOfHandsEffect() {
         super(Duration.WhileOnBattlefield);

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

@@ -109,7 +109,7 @@ class HeartbeatOfSpringAbility extends TriggeredManaAbility<HeartbeatOfSpringAbi
     }
 }
 
-class HeartbeatOfSpringEffect extends ManaEffect<HeartbeatOfSpringEffect> {
+class HeartbeatOfSpringEffect extends ManaEffect {
 
     public HeartbeatOfSpringEffect() {
         super();

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

@@ -68,7 +68,7 @@ public class ImiStatue extends CardImpl {
     }
 }
 
-class ImiStatueEffect extends RestrictionUntapNotMoreThanEffect<ImiStatueEffect> {
+class ImiStatueEffect extends RestrictionUntapNotMoreThanEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledArtifactPermanent("an artifact");
 

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

@@ -72,7 +72,7 @@ public class InameDeathAspect extends CardImpl {
     }
 }
 
-class InameDeathAspectEffect extends SearchEffect<InameDeathAspectEffect> {
+class InameDeathAspectEffect extends SearchEffect {
 
     private static final FilterCreatureCard filter = new FilterCreatureCard();
 

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

@@ -65,7 +65,7 @@ public class RiteOfFlame extends CardImpl {
     }
 }
 
-class RiteOfFlameManaEffect extends ManaEffect<RiteOfFlameManaEffect> {
+class RiteOfFlameManaEffect extends ManaEffect {
     private static final FilterCard filter = new FilterCard();
 
     static {

Mage.Sets/src/mage/sets/commander/AnimarSoulOfElements.java

@@ -105,7 +105,7 @@ public class AnimarSoulOfElements extends CardImpl {
     }
 }
 
-class AnimarCostReductionEffect extends CostModificationEffectImpl<AnimarCostReductionEffect> {
+class AnimarCostReductionEffect extends CostModificationEffectImpl {
 
     AnimarCostReductionEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);

Mage.Sets/src/mage/sets/commander/BuriedAlive.java

@@ -70,7 +70,7 @@ public class BuriedAlive extends CardImpl {
     }
 }
 
-class BuriedAliveEffect extends SearchEffect<BuriedAliveEffect> {
+class BuriedAliveEffect extends SearchEffect {
 
   public BuriedAliveEffect() {
         super(new TargetCardInLibrary(0, 3, new FilterCreatureCard()), Outcome.Detriment);

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

@@ -67,7 +67,7 @@ public class CommandTower extends CardImpl {
     }
 }
 
-class CommandTowerManaEffect extends ManaEffect<CommandTowerManaEffect> {
+class CommandTowerManaEffect extends ManaEffect {
 
     public CommandTowerManaEffect() {
         super();

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

@@ -70,7 +70,7 @@ public class HoodedHorror extends CardImpl {
     }
 }
 
-class HoodedHorrorCantBeBlockedEffect extends RestrictionEffect<HoodedHorrorCantBeBlockedEffect> {
+class HoodedHorrorCantBeBlockedEffect extends RestrictionEffect {
 
     private final static FilterCreaturePermanent filter = new FilterCreaturePermanent();
 

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

@@ -155,7 +155,7 @@ class IllusionistsGambitRemoveFromCombatEffect extends OneShotEffect {
     }
 }
 
-class IllusionistsGambitRequirementEffect extends RequirementEffect<IllusionistsGambitRequirementEffect> {
+class IllusionistsGambitRequirementEffect extends RequirementEffect {
 
     private List attackers;
     private Phase phase;

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

@@ -92,7 +92,7 @@ public class OpalPalace extends CardImpl {
     }
 }
 
-class OpalPalaceManaEffect extends ManaEffect<OpalPalaceManaEffect> {
+class OpalPalaceManaEffect extends ManaEffect {
 
     public OpalPalaceManaEffect() {
         super();

Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java

@@ -74,7 +74,7 @@ public class ExoticOrchard extends CardImpl {
     }
 }
 
-class ExoticOrchardEffect extends ManaEffect<ExoticOrchardEffect> {
+class ExoticOrchardEffect extends ManaEffect {
 
     private static final FilterPermanent filter = new FilterLandPermanent();
     static {

Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java

@@ -129,7 +129,7 @@ class GwafaHazidProfiteerEffect1 extends OneShotEffect {
 
 }
 
-class GwafaHazidProfiteerEffect2 extends RestrictionEffect<GwafaHazidProfiteerEffect2> {
+class GwafaHazidProfiteerEffect2 extends RestrictionEffect {
 
     public GwafaHazidProfiteerEffect2() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/conflux/SuicidalCharge.java

@@ -71,7 +71,7 @@ public class SuicidalCharge extends CardImpl {
     }
 }
 
-class SuicidalChargeEffect extends RequirementEffect<SuicidalChargeEffect> {
+class SuicidalChargeEffect extends RequirementEffect {
 
     public SuicidalChargeEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java

@@ -74,7 +74,7 @@ public class ViewFromAbove extends CardImpl {
     }
 }
 
-class ViewFromAboveEffect extends PostResolveEffect<ViewFromAboveEffect> {
+class ViewFromAboveEffect extends PostResolveEffect {
 
     public ViewFromAboveEffect() {
         this.staticText = "If you control a white permanent, return {this} to its owner's hand";

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

@@ -76,7 +76,7 @@ public class IncreasingAmbition extends CardImpl {
     }
 }
 
-class IncreasingAmbitionEffect extends SearchEffect<IncreasingAmbitionEffect> {
+class IncreasingAmbitionEffect extends SearchEffect {
 
     public IncreasingAmbitionEffect() {
         super(new TargetCardInLibrary(), Outcome.DrawCard);

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

@@ -77,7 +77,7 @@ public class ThaliaGuardianOfThraben extends CardImpl {
     }
 }
 
-class ThaliaGuardianOfThrabenCostReductionEffect extends CostModificationEffectImpl<ThaliaGuardianOfThrabenCostReductionEffect> {
+class ThaliaGuardianOfThrabenCostReductionEffect extends CostModificationEffectImpl {
 
     ThaliaGuardianOfThrabenCostReductionEffect ( ) {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.INCREASE_COST);

Mage.Sets/src/mage/sets/darksteel/Trinisphere.java

@@ -68,7 +68,7 @@ public class Trinisphere extends CardImpl {
     }
 }
 
-class TrinisphereEffect extends CostModificationEffectImpl<TrinisphereEffect> {
+class TrinisphereEffect extends CostModificationEffectImpl {
 
     public TrinisphereEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Neutral, CostModificationType.SET_COST);

Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java

@@ -161,7 +161,7 @@ class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility<UtopiaSprawlTrig
 }
 
 
-class UtopiaSprawlEffect extends ManaEffect<UtopiaSprawlEffect> {
+class UtopiaSprawlEffect extends ManaEffect {
 
     public UtopiaSprawlEffect() {
         super();

Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java

@@ -170,7 +170,7 @@ class CouncilOfTheAbsoluteReplacementEffect extends ReplacementEffectImpl {
     }
 }
 
-class CouncilOfTheAbsoluteCostReductionEffect extends CostModificationEffectImpl<CouncilOfTheAbsoluteCostReductionEffect> {
+class CouncilOfTheAbsoluteCostReductionEffect extends CostModificationEffectImpl {
 
     public CouncilOfTheAbsoluteCostReductionEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);

Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java

@@ -106,7 +106,7 @@ class PlasmCaptureCounterEffect extends OneShotEffect {
     }
 }
 
-class PlasmCaptureManaEffect extends ManaEffect<PlasmCaptureManaEffect> {
+class PlasmCaptureManaEffect extends ManaEffect {
 
     int amountOfMana;
 

Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java

@@ -116,7 +116,7 @@ class ZhurTaaAncientAbility extends TriggeredManaAbility<ZhurTaaAncientAbility>
     }
 }
 
-class ZhurTaaAncientEffect extends ManaEffect<ZhurTaaAncientEffect> {
+class ZhurTaaAncientEffect extends ManaEffect {
 
     public ZhurTaaAncientEffect() {
         super();

Mage.Sets/src/mage/sets/eventide/BloomTender.java

@@ -73,7 +73,7 @@ public class BloomTender extends CardImpl {
     }
 }
 
-class BloomTenderEffect extends ManaEffect<BloomTenderEffect> {
+class BloomTenderEffect extends ManaEffect {
 
     public BloomTenderEffect() {
         super();

Mage.Sets/src/mage/sets/eventide/EndlessHorizons.java

@@ -78,7 +78,7 @@ public class EndlessHorizons extends CardImpl {
     }
 }
 
-class EndlessHorizonsEffect extends SearchEffect<EndlessHorizonsEffect> {
+class EndlessHorizonsEffect extends SearchEffect {
 
     private static final FilterLandCard filter = new FilterLandCard("Plains card");
 

Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java

@@ -73,7 +73,7 @@ public class RecumbentBliss extends CardImpl {
     }
 }
 
-class RecumbentBlissEffect extends RestrictionEffect<RecumbentBlissEffect> {
+class RecumbentBlissEffect extends RestrictionEffect {
 
     public RecumbentBlissEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java

@@ -108,7 +108,7 @@ public class ShrewdHatchling extends CardImpl {
     }
 }
 
-class ShrewdHatchlingEffect extends RestrictionEffect<ShrewdHatchlingEffect> {
+class ShrewdHatchlingEffect extends RestrictionEffect {
 
     public ShrewdHatchlingEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/fallenempires/HighTide.java

@@ -113,7 +113,7 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility<HighTideTrigg
     }
 }
 
-class AddBlueToTargetEffect extends ManaEffect<AddBlueToTargetEffect> {
+class AddBlueToTargetEffect extends ManaEffect {
     
 
     public AddBlueToTargetEffect() {

Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java

@@ -113,7 +113,7 @@ class DawnsReflectionTriggeredAbility extends TriggeredManaAbility<DawnsReflecti
 }
 
 
-class DawnsReflectionManaEffect extends ManaEffect<DawnsReflectionManaEffect> {
+class DawnsReflectionManaEffect extends ManaEffect {
 
     public DawnsReflectionManaEffect() {
         super();

Mage.Sets/src/mage/sets/gatecrash/DeathcultRogue.java

@@ -73,7 +73,7 @@ public class DeathcultRogue extends CardImpl {
     }
 }
 
-class DeathcultRogueRestrictionEffect extends RestrictionEffect<DeathcultRogueRestrictionEffect>  {
+class DeathcultRogueRestrictionEffect extends RestrictionEffect  {
 
     public DeathcultRogueRestrictionEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/gatecrash/HellraiserGoblin.java

@@ -82,7 +82,7 @@ public class HellraiserGoblin extends CardImpl {
     }
 }
 
-class AttacksIfAbleAllEffect extends RequirementEffect<AttacksIfAbleAllEffect> {
+class AttacksIfAbleAllEffect extends RequirementEffect {
 
     private FilterControlledCreaturePermanent filter;
 

Mage.Sets/src/mage/sets/gatecrash/LegionLoyalist.java

@@ -84,7 +84,7 @@ public class LegionLoyalist extends CardImpl {
     }
 }
 
-class CantBeBlockedByTokenEffect extends RestrictionEffect<CantBeBlockedByTokenEffect> {
+class CantBeBlockedByTokenEffect extends RestrictionEffect {
 
     public CantBeBlockedByTokenEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/gatecrash/SignalTheClans.java

@@ -72,7 +72,7 @@ public class SignalTheClans extends CardImpl {
     }
 }
 
-class SignalTheClansEffect extends SearchEffect<SignalTheClansEffect> {
+class SignalTheClansEffect extends SearchEffect {
 
 
     public SignalTheClansEffect() {

Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java

@@ -72,7 +72,7 @@ public class SkyblinderStaff extends CardImpl {
     }
 }
 
-class CantBeBlockedByCreaturesWithFlyingAttachedEffect extends RestrictionEffect<CantBeBlockedByCreaturesWithFlyingAttachedEffect> {
+class CantBeBlockedByCreaturesWithFlyingAttachedEffect extends RestrictionEffect {
 
     public CantBeBlockedByCreaturesWithFlyingAttachedEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/gatecrash/SpireTracer.java

@@ -74,7 +74,7 @@ public class SpireTracer extends CardImpl {
     }
 }
 
-class CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect extends RestrictionEffect<CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect> {
+class CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect extends RestrictionEffect {
 
     public CantBeBlockedExceptByCreaturesWithFlyingOrReachEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java

@@ -120,7 +120,7 @@ class VerdantHavenTriggeredAbility extends TriggeredManaAbility<VerdantHavenTrig
     }
 }
 
-class VerdantHavenManaEffect extends ManaEffect<VerdantHavenManaEffect> {
+class VerdantHavenManaEffect extends ManaEffect {
 
     public VerdantHavenManaEffect() {
         super();

Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java

@@ -94,7 +94,7 @@ public class InfiltratorsMagemark extends CardImpl {
     }
 }
 
-class InfiltratorsMagemarkUnblockableAllEffect extends RestrictionEffect<InfiltratorsMagemarkUnblockableAllEffect> {
+class InfiltratorsMagemarkUnblockableAllEffect extends RestrictionEffect {
 
     private FilterPermanent filter;
 

Mage.Sets/src/mage/sets/guildpact/SilhanaLedgewalker.java

@@ -77,7 +77,7 @@ public class SilhanaLedgewalker extends CardImpl {
 
 }
 
-class SilhanaLedgewalkerEffect extends RestrictionEffect<SilhanaLedgewalkerEffect> {
+class SilhanaLedgewalkerEffect extends RestrictionEffect {
 
     public SilhanaLedgewalkerEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java

@@ -88,7 +88,7 @@ public class OrcishLumberjack extends CardImpl {
     }
 }
 
-class OrcishLumberjackManaEffect extends ManaEffect <OrcishLumberjackManaEffect> {
+class OrcishLumberjackManaEffect extends ManaEffect {
 
     public OrcishLumberjackManaEffect() {
         super();

Mage.Sets/src/mage/sets/iceage/WildGrowth.java

@@ -114,7 +114,7 @@ class WildGrowthTriggeredAbility extends TriggeredManaAbility<WildGrowthTriggere
     }
 }
 
-class WildGrowthEffect extends ManaEffect<WildGrowthEffect> {
+class WildGrowthEffect extends ManaEffect {
 
     public WildGrowthEffect() {
         super();

Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java

@@ -78,7 +78,7 @@ public class CurseOfTheNightlyHunt extends CardImpl {
     }
 }
 
-class CurseOfTheNightlyHuntEffect extends RequirementEffect<CurseOfTheNightlyHuntEffect> {
+class CurseOfTheNightlyHuntEffect extends RequirementEffect {
 
     public CurseOfTheNightlyHuntEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java

@@ -97,7 +97,7 @@ class OrchardSpiritAbility extends EvasionAbility {
     }
 }
 
-class OrchardSpiritEffect extends RestrictionEffect<OrchardSpiritEffect> {
+class OrchardSpiritEffect extends RestrictionEffect {
 
     public OrchardSpiritEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java

@@ -72,7 +72,7 @@ public class RooftopStorm extends CardImpl {
 
 
 //TODO : change to alternativCost
-class RooftopStormCostReductionEffect extends CostModificationEffectImpl<RooftopStormCostReductionEffect> {
+class RooftopStormCostReductionEffect extends CostModificationEffectImpl {
 
     private static final String effectText = "You may pay {0} rather than pay the mana cost for Zombie creature spells you cast";
 

Mage.Sets/src/mage/sets/innistrad/StromkirkNoble.java

@@ -77,7 +77,7 @@ public class StromkirkNoble extends CardImpl {
     }
 }
 
-class StromkirkEffect extends RestrictionEffect<StromkirkEffect> {
+class StromkirkEffect extends RestrictionEffect {
 
     public StromkirkEffect() {
         super(Duration.WhileOnBattlefield);

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

@@ -86,7 +86,7 @@ public class BattlefieldThaumaturge extends CardImpl {
     }
 }
 
-class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEffectImpl<BattlefieldThaumaturgeSpellsCostReductionEffect> {
+class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEffectImpl {
 
     private static final FilterSpell filter = new FilterSpell("instant and sorcery spell");
 

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

@@ -119,7 +119,7 @@ class DesertersQuartersTapTargetEffect extends TapTargetEffect {
     }
 }
 
-class DesertersQuartersRestrictionEffect extends RestrictionEffect<DesertersQuartersRestrictionEffect> {
+class DesertersQuartersRestrictionEffect extends RestrictionEffect {
 
     public DesertersQuartersRestrictionEffect() {
         super(Duration.WhileOnBattlefield);

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

@@ -115,7 +115,7 @@ class MarketFestivalTriggeredAbility extends TriggeredManaAbility<MarketFestival
 }
 
 
-class MarketFestivalManaEffect extends ManaEffect<MarketFestivalManaEffect> {
+class MarketFestivalManaEffect extends ManaEffect {
 
     public MarketFestivalManaEffect() {
         super();

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

@@ -149,7 +149,7 @@ class OppressiveRaysEffect extends ReplacementEffectImpl {
 
 }
 
-class OppressiveRaysCostModificationEffect extends CostModificationEffectImpl<OppressiveRaysCostModificationEffect> {
+class OppressiveRaysCostModificationEffect extends CostModificationEffectImpl {
 
     OppressiveRaysCostModificationEffect ( ) {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.INCREASE_COST);

Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java

@@ -82,7 +82,7 @@ public class QuietSpeculation extends CardImpl {
     }
 }
 
-class SearchLibraryPutInGraveEffect extends SearchEffect<SearchLibraryPutInGraveEffect> {
+class SearchLibraryPutInGraveEffect extends SearchEffect {
 
     public SearchLibraryPutInGraveEffect(TargetCardInLibrary target) {
         super(target, Outcome.Neutral);

Mage.Sets/src/mage/sets/legions/HunterSliver.java

@@ -75,7 +75,7 @@ public class HunterSliver extends CardImpl {
     }
 }
 
-class ProvokeEffect extends RequirementEffect<ProvokeEffect> {
+class ProvokeEffect extends RequirementEffect {
 
     public ProvokeEffect() {
         this(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/limitedalpha/Smoke.java

@@ -68,7 +68,7 @@ public class Smoke extends CardImpl {
     }
 }
 
-class SmokeEffect extends RestrictionUntapNotMoreThanEffect<SmokeEffect> {
+class SmokeEffect extends RestrictionUntapNotMoreThanEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent();
 

Mage.Sets/src/mage/sets/limitedalpha/WinterOrb.java

@@ -66,7 +66,7 @@ public class WinterOrb extends CardImpl {
     }
 }
 
-class WinterOrbEffect extends RestrictionUntapNotMoreThanEffect<WinterOrbEffect> {
+class WinterOrbEffect extends RestrictionUntapNotMoreThanEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledLandPermanent();
 

Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java

@@ -95,7 +95,7 @@ class DreadWarlockAbility extends EvasionAbility {
     }
 }
 
-class DreadWarlockEffect extends RestrictionEffect<DreadWarlockEffect> {
+class DreadWarlockEffect extends RestrictionEffect {
 
     public DreadWarlockEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java

@@ -72,7 +72,7 @@ public class BloodcrazedGoblin extends CardImpl {
 
 }
 
-class BloodcrazedGoblinEffect extends RestrictionEffect<BloodcrazedGoblinEffect> {
+class BloodcrazedGoblinEffect extends RestrictionEffect {
 
     public BloodcrazedGoblinEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java

@@ -72,7 +72,7 @@ public class HarborSerpent extends CardImpl {
     }
 }
 
-class HarborSerpentEffect extends RestrictionEffect<HarborSerpentEffect> {
+class HarborSerpentEffect extends RestrictionEffect {
 
     private final FilterLandPermanent filter = new FilterLandPermanent("Island");
 

Mage.Sets/src/mage/sets/magic2012/TectonicRift.java

@@ -67,7 +67,7 @@ public class TectonicRift extends CardImpl {
     }
 }
 
-class TectonicRiftEffect extends RestrictionEffect<TectonicRiftEffect> {
+class TectonicRiftEffect extends RestrictionEffect {
 
     TectonicRiftEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/magic2013/Omniscience.java

@@ -69,7 +69,7 @@ public class Omniscience extends CardImpl {
     }
 }
 
-class OmniscienceEffect extends CostModificationEffectImpl<OmniscienceEffect> {
+class OmniscienceEffect extends CostModificationEffectImpl {
 
     public OmniscienceEffect() {
         super(Duration.WhileOnBattlefield, Outcome.PlayForFree, CostModificationType.SET_COST);

Mage.Sets/src/mage/sets/magic2013/PredatoryRampage.java

@@ -80,7 +80,7 @@ public class PredatoryRampage extends CardImpl {
     }
 }
 
-class PredatoryRampageEffect extends RequirementEffect<PredatoryRampageEffect> {
+class PredatoryRampageEffect extends RequirementEffect {
 
     public PredatoryRampageEffect(Duration duration) {
         super(duration);

Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java

@@ -83,7 +83,7 @@ public class SlumberingDragon extends CardImpl {
     }
 }
 
-class SlumberingDragonEffect extends RestrictionEffect<SlumberingDragonEffect> {
+class SlumberingDragonEffect extends RestrictionEffect {
 
     public SlumberingDragonEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/magic2013/WarFalcon.java

@@ -77,7 +77,7 @@ public class WarFalcon extends CardImpl {
     }
 }
 
-class WarFalconEffect extends RestrictionEffect<WarFalconEffect> {
+class WarFalconEffect extends RestrictionEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("Knight or a Soldier");
     

Mage.Sets/src/mage/sets/magic2014/CyclopsTyrant.java

@@ -74,7 +74,7 @@ public class CyclopsTyrant extends CardImpl {
     }
 }
 
-class CyclopsTyrantEffect extends RestrictionEffect<CyclopsTyrantEffect> {
+class CyclopsTyrantEffect extends RestrictionEffect {
 
     public CyclopsTyrantEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/magic2014/GoblinDiplomats.java

@@ -72,7 +72,7 @@ public class GoblinDiplomats extends CardImpl {
     }
 }
 
-class GoblinDiplomatsEffect extends RequirementEffect<GoblinDiplomatsEffect> {
+class GoblinDiplomatsEffect extends RequirementEffect {
 
     public GoblinDiplomatsEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java

@@ -64,7 +64,7 @@ public class SeismicStomp extends CardImpl {
     }
 }
 
-class SeismicStompEffect extends RestrictionEffect<SeismicStompEffect> {
+class SeismicStompEffect extends RestrictionEffect {
 
     SeismicStompEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java

@@ -92,7 +92,7 @@ public class KyrenToy extends CardImpl {
         }
 }
 
-    private class KyrenToyManaEffect extends ManaEffect<KyrenToyManaEffect> {
+    private class KyrenToyManaEffect extends ManaEffect {
 
         KyrenToyManaEffect() {
             super();

Mage.Sets/src/mage/sets/mirage/AmberPrison.java

@@ -126,7 +126,7 @@ class AmberPrisonTapTargetEffect extends OneShotEffect {
     
 }
 
-class AmberPrisonRestrictionEffect extends RestrictionEffect<AmberPrisonRestrictionEffect> {
+class AmberPrisonRestrictionEffect extends RestrictionEffect {
 
     public AmberPrisonRestrictionEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/mirrodin/ChromeMox.java

@@ -122,7 +122,7 @@ class ChromeMoxEffect extends OneShotEffect {
 
 }
 
-class ChromeMoxManaEffect extends ManaEffect<ChromeMoxManaEffect> {
+class ChromeMoxManaEffect extends ManaEffect {
 
 
     ChromeMoxManaEffect() {

Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java

@@ -95,7 +95,7 @@ class ConcussiveBoltEffect extends OneShotEffect {
     }
 }
 
-class ConcussiveBoltRestrictionEffect extends RestrictionEffect<ConcussiveBoltRestrictionEffect> {
+class ConcussiveBoltRestrictionEffect extends RestrictionEffect {
 
     public ConcussiveBoltRestrictionEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java

@@ -73,7 +73,7 @@ public class HeroOfOxidRidge extends CardImpl {
 
 }
 
-class HeroOfOxidRidgeEffect extends RestrictionEffect<HeroOfOxidRidgeEffect> {
+class HeroOfOxidRidgeEffect extends RestrictionEffect {
 
     public HeroOfOxidRidgeEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java

@@ -96,7 +96,7 @@ class SignalPestAbility extends EvasionAbility {
     }
 }
 
-class SignalPestEffect extends RestrictionEffect<SignalPestEffect> {
+class SignalPestEffect extends RestrictionEffect {
 
     public SignalPestEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java

@@ -72,7 +72,7 @@ public class SpinEngine extends CardImpl {
 
 }
 
-class SpinEngineEffect extends RestrictionEffect<SpinEngineEffect> {
+class SpinEngineEffect extends RestrictionEffect {
 
     public SpinEngineEffect() {
         super(Duration.EndOfTurn);

Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java

@@ -69,7 +69,7 @@ public class TrainingDrone extends CardImpl {
     }
 }
 
-class TrainingDroneEffect extends RestrictionEffect<TrainingDroneEffect> {
+class TrainingDroneEffect extends RestrictionEffect {
 
     public TrainingDroneEffect() {
         super(Duration.WhileOnBattlefield);

Mage.Sets/src/mage/sets/modernmasters/BlindSpotGiant.java

@@ -74,7 +74,7 @@ public class BlindSpotGiant extends CardImpl {
     }
 }
 
-class BlindSpotGiantEffect extends RestrictionEffect<BlindSpotGiantEffect> {
+class BlindSpotGiantEffect extends RestrictionEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Giant");
     static {

Mage.Sets/src/mage/sets/modernmasters/GrandArbiterAugustinIV.java

@@ -91,7 +91,7 @@ public class GrandArbiterAugustinIV extends CardImpl {
     }
 }
 
-class GrandArbiterAugustinIVCostIncreaseEffect extends CostModificationEffectImpl<GrandArbiterAugustinIVCostIncreaseEffect> {
+class GrandArbiterAugustinIVCostIncreaseEffect extends CostModificationEffectImpl {
 
     private static final String effectText = "Spells your opponents cast cost {1} more to cast";
 

Mage.Sets/src/mage/sets/modernmasters/PetalsOfInsight.java

@@ -134,7 +134,7 @@ class PetalsOfInsightEffect extends OneShotEffect {
     }
 }
 
-class PetalsOfInsightReturnEffect extends PostResolveEffect<PetalsOfInsightReturnEffect> {
+class PetalsOfInsightReturnEffect extends PostResolveEffect {
 
     public PetalsOfInsightReturnEffect() {
         staticText = "If you do, return Petals of Insight to its owner's hand. Otherwise, draw three cards";

Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java

@@ -194,7 +194,7 @@ class CagedSunTriggeredAbility extends TriggeredManaAbility<CagedSunTriggeredAbi
 }
 
 
-class CagedSunEffect extends ManaEffect<CagedSunEffect> {
+class CagedSunEffect extends ManaEffect {
 
     public CagedSunEffect() {
         super();

Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java

@@ -63,7 +63,7 @@ public class RuthlessInvasion extends CardImpl {
 
 }
 
-class RuthlessInvasionEffect extends RestrictionEffect<RuthlessInvasionEffect> {
+class RuthlessInvasionEffect extends RestrictionEffect {
     RuthlessInvasionEffect() {
         super(Duration.EndOfTurn);
         staticText = "Nonartifact creatures can't block this turn";

Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java

@@ -123,7 +123,7 @@ class VorinclexTriggeredAbility1 extends TriggeredManaAbility<VorinclexTriggered
 }
 
 
-class VorinclexEffect extends ManaEffect<VorinclexEffect> {
+class VorinclexEffect extends ManaEffect {
 
     public VorinclexEffect() {
         super();

Mage.Sets/src/mage/sets/ninthedition/DefenseGrid.java

@@ -65,7 +65,7 @@ public class DefenseGrid extends CardImpl {
     }
 }
 
-class DefenseGridCostModificationEffect extends CostModificationEffectImpl<DefenseGridCostModificationEffect> {
+class DefenseGridCostModificationEffect extends CostModificationEffectImpl {
 
     DefenseGridCostModificationEffect ( ) {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.INCREASE_COST);

Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java

@@ -70,7 +70,7 @@ public class StorageMatrix extends CardImpl {
 
 
 
-class StorageMatrixRestrictionEffect extends RestrictionEffect<StorageMatrixRestrictionEffect> {
+class StorageMatrixRestrictionEffect extends RestrictionEffect {
 
     private int turn;
     private boolean applies;

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

@@ -71,7 +71,7 @@ public class Entomb extends CardImpl {
 }
 
 
-class SearchLibraryPutInGraveyard extends SearchEffect<SearchLibraryPutInGraveyard> {
+class SearchLibraryPutInGraveyard extends SearchEffect {
 
   public SearchLibraryPutInGraveyard() {
         super(new TargetCardInLibrary(new FilterCard()), Outcome.Neutral);

Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java

@@ -128,7 +128,7 @@ class VedalkenEngineerAbility extends ManaAbility<VedalkenEngineerAbility> {
     }
 }
 
-class VedalkenEngineerEffect extends ManaEffect<VedalkenEngineerEffect> {
+class VedalkenEngineerEffect extends ManaEffect {
 
     private int amount;
     private ConditionalManaBuilder manaBuilder;

Mage.Sets/src/mage/sets/planechase2012/ElderwoodScion.java

@@ -85,7 +85,7 @@ public class ElderwoodScion extends CardImpl {
     }
 }
 
-class ElderwoodScionCostReductionEffect extends CostModificationEffectImpl<ElderwoodScionCostReductionEffect> {
+class ElderwoodScionCostReductionEffect extends CostModificationEffectImpl {
 
     private static final String effectText = "Spells you cast that target {this} cost {2} less to cast";
 
@@ -128,7 +128,7 @@ class ElderwoodScionCostReductionEffect extends CostModificationEffectImpl<Elder
 
 }
 
-class ElderwoodScionCostReductionEffect2 extends CostModificationEffectImpl<ElderwoodScionCostReductionEffect2> {
+class ElderwoodScionCostReductionEffect2 extends CostModificationEffectImpl {
 
     private static final String effectText = "Spells your opponents cast that target Elderwood Scion cost {2} more to cast";
 

Mage.Sets/src/mage/sets/prophecy/AvatarOfFury.java

@@ -112,7 +112,7 @@ class AvatarOfFuryAdjustingCostsAbility extends SimpleStaticAbility implements A
     }
 }
 
-//class AvatarOfFuryAdjustingCostsEffect extends CostModificationEffectImpl<AvatarOfFuryAdjustingCostsEffect> {
+//class AvatarOfFuryAdjustingCostsEffect extends CostModificationEffectImpl {
 //
 //    public AvatarOfFuryAdjustingCostsEffect() {
 //        super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);