From 431fe30ab71c9ccf2f5b7966c0db80b240b9af9c Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Sat, 15 Oct 2016 14:49:15 -0700 Subject: [PATCH] remove unused field ExpansionSet.packageName --- Mage.Sets/src/mage/sets/AetherRevolt.java | 3 +-- Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java | 6 +----- Mage.Sets/src/mage/sets/AlaraReborn.java | 3 +-- Mage.Sets/src/mage/sets/Alliances.java | 6 +----- Mage.Sets/src/mage/sets/Amonkhet.java | 5 +---- Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java | 2 +- Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java | 2 +- Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java | 2 +- Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java | 2 +- Mage.Sets/src/mage/sets/Antiquities.java | 7 +------ Mage.Sets/src/mage/sets/Apocalypse.java | 5 +---- Mage.Sets/src/mage/sets/ArabianNights.java | 7 +------ Mage.Sets/src/mage/sets/Archenemy.java | 6 +----- Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java | 5 +---- Mage.Sets/src/mage/sets/ArenaLeague.java | 6 +----- Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java | 6 +----- Mage.Sets/src/mage/sets/AvacynRestored.java | 6 +----- Mage.Sets/src/mage/sets/BattleForZendikar.java | 4 +--- Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java | 4 +--- Mage.Sets/src/mage/sets/BlessedVsCursed.java | 6 +----- Mage.Sets/src/mage/sets/BornOfTheGods.java | 4 +--- Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java | 6 +----- Mage.Sets/src/mage/sets/Champs.java | 4 +--- Mage.Sets/src/mage/sets/Chronicles.java | 6 +----- Mage.Sets/src/mage/sets/ClashPack.java | 4 +--- Mage.Sets/src/mage/sets/ClassicSixthEdition.java | 6 +----- Mage.Sets/src/mage/sets/Coldsnap.java | 5 +---- Mage.Sets/src/mage/sets/Commander.java | 6 +----- Mage.Sets/src/mage/sets/Commander2013.java | 6 +----- Mage.Sets/src/mage/sets/Commander2014.java | 6 +----- Mage.Sets/src/mage/sets/Commander2015.java | 6 +----- Mage.Sets/src/mage/sets/Commander2016.java | 5 +---- Mage.Sets/src/mage/sets/CommanderAnthology.java | 5 +---- Mage.Sets/src/mage/sets/CommandersArsenal.java | 4 +--- Mage.Sets/src/mage/sets/Conflux.java | 4 +--- Mage.Sets/src/mage/sets/Conspiracy.java | 4 +--- Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java | 4 +--- Mage.Sets/src/mage/sets/DarkAscension.java | 4 +--- Mage.Sets/src/mage/sets/Darksteel.java | 4 +--- Mage.Sets/src/mage/sets/Dissension.java | 4 +--- Mage.Sets/src/mage/sets/DivineVsDemonic.java | 6 +----- Mage.Sets/src/mage/sets/DragonsMaze.java | 3 +-- Mage.Sets/src/mage/sets/DragonsOfTarkir.java | 6 +----- Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java | 4 +--- Mage.Sets/src/mage/sets/EighthEdition.java | 6 +----- Mage.Sets/src/mage/sets/EldritchMoon.java | 2 +- Mage.Sets/src/mage/sets/ElspethVsKiora.java | 6 +----- Mage.Sets/src/mage/sets/ElspethVsTezzeret.java | 6 +----- Mage.Sets/src/mage/sets/ElvesVsGoblins.java | 6 +----- Mage.Sets/src/mage/sets/EternalMasters.java | 4 +--- Mage.Sets/src/mage/sets/EuropeanLandProgram.java | 3 +-- Mage.Sets/src/mage/sets/Eventide.java | 4 +--- Mage.Sets/src/mage/sets/Exodus.java | 2 +- Mage.Sets/src/mage/sets/FTVAngels.java | 3 +-- Mage.Sets/src/mage/sets/FTVAnnihilation.java | 3 +-- Mage.Sets/src/mage/sets/FTVDragons.java | 3 +-- Mage.Sets/src/mage/sets/FTVExiled.java | 3 +-- Mage.Sets/src/mage/sets/FTVLegends.java | 3 +-- Mage.Sets/src/mage/sets/FTVLore.java | 3 +-- Mage.Sets/src/mage/sets/FTVRealms.java | 3 +-- Mage.Sets/src/mage/sets/FTVRelics.java | 3 +-- Mage.Sets/src/mage/sets/FTVTwenty.java | 3 +-- Mage.Sets/src/mage/sets/FallenEmpires.java | 7 +------ Mage.Sets/src/mage/sets/FateReforged.java | 5 +---- Mage.Sets/src/mage/sets/FifthDawn.java | 4 +--- Mage.Sets/src/mage/sets/FifthEdition.java | 6 +----- Mage.Sets/src/mage/sets/FourthEdition.java | 7 +------ Mage.Sets/src/mage/sets/FridayNightMagic.java | 3 +-- Mage.Sets/src/mage/sets/FutureSight.java | 4 +--- Mage.Sets/src/mage/sets/GameDay.java | 4 +--- Mage.Sets/src/mage/sets/GarrukVsLiliana.java | 6 +----- Mage.Sets/src/mage/sets/Gatecrash.java | 4 +--- Mage.Sets/src/mage/sets/GrandPrix.java | 4 +--- Mage.Sets/src/mage/sets/Guildpact.java | 4 +--- Mage.Sets/src/mage/sets/Guru.java | 4 +--- Mage.Sets/src/mage/sets/HeroesVsMonsters.java | 6 +----- Mage.Sets/src/mage/sets/Homelands.java | 7 +------ Mage.Sets/src/mage/sets/HourOfDevastation.java | 3 +-- Mage.Sets/src/mage/sets/IceAge.java | 7 +------ Mage.Sets/src/mage/sets/Innistrad.java | 6 +----- Mage.Sets/src/mage/sets/Invasion.java | 6 +----- Mage.Sets/src/mage/sets/IzzetVsGolgari.java | 6 +----- Mage.Sets/src/mage/sets/JaceVsChandra.java | 6 +----- Mage.Sets/src/mage/sets/JaceVsVraska.java | 6 +----- Mage.Sets/src/mage/sets/JourneyIntoNyx.java | 4 +--- Mage.Sets/src/mage/sets/JudgePromo.java | 6 +----- Mage.Sets/src/mage/sets/Judgment.java | 4 +--- Mage.Sets/src/mage/sets/Kaladesh.java | 5 +---- Mage.Sets/src/mage/sets/KhansOfTarkir.java | 6 +----- Mage.Sets/src/mage/sets/KnightsVsDragons.java | 6 +----- Mage.Sets/src/mage/sets/LaunchParty.java | 4 +--- Mage.Sets/src/mage/sets/Legends.java | 5 +---- Mage.Sets/src/mage/sets/Legions.java | 4 +--- Mage.Sets/src/mage/sets/LimitedEditionAlpha.java | 7 +------ Mage.Sets/src/mage/sets/LimitedEditionBeta.java | 7 +------ Mage.Sets/src/mage/sets/Lorwyn.java | 6 +----- Mage.Sets/src/mage/sets/Magic2010.java | 6 +----- Mage.Sets/src/mage/sets/Magic2011.java | 6 +----- Mage.Sets/src/mage/sets/Magic2012.java | 6 +----- Mage.Sets/src/mage/sets/Magic2013.java | 6 +----- Mage.Sets/src/mage/sets/Magic2014.java | 6 +----- Mage.Sets/src/mage/sets/Magic2015.java | 6 +----- Mage.Sets/src/mage/sets/MagicOrigins.java | 6 +----- Mage.Sets/src/mage/sets/MagicPlayerRewards.java | 4 +--- Mage.Sets/src/mage/sets/MasterpieceSeries.java | 5 +---- Mage.Sets/src/mage/sets/MastersEdition.java | 6 +----- Mage.Sets/src/mage/sets/MastersEditionII.java | 4 +--- Mage.Sets/src/mage/sets/MastersEditionIII.java | 6 +----- Mage.Sets/src/mage/sets/MastersEditionIV.java | 4 +--- Mage.Sets/src/mage/sets/MediaInserts.java | 6 +----- Mage.Sets/src/mage/sets/MercadianMasques.java | 7 +------ Mage.Sets/src/mage/sets/MindVsMight.java | 5 +---- Mage.Sets/src/mage/sets/Mirage.java | 7 +------ Mage.Sets/src/mage/sets/Mirrodin.java | 6 +----- Mage.Sets/src/mage/sets/MirrodinBesieged.java | 6 +----- Mage.Sets/src/mage/sets/ModernMasters.java | 4 +--- Mage.Sets/src/mage/sets/ModernMasters2015.java | 4 +--- Mage.Sets/src/mage/sets/ModernMasters2017.java | 5 +---- Mage.Sets/src/mage/sets/Morningtide.java | 4 +--- Mage.Sets/src/mage/sets/Nemesis.java | 3 +-- Mage.Sets/src/mage/sets/NewPhyrexia.java | 7 +------ Mage.Sets/src/mage/sets/NinthEdition.java | 6 +----- Mage.Sets/src/mage/sets/NissaVsObNixilis.java | 3 +-- Mage.Sets/src/mage/sets/OathOfTheGatewatch.java | 5 +---- Mage.Sets/src/mage/sets/Odyssey.java | 3 +-- Mage.Sets/src/mage/sets/Onslaught.java | 5 +---- Mage.Sets/src/mage/sets/PDSFireAndLightning.java | 2 +- Mage.Sets/src/mage/sets/PDSGraveborn.java | 6 +----- Mage.Sets/src/mage/sets/PDSSlivers.java | 6 +----- Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java | 2 +- Mage.Sets/src/mage/sets/PlanarChaos.java | 4 +--- Mage.Sets/src/mage/sets/Planechase.java | 6 +----- Mage.Sets/src/mage/sets/Planechase2012.java | 6 +----- Mage.Sets/src/mage/sets/PlanechaseAnthology.java | 3 +-- Mage.Sets/src/mage/sets/Planeshift.java | 6 +----- Mage.Sets/src/mage/sets/Portal.java | 6 +----- Mage.Sets/src/mage/sets/PortalSecondAge.java | 6 +----- Mage.Sets/src/mage/sets/PortalThreeKingdoms.java | 6 +----- Mage.Sets/src/mage/sets/PrereleaseEvents.java | 6 +----- Mage.Sets/src/mage/sets/Prophecy.java | 5 +---- Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java | 6 +----- Mage.Sets/src/mage/sets/ReturnToRavnica.java | 6 +----- Mage.Sets/src/mage/sets/RevisedEdition.java | 7 +------ Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java | 6 +----- Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java | 4 +--- Mage.Sets/src/mage/sets/ScarsOfMirrodin.java | 6 +----- Mage.Sets/src/mage/sets/Scourge.java | 5 +---- Mage.Sets/src/mage/sets/SeventhEdition.java | 7 +------ Mage.Sets/src/mage/sets/Shadowmoor.java | 6 +----- Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java | 2 +- Mage.Sets/src/mage/sets/ShardsOfAlara.java | 6 +----- Mage.Sets/src/mage/sets/SorinVsTibalt.java | 6 +----- Mage.Sets/src/mage/sets/SpeedVsCunning.java | 6 +----- Mage.Sets/src/mage/sets/StarWars.java | 3 +-- Mage.Sets/src/mage/sets/Starter1999.java | 6 +----- Mage.Sets/src/mage/sets/Starter2000.java | 6 +----- Mage.Sets/src/mage/sets/Stronghold.java | 2 +- Mage.Sets/src/mage/sets/SuperSeries.java | 6 +----- Mage.Sets/src/mage/sets/Tempest.java | 2 +- Mage.Sets/src/mage/sets/TempestRemastered.java | 6 +----- Mage.Sets/src/mage/sets/TenthEdition.java | 6 +----- Mage.Sets/src/mage/sets/TheDark.java | 5 +---- Mage.Sets/src/mage/sets/Theros.java | 6 +----- Mage.Sets/src/mage/sets/TimeSpiral.java | 5 +---- Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java | 4 +--- Mage.Sets/src/mage/sets/Torment.java | 2 +- Mage.Sets/src/mage/sets/UginsFate.java | 4 +--- Mage.Sets/src/mage/sets/Unglued.java | 5 +---- Mage.Sets/src/mage/sets/Unhinged.java | 5 +---- Mage.Sets/src/mage/sets/UnlimitedEdition.java | 7 +------ Mage.Sets/src/mage/sets/UrzasDestiny.java | 2 +- Mage.Sets/src/mage/sets/UrzasLegacy.java | 2 +- Mage.Sets/src/mage/sets/UrzasSaga.java | 2 +- Mage.Sets/src/mage/sets/VenserVsKoth.java | 6 +----- Mage.Sets/src/mage/sets/VintageMasters.java | 3 +-- Mage.Sets/src/mage/sets/Visions.java | 2 +- Mage.Sets/src/mage/sets/WPNGateway.java | 4 +--- Mage.Sets/src/mage/sets/Weatherlight.java | 4 +--- Mage.Sets/src/mage/sets/WelcomeDeck2016.java | 4 +--- Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java | 4 +--- Mage.Sets/src/mage/sets/Worldwake.java | 2 +- Mage.Sets/src/mage/sets/Zendikar.java | 4 +--- Mage.Sets/src/mage/sets/ZendikarExpeditions.java | 4 +--- Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java | 6 +----- Mage/src/main/java/mage/cards/ExpansionSet.java | 10 ++-------- .../main/java/mage/cards/repository/CardScanner.java | 8 -------- 186 files changed, 186 insertions(+), 715 deletions(-) diff --git a/Mage.Sets/src/mage/sets/AetherRevolt.java b/Mage.Sets/src/mage/sets/AetherRevolt.java index 5a0c41a9e6..6f3887a87d 100644 --- a/Mage.Sets/src/mage/sets/AetherRevolt.java +++ b/Mage.Sets/src/mage/sets/AetherRevolt.java @@ -28,7 +28,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -51,7 +50,7 @@ public class AetherRevolt extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private AetherRevolt() { - super("Aether Revolt", "AER", "mage.sets.aetherrevolt", ExpansionSet.buildDate(2017, 1, 20), SetType.EXPANSION); + super("Aether Revolt", "AER", ExpansionSet.buildDate(2017, 1, 20), SetType.EXPANSION); this.blockName = "Kaladesh"; this.hasBoosters = true; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java index c8e1f9e600..8e1b36ac4c 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class AjaniVsNicolBolas extends ExpansionSet { } private AjaniVsNicolBolas() { - super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", ExpansionSet.buildDate(2011, 9, 2), SetType.SUPPLEMENTAL); + super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", ExpansionSet.buildDate(2011, 9, 2), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Ageless Entity", 18, Rarity.RARE, mage.cards.a.AgelessEntity.class)); diff --git a/Mage.Sets/src/mage/sets/AlaraReborn.java b/Mage.Sets/src/mage/sets/AlaraReborn.java index 259787a708..5ac7e1bc0c 100644 --- a/Mage.Sets/src/mage/sets/AlaraReborn.java +++ b/Mage.Sets/src/mage/sets/AlaraReborn.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class AlaraReborn extends ExpansionSet { } private AlaraReborn() { - super("Alara Reborn", "ARB", "mage.sets.alarareborn", ExpansionSet.buildDate(2009, 3, 25), SetType.EXPANSION); + super("Alara Reborn", "ARB", ExpansionSet.buildDate(2009, 3, 25), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.parentSet = ShardsOfAlara.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Alliances.java b/Mage.Sets/src/mage/sets/Alliances.java index 438f338c2d..84436f2de2 100644 --- a/Mage.Sets/src/mage/sets/Alliances.java +++ b/Mage.Sets/src/mage/sets/Alliances.java @@ -3,12 +3,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class Alliances extends ExpansionSet { private static final Alliances fINSTANCE = new Alliances(); @@ -18,7 +14,7 @@ public class Alliances extends ExpansionSet { } private Alliances() { - super("Alliances", "ALL", "mage.sets.alliances", ExpansionSet.buildDate(1996, 6, 10), SetType.EXPANSION); + super("Alliances", "ALL", ExpansionSet.buildDate(1996, 6, 10), SetType.EXPANSION); this.blockName = "Ice Age"; this.parentSet = IceAge.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Amonkhet.java b/Mage.Sets/src/mage/sets/Amonkhet.java index ddca6fc0aa..902bdd5d84 100644 --- a/Mage.Sets/src/mage/sets/Amonkhet.java +++ b/Mage.Sets/src/mage/sets/Amonkhet.java @@ -27,11 +27,8 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +43,7 @@ public class Amonkhet extends ExpansionSet { } private Amonkhet() { - super("Amonkhet", "AKH", "mage.sets.amonkhet", ExpansionSet.buildDate(2017, 4, 28), SetType.EXPANSION); + super("Amonkhet", "AKH", ExpansionSet.buildDate(2017, 4, 28), SetType.EXPANSION); this.blockName = "Amonkhet"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java b/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java index 3473997882..0271f023e1 100644 --- a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java @@ -45,7 +45,7 @@ public class AnthologyDivineVsDemonic extends ExpansionSet { } private AnthologyDivineVsDemonic() { - super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", "mage.sets.anthologydivinevsdemonic", ExpansionSet.buildDate(2014, 12, 5), + super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java b/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java index 3770362cec..658947e58d 100644 --- a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java @@ -45,7 +45,7 @@ public class AnthologyElvesVsGoblins extends ExpansionSet { } private AnthologyElvesVsGoblins() { - super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", "mage.sets.anthologyelvesvsgoblins", ExpansionSet.buildDate(2014, 12, 5), + super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java b/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java index da8a8044b3..12db89ee5e 100644 --- a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java @@ -45,7 +45,7 @@ public class AnthologyGarrukVsLiliana extends ExpansionSet { } private AnthologyGarrukVsLiliana() { - super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", "mage.sets.anthologygarrukvsliliana", ExpansionSet.buildDate(2014, 12, 5), + super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java b/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java index 95f9e67d1a..111ca0739c 100644 --- a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java @@ -45,7 +45,7 @@ public class AnthologyJaceVsChandra extends ExpansionSet { } private AnthologyJaceVsChandra() { - super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", "mage.sets.anthologyjacevschandra", ExpansionSet.buildDate(2014, 12, 5), + super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Antiquities.java b/Mage.Sets/src/mage/sets/Antiquities.java index 72742856ba..c939d1c709 100644 --- a/Mage.Sets/src/mage/sets/Antiquities.java +++ b/Mage.Sets/src/mage/sets/Antiquities.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class Antiquities extends ExpansionSet { } private Antiquities() { - super("Antiquities", "ATQ", "mage.sets.antiquities", ExpansionSet.buildDate(1994, 2, 1), SetType.EXPANSION); + super("Antiquities", "ATQ", ExpansionSet.buildDate(1994, 2, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java index 05e53cefb7..db131c4998 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -1,11 +1,8 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; public class Apocalypse extends ExpansionSet { private static final Apocalypse fINSTANCE = new Apocalypse(); @@ -15,7 +12,7 @@ public class Apocalypse extends ExpansionSet { } private Apocalypse() { - super("Apocalypse", "APC", "mage.sets.apocalypse", ExpansionSet.buildDate(2001, 5, 1), SetType.EXPANSION); + super("Apocalypse", "APC", ExpansionSet.buildDate(2001, 5, 1), SetType.EXPANSION); this.blockName = "Invasion"; this.parentSet = Invasion.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java index f1438efdbd..1fd04d7276 100644 --- a/Mage.Sets/src/mage/sets/ArabianNights.java +++ b/Mage.Sets/src/mage/sets/ArabianNights.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class ArabianNights extends ExpansionSet { } private ArabianNights() { - super("Arabian Nights", "ARN", "mage.sets.arabiannights", ExpansionSet.buildDate(1993, 11, 1), SetType.EXPANSION); + super("Arabian Nights", "ARN", ExpansionSet.buildDate(1993, 11, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Archenemy.java b/Mage.Sets/src/mage/sets/Archenemy.java index 70873c4aeb..d60c543203 100644 --- a/Mage.Sets/src/mage/sets/Archenemy.java +++ b/Mage.Sets/src/mage/sets/Archenemy.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Archenemy extends ExpansionSet { } private Archenemy() { - super("Archenemy", "ARC", "mage.sets.archenemy", ExpansionSet.buildDate(2010, 6, 18), SetType.SUPPLEMENTAL); + super("Archenemy", "ARC", ExpansionSet.buildDate(2010, 6, 18), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Aether Spellbomb", 102, Rarity.COMMON, mage.cards.a.AetherSpellbomb.class)); cards.add(new SetCardInfo("Agony Warp", 76, Rarity.COMMON, mage.cards.a.AgonyWarp.class)); diff --git a/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java b/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java index fc87d3f614..314a4899a4 100644 --- a/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java +++ b/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java @@ -27,11 +27,8 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class ArchenemyNicolBolas extends ExpansionSet { } private ArchenemyNicolBolas() { - super("Archenemy: Nicol Bolas", "ANB", "mage.sets.archenemynicolbolas", ExpansionSet.buildDate(2017, 6, 16), SetType.SUPPLEMENTAL); + super("Archenemy: Nicol Bolas", "ANB", ExpansionSet.buildDate(2017, 6, 16), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; } diff --git a/Mage.Sets/src/mage/sets/ArenaLeague.java b/Mage.Sets/src/mage/sets/ArenaLeague.java index 58a0470762..08adde01e1 100644 --- a/Mage.Sets/src/mage/sets/ArenaLeague.java +++ b/Mage.Sets/src/mage/sets/ArenaLeague.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class ArenaLeague extends ExpansionSet { } private ArenaLeague() { - super("Arena League", "ARENA", "mage.sets.arenaleague", ExpansionSet.buildDate(1996, 7, 4), SetType.PROMOTIONAL); + super("Arena League", "ARENA", ExpansionSet.buildDate(1996, 7, 4), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Arc Lightning", 42, Rarity.COMMON, mage.cards.a.ArcLightning.class)); cards.add(new SetCardInfo("Bonesplitter", 52, Rarity.COMMON, mage.cards.b.Bonesplitter.class)); diff --git a/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java b/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java index 4673b100a4..7de9f11d10 100644 --- a/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java +++ b/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class AsiaPacificLandProgram extends ExpansionSet { } private AsiaPacificLandProgram() { - super("Asia Pacific Land Program", "APAC", "mage.sets.asiapacificlandprogram", ExpansionSet.buildDate(1997, 10, 13), SetType.PROMOTIONAL); + super("Asia Pacific Land Program", "APAC", ExpansionSet.buildDate(1997, 10, 13), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Forest", 6, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/AvacynRestored.java b/Mage.Sets/src/mage/sets/AvacynRestored.java index 482f2560aa..c746321d73 100644 --- a/Mage.Sets/src/mage/sets/AvacynRestored.java +++ b/Mage.Sets/src/mage/sets/AvacynRestored.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class AvacynRestored extends ExpansionSet { } private AvacynRestored() { - super("Avacyn Restored", "AVR", "mage.sets.avacynrestored", ExpansionSet.buildDate(2012, 4, 4), SetType.EXPANSION); + super("Avacyn Restored", "AVR", ExpansionSet.buildDate(2012, 4, 4), SetType.EXPANSION); this.blockName = "Innistrad"; this.parentSet = Innistrad.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/BattleForZendikar.java b/Mage.Sets/src/mage/sets/BattleForZendikar.java index a973e5cc77..372e401770 100644 --- a/Mage.Sets/src/mage/sets/BattleForZendikar.java +++ b/Mage.Sets/src/mage/sets/BattleForZendikar.java @@ -28,7 +28,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -36,7 +35,6 @@ import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.constants.SetType; import mage.constants.Rarity; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; import mage.cards.FrameStyle; @@ -55,7 +53,7 @@ public class BattleForZendikar extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private BattleForZendikar() { - super("Battle for Zendikar", "BFZ", "mage.sets.battleforzendikar", ExpansionSet.buildDate(2015, 10, 2), SetType.EXPANSION); + super("Battle for Zendikar", "BFZ", ExpansionSet.buildDate(2015, 10, 2), SetType.EXPANSION); this.blockName = "Battle for Zendikar"; this.hasBoosters = true; this.hasBasicLands = true; diff --git a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java index 90e10630a7..bdd03c8740 100644 --- a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class BetrayersOfKamigawa extends ExpansionSet { } private BetrayersOfKamigawa() { - super("Betrayers of Kamigawa", "BOK", "mage.sets.betrayersofkamigawa", ExpansionSet.buildDate(2005, 1, 4), SetType.EXPANSION); + super("Betrayers of Kamigawa", "BOK", ExpansionSet.buildDate(2005, 1, 4), SetType.EXPANSION); this.blockName = "Kamigawa"; this.parentSet = ChampionsOfKamigawa.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/BlessedVsCursed.java b/Mage.Sets/src/mage/sets/BlessedVsCursed.java index e8c40dd412..9300933862 100644 --- a/Mage.Sets/src/mage/sets/BlessedVsCursed.java +++ b/Mage.Sets/src/mage/sets/BlessedVsCursed.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -48,7 +44,7 @@ public class BlessedVsCursed extends ExpansionSet { } private BlessedVsCursed() { - super("Duel Decks: Blessed vs. Cursed", "DDQ", "mage.sets.blessedvscursed", ExpansionSet.buildDate(2016, 2, 26), SetType.SUPPLEMENTAL); + super("Duel Decks: Blessed vs. Cursed", "DDQ", ExpansionSet.buildDate(2016, 2, 26), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Abattoir Ghoul", 50, Rarity.UNCOMMON, mage.cards.a.AbattoirGhoul.class)); diff --git a/Mage.Sets/src/mage/sets/BornOfTheGods.java b/Mage.Sets/src/mage/sets/BornOfTheGods.java index f5ee069a6a..aca88a1b39 100644 --- a/Mage.Sets/src/mage/sets/BornOfTheGods.java +++ b/Mage.Sets/src/mage/sets/BornOfTheGods.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class BornOfTheGods extends ExpansionSet { } private BornOfTheGods() { - super("Born of the Gods", "BNG", "mage.sets.bornofthegods", ExpansionSet.buildDate(2014, 2, 7), SetType.EXPANSION); + super("Born of the Gods", "BNG", ExpansionSet.buildDate(2014, 2, 7), SetType.EXPANSION); this.blockName = "Theros"; this.parentSet = Theros.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java index b7844402f4..5e63a23876 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -1,13 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class ChampionsOfKamigawa extends ExpansionSet { private static final ChampionsOfKamigawa fINSTANCE = new ChampionsOfKamigawa(); @@ -17,7 +13,7 @@ public class ChampionsOfKamigawa extends ExpansionSet { } private ChampionsOfKamigawa() { - super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa", ExpansionSet.buildDate(2004, 9, 1), SetType.EXPANSION); + super("Champions of Kamigawa", "CHK", ExpansionSet.buildDate(2004, 9, 1), SetType.EXPANSION); this.blockName = "Kamigawa"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Champs.java b/Mage.Sets/src/mage/sets/Champs.java index 54e90f168d..8156e4cee2 100644 --- a/Mage.Sets/src/mage/sets/Champs.java +++ b/Mage.Sets/src/mage/sets/Champs.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class Champs extends ExpansionSet { } private Champs() { - super("Champs", "CP", "mage.sets.champs", ExpansionSet.buildDate(2006, 3, 18), SetType.PROMOTIONAL); + super("Champs", "CP", ExpansionSet.buildDate(2006, 3, 18), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Blood Knight", 7, Rarity.SPECIAL, mage.cards.b.BloodKnight.class)); cards.add(new SetCardInfo("Bramblewood Paragon", 11, Rarity.SPECIAL, mage.cards.b.BramblewoodParagon.class)); diff --git a/Mage.Sets/src/mage/sets/Chronicles.java b/Mage.Sets/src/mage/sets/Chronicles.java index c9bfa6de8a..2d269dd6d8 100644 --- a/Mage.Sets/src/mage/sets/Chronicles.java +++ b/Mage.Sets/src/mage/sets/Chronicles.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Chronicles extends ExpansionSet { } private Chronicles() { - super("Chronicles", "CHR", "mage.sets.chronicles", ExpansionSet.buildDate(1995, 6, 1), SetType.SUPPLEMENTAL); + super("Chronicles", "CHR", ExpansionSet.buildDate(1995, 6, 1), SetType.SUPPLEMENTAL); this.blockName = "Reprint"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/ClashPack.java b/Mage.Sets/src/mage/sets/ClashPack.java index 91e15e9dca..606c1dd1d1 100644 --- a/Mage.Sets/src/mage/sets/ClashPack.java +++ b/Mage.Sets/src/mage/sets/ClashPack.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class ClashPack extends ExpansionSet { } private ClashPack() { - super("Clash Pack", "CLASH", "mage.sets.clashpack", ExpansionSet.buildDate(2014, 7, 18), SetType.SUPPLEMENTAL); + super("Clash Pack", "CLASH", ExpansionSet.buildDate(2014, 7, 18), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Courser of Kruphix", 12, Rarity.SPECIAL, mage.cards.c.CourserOfKruphix.class)); cards.add(new SetCardInfo("Fated Intervention", 2, Rarity.SPECIAL, mage.cards.f.FatedIntervention.class)); diff --git a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java index 75904836db..d2efedf32a 100644 --- a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java +++ b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class ClassicSixthEdition extends ExpansionSet { } private ClassicSixthEdition() { - super("Classic Sixth Edition", "6ED", "mage.sets.classicsixthedition", ExpansionSet.buildDate(1999, 3, 28), SetType.CORE); + super("Classic Sixth Edition", "6ED", ExpansionSet.buildDate(1999, 3, 28), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/Coldsnap.java b/Mage.Sets/src/mage/sets/Coldsnap.java index d9ce3b5a21..c7456b5fc8 100644 --- a/Mage.Sets/src/mage/sets/Coldsnap.java +++ b/Mage.Sets/src/mage/sets/Coldsnap.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class Coldsnap extends ExpansionSet { } private Coldsnap() { - super("Coldsnap", "CSP", "mage.sets.coldsnap", ExpansionSet.buildDate(2006, 6, 21), SetType.EXPANSION); + super("Coldsnap", "CSP", ExpansionSet.buildDate(2006, 6, 21), SetType.EXPANSION); this.blockName = "Ice Age"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Commander.java b/Mage.Sets/src/mage/sets/Commander.java index dee59cebd0..f9151b6333 100644 --- a/Mage.Sets/src/mage/sets/Commander.java +++ b/Mage.Sets/src/mage/sets/Commander.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -51,7 +47,7 @@ public class Commander extends ExpansionSet { } private Commander() { - super("Commander", "CMD", "mage.sets.commander", ExpansionSet.buildDate(2011, 6, 17), SetType.SUPPLEMENTAL); + super("Commander", "CMD", ExpansionSet.buildDate(2011, 6, 17), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Acidic Slime", 140, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Acorn Catapult", 241, Rarity.RARE, mage.cards.a.AcornCatapult.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2013.java b/Mage.Sets/src/mage/sets/Commander2013.java index de67b05e1d..ee010562fd 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -51,7 +47,7 @@ public class Commander2013 extends ExpansionSet { } private Commander2013() { - super("Commander 2013 Edition", "C13", "mage.sets.commander2013", ExpansionSet.buildDate(2013, 11, 01), SetType.SUPPLEMENTAL); + super("Commander 2013 Edition", "C13", ExpansionSet.buildDate(2013, 11, 01), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Acidic Slime", 134, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Act of Authority", 1, Rarity.RARE, mage.cards.a.ActOfAuthority.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2014.java b/Mage.Sets/src/mage/sets/Commander2014.java index 49b5f164ca..cb979dbbe7 100644 --- a/Mage.Sets/src/mage/sets/Commander2014.java +++ b/Mage.Sets/src/mage/sets/Commander2014.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Commander2014 extends ExpansionSet { } private Commander2014() { - super("Commander 2014 Edition", "C14", "mage.sets.commander2014", ExpansionSet.buildDate(2014, 11, 07), SetType.SUPPLEMENTAL); + super("Commander 2014 Edition", "C14", ExpansionSet.buildDate(2014, 11, 07), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Abyssal Persecutor", 132, Rarity.MYTHIC, mage.cards.a.AbyssalPersecutor.class)); cards.add(new SetCardInfo("Adarkar Valkyrie", 63, Rarity.RARE, mage.cards.a.AdarkarValkyrie.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2015.java b/Mage.Sets/src/mage/sets/Commander2015.java index 7212abf7df..975c786220 100644 --- a/Mage.Sets/src/mage/sets/Commander2015.java +++ b/Mage.Sets/src/mage/sets/Commander2015.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Commander2015 extends ExpansionSet { } private Commander2015() { - super("Commander 2015 Edition", "C15", "mage.sets.commander2015", ExpansionSet.buildDate(2015, 11, 13), SetType.SUPPLEMENTAL); + super("Commander 2015 Edition", "C15", ExpansionSet.buildDate(2015, 11, 13), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Acidic Slime", 173, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Act of Aggression", 141, Rarity.UNCOMMON, mage.cards.a.ActOfAggression.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2016.java b/Mage.Sets/src/mage/sets/Commander2016.java index ec9190eb1e..04080f76cb 100644 --- a/Mage.Sets/src/mage/sets/Commander2016.java +++ b/Mage.Sets/src/mage/sets/Commander2016.java @@ -27,11 +27,8 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class Commander2016 extends ExpansionSet { } private Commander2016() { - super("Commander 2016 Edition", "C16", "mage.sets.commander2016", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL); + super("Commander 2016 Edition", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; } diff --git a/Mage.Sets/src/mage/sets/CommanderAnthology.java b/Mage.Sets/src/mage/sets/CommanderAnthology.java index f3e43d0b94..8f3be13986 100644 --- a/Mage.Sets/src/mage/sets/CommanderAnthology.java +++ b/Mage.Sets/src/mage/sets/CommanderAnthology.java @@ -27,11 +27,8 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -45,7 +42,7 @@ public class CommanderAnthology extends ExpansionSet { } private CommanderAnthology() { - super("Commander Anthology", "CMA2", "mage.sets.commanderanthology", ExpansionSet.buildDate(2017, 6, 9), SetType.SUPPLEMENTAL); + super("Commander Anthology", "CMA2", ExpansionSet.buildDate(2017, 6, 9), SetType.SUPPLEMENTAL); this.blockName = "Commander Anthology"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/CommandersArsenal.java b/Mage.Sets/src/mage/sets/CommandersArsenal.java index a1df5cd168..3ab6d25a9a 100644 --- a/Mage.Sets/src/mage/sets/CommandersArsenal.java +++ b/Mage.Sets/src/mage/sets/CommandersArsenal.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class CommandersArsenal extends ExpansionSet { } private CommandersArsenal() { - super("Commander's Arsenal", "CMA", "mage.sets.commandersarsenal", ExpansionSet.buildDate(2012, 11, 2), SetType.SUPPLEMENTAL); + super("Commander's Arsenal", "CMA", ExpansionSet.buildDate(2012, 11, 2), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Chaos Warp", 1, Rarity.SPECIAL, mage.cards.c.ChaosWarp.class)); cards.add(new SetCardInfo("Command Tower", 2, Rarity.COMMON, mage.cards.c.CommandTower.class)); diff --git a/Mage.Sets/src/mage/sets/Conflux.java b/Mage.Sets/src/mage/sets/Conflux.java index 5f13a99b21..260a72ccb9 100644 --- a/Mage.Sets/src/mage/sets/Conflux.java +++ b/Mage.Sets/src/mage/sets/Conflux.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class Conflux extends ExpansionSet { } private Conflux() { - super("Conflux", "CON", "mage.sets.conflux", ExpansionSet.buildDate(2009, 0, 31), SetType.EXPANSION); + super("Conflux", "CON", ExpansionSet.buildDate(2009, 0, 31), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.parentSet = ShardsOfAlara.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Conspiracy.java b/Mage.Sets/src/mage/sets/Conspiracy.java index 9923e02bf1..178a8c34aa 100644 --- a/Mage.Sets/src/mage/sets/Conspiracy.java +++ b/Mage.Sets/src/mage/sets/Conspiracy.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -48,7 +46,7 @@ public class Conspiracy extends ExpansionSet { } private Conspiracy() { - super("Conspiracy", "CNS", "mage.sets.conspiracy", ExpansionSet.buildDate(2014, 6, 6), SetType.SUPPLEMENTAL); + super("Conspiracy", "CNS", ExpansionSet.buildDate(2014, 6, 6), SetType.SUPPLEMENTAL); this.blockName = "Conspiracy"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java b/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java index f7825f040b..52e109aa85 100644 --- a/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java +++ b/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -48,7 +46,7 @@ public class ConspiracyTakeTheCrown extends ExpansionSet { } private ConspiracyTakeTheCrown() { - super("Conspiracy: Take the Crown", "CN2", "mage.sets.conspiracytakethecrown", ExpansionSet.buildDate(2016, 8, 26), SetType.SUPPLEMENTAL); + super("Conspiracy: Take the Crown", "CN2", ExpansionSet.buildDate(2016, 8, 26), SetType.SUPPLEMENTAL); this.blockName = "Conspiracy"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/DarkAscension.java b/Mage.Sets/src/mage/sets/DarkAscension.java index 1f7fd3a365..41df025c45 100644 --- a/Mage.Sets/src/mage/sets/DarkAscension.java +++ b/Mage.Sets/src/mage/sets/DarkAscension.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class DarkAscension extends ExpansionSet { } private DarkAscension() { - super("Dark Ascension", "DKA", "mage.sets.darkascension", ExpansionSet.buildDate(2012, 1, 3), SetType.EXPANSION); + super("Dark Ascension", "DKA", ExpansionSet.buildDate(2012, 1, 3), SetType.EXPANSION); this.blockName = "Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Darksteel.java b/Mage.Sets/src/mage/sets/Darksteel.java index 55969a4ec6..13fcfcb373 100644 --- a/Mage.Sets/src/mage/sets/Darksteel.java +++ b/Mage.Sets/src/mage/sets/Darksteel.java @@ -3,9 +3,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; public class Darksteel extends ExpansionSet { @@ -16,7 +14,7 @@ public class Darksteel extends ExpansionSet { } public Darksteel() { - super("Darksteel", "DST", "mage.sets.darksteel", ExpansionSet.buildDate(2004, 1, 6), SetType.EXPANSION); + super("Darksteel", "DST", ExpansionSet.buildDate(2004, 1, 6), SetType.EXPANSION); this.blockName = "Mirrodin"; this.parentSet = Mirrodin.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java index 3a2492c45f..1f0970959e 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -30,9 +30,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; /** * Created by IntelliJ IDEA. User: Loki Date: 20.12.10 Time: 21:40 @@ -46,7 +44,7 @@ public class Dissension extends ExpansionSet { } private Dissension() { - super("Dissension", "DIS", "mage.sets.dissension", ExpansionSet.buildDate(2006, 4, 5), SetType.EXPANSION); + super("Dissension", "DIS", ExpansionSet.buildDate(2006, 4, 5), SetType.EXPANSION); this.blockName = "Ravnica"; this.parentSet = RavnicaCityOfGuilds.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/DivineVsDemonic.java b/Mage.Sets/src/mage/sets/DivineVsDemonic.java index 7b67f6b86f..5f0bdc454b 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DivineVsDemonic.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class DivineVsDemonic extends ExpansionSet { } private DivineVsDemonic() { - super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", ExpansionSet.buildDate(2009, 04, 10), SetType.SUPPLEMENTAL); + super("Duel Decks: Divine vs. Demonic", "DDC", ExpansionSet.buildDate(2009, 04, 10), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Abyssal Gatekeeper", 31, Rarity.COMMON, mage.cards.a.AbyssalGatekeeper.class)); diff --git a/Mage.Sets/src/mage/sets/DragonsMaze.java b/Mage.Sets/src/mage/sets/DragonsMaze.java index 9b0b1ab3c1..a8152eec14 100644 --- a/Mage.Sets/src/mage/sets/DragonsMaze.java +++ b/Mage.Sets/src/mage/sets/DragonsMaze.java @@ -29,7 +29,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.constants.CardType; @@ -56,7 +55,7 @@ public class DragonsMaze extends ExpansionSet { List savedSpecialRares = new ArrayList<>(); private DragonsMaze() { - super("Dragon's Maze", "DGM", "mage.sets.dragonsmaze", ExpansionSet.buildDate(2013, 5, 03), SetType.EXPANSION); + super("Dragon's Maze", "DGM", ExpansionSet.buildDate(2013, 5, 03), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.hasBoosters = true; this.numBoosterSpecial = 1; diff --git a/Mage.Sets/src/mage/sets/DragonsOfTarkir.java b/Mage.Sets/src/mage/sets/DragonsOfTarkir.java index b09dcbd0e4..fc012985b1 100644 --- a/Mage.Sets/src/mage/sets/DragonsOfTarkir.java +++ b/Mage.Sets/src/mage/sets/DragonsOfTarkir.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -51,7 +47,7 @@ public class DragonsOfTarkir extends ExpansionSet { } private DragonsOfTarkir() { - super("Dragons of Tarkir", "DTK", "mage.sets.dragonsoftarkir", ExpansionSet.buildDate(2015, 3, 27), SetType.EXPANSION); + super("Dragons of Tarkir", "DTK", ExpansionSet.buildDate(2015, 3, 27), SetType.EXPANSION); this.blockName = "Khans of Tarkir"; this.hasBoosters = true; this.hasBasicLands = true; diff --git a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java index d8edfc0a28..e05b6a82bb 100644 --- a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java +++ b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class DuelsOfThePlaneswalkers extends ExpansionSet { } private DuelsOfThePlaneswalkers() { - super("Duels of the Planeswalkers", "DPA", "mage.sets.duelsoftheplaneswalkers", ExpansionSet.buildDate(2010, 6, 4), SetType.SUPPLEMENTAL); + super("Duels of the Planeswalkers", "DPA", ExpansionSet.buildDate(2010, 6, 4), SetType.SUPPLEMENTAL); cards.add(new SetCardInfo("The Rack", 95, Rarity.UNCOMMON, mage.cards.t.TheRack.class)); } } diff --git a/Mage.Sets/src/mage/sets/EighthEdition.java b/Mage.Sets/src/mage/sets/EighthEdition.java index 940d4bf8d7..00910ea066 100644 --- a/Mage.Sets/src/mage/sets/EighthEdition.java +++ b/Mage.Sets/src/mage/sets/EighthEdition.java @@ -1,13 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class EighthEdition extends ExpansionSet { @@ -18,7 +14,7 @@ public class EighthEdition extends ExpansionSet { } private EighthEdition() { - super("Eighth Edition", "8ED", "mage.sets.eighthedition", ExpansionSet.buildDate(2003, 7, 28), SetType.CORE); + super("Eighth Edition", "8ED", ExpansionSet.buildDate(2003, 7, 28), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/EldritchMoon.java b/Mage.Sets/src/mage/sets/EldritchMoon.java index 6a19a7003a..c7a39754b2 100644 --- a/Mage.Sets/src/mage/sets/EldritchMoon.java +++ b/Mage.Sets/src/mage/sets/EldritchMoon.java @@ -44,7 +44,7 @@ public class EldritchMoon extends ExpansionSet { } private EldritchMoon() { - super("Eldritch Moon", "EMN", "mage.sets.eldritchmoon", ExpansionSet.buildDate(2016, 7, 22), SetType.EXPANSION); + super("Eldritch Moon", "EMN", ExpansionSet.buildDate(2016, 7, 22), SetType.EXPANSION); this.blockName = "Shadows over Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/ElspethVsKiora.java b/Mage.Sets/src/mage/sets/ElspethVsKiora.java index 432d5c501c..0c76067dd5 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsKiora.java +++ b/Mage.Sets/src/mage/sets/ElspethVsKiora.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -48,7 +44,7 @@ public class ElspethVsKiora extends ExpansionSet { } private ElspethVsKiora() { - super("Duel Decks: Elspeth vs. Kiora", "DDO", "mage.sets.elspethvskiora", ExpansionSet.buildDate(2015, 2, 27), SetType.SUPPLEMENTAL); + super("Duel Decks: Elspeth vs. Kiora", "DDO", ExpansionSet.buildDate(2015, 2, 27), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Accumulated Knowledge", 35, Rarity.COMMON, mage.cards.a.AccumulatedKnowledge.class)); diff --git a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java index a9a52b362b..c3bcf5bba2 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java @@ -3,12 +3,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class ElspethVsTezzeret extends ExpansionSet { private static final ElspethVsTezzeret fINSTANCE = new ElspethVsTezzeret(); @@ -18,7 +14,7 @@ public class ElspethVsTezzeret extends ExpansionSet { } private ElspethVsTezzeret() { - super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", ExpansionSet.buildDate(2010, 8, 3), SetType.SUPPLEMENTAL); + super("Duel Decks: Elspeth vs. Tezzeret", "DDF", ExpansionSet.buildDate(2010, 8, 3), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Abolish", 29, Rarity.UNCOMMON, mage.cards.a.Abolish.class)); diff --git a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java index fd3bfc36c8..07e315269a 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java @@ -6,14 +6,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -28,7 +24,7 @@ public class ElvesVsGoblins extends ExpansionSet { } private ElvesVsGoblins() { - super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", ExpansionSet.buildDate(2007, 11, 16), SetType.SUPPLEMENTAL); + super("Duel Decks: Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2007, 11, 16), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Akki Coalflinger", 33, Rarity.UNCOMMON, mage.cards.a.AkkiCoalflinger.class)); diff --git a/Mage.Sets/src/mage/sets/EternalMasters.java b/Mage.Sets/src/mage/sets/EternalMasters.java index a9ecd5e4f5..823dc7577d 100644 --- a/Mage.Sets/src/mage/sets/EternalMasters.java +++ b/Mage.Sets/src/mage/sets/EternalMasters.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class EternalMasters extends ExpansionSet { } private EternalMasters() { - super("Eternal Masters", "EMA", "mage.sets.eternalmasters", ExpansionSet.buildDate(2016, 6, 10), SetType.SUPPLEMENTAL); + super("Eternal Masters", "EMA", ExpansionSet.buildDate(2016, 6, 10), SetType.SUPPLEMENTAL); this.blockName = "Reprint"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/EuropeanLandProgram.java b/Mage.Sets/src/mage/sets/EuropeanLandProgram.java index 881dafb08f..6c0c6fa95b 100644 --- a/Mage.Sets/src/mage/sets/EuropeanLandProgram.java +++ b/Mage.Sets/src/mage/sets/EuropeanLandProgram.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -46,7 +45,7 @@ public class EuropeanLandProgram extends ExpansionSet { } private EuropeanLandProgram() { - super("European Land Program", "EURO", "mage.sets.europeanlandprogram", ExpansionSet.buildDate(2000, 2, 14), SetType.PROMOTIONAL); + super("European Land Program", "EURO", ExpansionSet.buildDate(2000, 2, 14), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Forest", 6, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/Eventide.java b/Mage.Sets/src/mage/sets/Eventide.java index ddcc7ec993..bbdca5340e 100644 --- a/Mage.Sets/src/mage/sets/Eventide.java +++ b/Mage.Sets/src/mage/sets/Eventide.java @@ -3,9 +3,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; public class Eventide extends ExpansionSet { private static final Eventide fINSTANCE = new Eventide(); @@ -15,7 +13,7 @@ public class Eventide extends ExpansionSet { } private Eventide() { - super("Eventide", "EVE", "mage.sets.eventide", ExpansionSet.buildDate(2008, 6, 25), SetType.EXPANSION); + super("Eventide", "EVE", ExpansionSet.buildDate(2008, 6, 25), SetType.EXPANSION); this.blockName = "Shadowmoor"; this.parentSet = Shadowmoor.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java index 56339fce97..7d42ace2c2 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.java @@ -44,7 +44,7 @@ public class Exodus extends ExpansionSet { } private Exodus() { - super("Exodus", "EXO", "mage.sets.exodus", ExpansionSet.buildDate(1998, 6, 15), SetType.EXPANSION); + super("Exodus", "EXO", ExpansionSet.buildDate(1998, 6, 15), SetType.EXPANSION); this.blockName = "Tempest"; this.parentSet = Tempest.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/FTVAngels.java b/Mage.Sets/src/mage/sets/FTVAngels.java index 44c1236944..abf0527ce6 100644 --- a/Mage.Sets/src/mage/sets/FTVAngels.java +++ b/Mage.Sets/src/mage/sets/FTVAngels.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVAngels extends ExpansionSet { } private FTVAngels() { - super("From the Vault: Angels", "V15", "mage.sets.ftvangels", ExpansionSet.buildDate(2015, 8, 21), SetType.SUPPLEMENTAL); + super("From the Vault: Angels", "V15", ExpansionSet.buildDate(2015, 8, 21), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Akroma, Angel of Fury", 1, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfFury.class)); cards.add(new SetCardInfo("Akroma, Angel of Wrath", 2, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfWrath.class)); diff --git a/Mage.Sets/src/mage/sets/FTVAnnihilation.java b/Mage.Sets/src/mage/sets/FTVAnnihilation.java index f3e4e8e88d..f699372b19 100644 --- a/Mage.Sets/src/mage/sets/FTVAnnihilation.java +++ b/Mage.Sets/src/mage/sets/FTVAnnihilation.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVAnnihilation extends ExpansionSet { } private FTVAnnihilation() { - super("From the Vault: Annihilation", "V14", "mage.sets.ftvannihilation", ExpansionSet.buildDate(2014, 8, 22), SetType.SUPPLEMENTAL); + super("From the Vault: Annihilation", "V14", ExpansionSet.buildDate(2014, 8, 22), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Armageddon", 1, Rarity.MYTHIC, mage.cards.a.Armageddon.class)); cards.add(new SetCardInfo("Burning of Xinye", 2, Rarity.MYTHIC, mage.cards.b.BurningOfXinye.class)); diff --git a/Mage.Sets/src/mage/sets/FTVDragons.java b/Mage.Sets/src/mage/sets/FTVDragons.java index 1e88b6bfb2..87b7e27df9 100644 --- a/Mage.Sets/src/mage/sets/FTVDragons.java +++ b/Mage.Sets/src/mage/sets/FTVDragons.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVDragons extends ExpansionSet { } private FTVDragons() { - super("From the Vault: Dragons", "DRB", "mage.sets.ftvdragons", ExpansionSet.buildDate(2008, 8, 29), SetType.SUPPLEMENTAL); + super("From the Vault: Dragons", "DRB", ExpansionSet.buildDate(2008, 8, 29), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Bladewing the Risen", 1, Rarity.RARE, mage.cards.b.BladewingTheRisen.class)); cards.add(new SetCardInfo("Bogardan Hellkite", 2, Rarity.RARE, mage.cards.b.BogardanHellkite.class)); diff --git a/Mage.Sets/src/mage/sets/FTVExiled.java b/Mage.Sets/src/mage/sets/FTVExiled.java index 29754f5685..054fed5333 100644 --- a/Mage.Sets/src/mage/sets/FTVExiled.java +++ b/Mage.Sets/src/mage/sets/FTVExiled.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVExiled extends ExpansionSet { } private FTVExiled() { - super("From the Vault: Exiled", "V09", "mage.sets.ftvexiled", ExpansionSet.buildDate(2009, 8, 28), SetType.SUPPLEMENTAL); + super("From the Vault: Exiled", "V09", ExpansionSet.buildDate(2009, 8, 28), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Balance", 1, Rarity.MYTHIC, mage.cards.b.Balance.class)); cards.add(new SetCardInfo("Berserk", 2, Rarity.MYTHIC, mage.cards.b.Berserk.class)); diff --git a/Mage.Sets/src/mage/sets/FTVLegends.java b/Mage.Sets/src/mage/sets/FTVLegends.java index 4bad79b0a0..2e012fc9e1 100644 --- a/Mage.Sets/src/mage/sets/FTVLegends.java +++ b/Mage.Sets/src/mage/sets/FTVLegends.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVLegends extends ExpansionSet { } private FTVLegends() { - super("From the Vault: Legends", "V11", "mage.sets.ftvlegends", ExpansionSet.buildDate(2011, 8, 26), SetType.SUPPLEMENTAL); + super("From the Vault: Legends", "V11", ExpansionSet.buildDate(2011, 8, 26), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Cao Cao, Lord of Wei", 1, Rarity.MYTHIC, mage.cards.c.CaoCaoLordOfWei.class)); cards.add(new SetCardInfo("Captain Sisay", 2, Rarity.MYTHIC, mage.cards.c.CaptainSisay.class)); diff --git a/Mage.Sets/src/mage/sets/FTVLore.java b/Mage.Sets/src/mage/sets/FTVLore.java index 7782fce923..39ba306b57 100644 --- a/Mage.Sets/src/mage/sets/FTVLore.java +++ b/Mage.Sets/src/mage/sets/FTVLore.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVLore extends ExpansionSet { } private FTVLore() { - super("From the Vault: Lore", "V16", "mage.sets.ftvlore", ExpansionSet.buildDate(2016, 8, 19), SetType.SUPPLEMENTAL); + super("From the Vault: Lore", "V16", ExpansionSet.buildDate(2016, 8, 19), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Beseech the Queen", 1, Rarity.MYTHIC, mage.cards.b.BeseechTheQueen.class)); cards.add(new SetCardInfo("Cabal Ritual", 2, Rarity.MYTHIC, mage.cards.c.CabalRitual.class)); diff --git a/Mage.Sets/src/mage/sets/FTVRealms.java b/Mage.Sets/src/mage/sets/FTVRealms.java index a3c7bd34da..f310bd1759 100644 --- a/Mage.Sets/src/mage/sets/FTVRealms.java +++ b/Mage.Sets/src/mage/sets/FTVRealms.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVRealms extends ExpansionSet { } private FTVRealms() { - super("From the Vault: Realms", "V12", "mage.sets.ftvrealms", ExpansionSet.buildDate(2012, 8, 31), SetType.SUPPLEMENTAL); + super("From the Vault: Realms", "V12", ExpansionSet.buildDate(2012, 8, 31), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Ancient Tomb", 1, Rarity.MYTHIC, mage.cards.a.AncientTomb.class)); cards.add(new SetCardInfo("Boseiju, Who Shelters All", 2, Rarity.MYTHIC, mage.cards.b.BoseijuWhoSheltersAll.class)); diff --git a/Mage.Sets/src/mage/sets/FTVRelics.java b/Mage.Sets/src/mage/sets/FTVRelics.java index b94ecfddab..2af0de0d97 100644 --- a/Mage.Sets/src/mage/sets/FTVRelics.java +++ b/Mage.Sets/src/mage/sets/FTVRelics.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVRelics extends ExpansionSet { } private FTVRelics() { - super("From the Vault: Relics", "V10", "mage.sets.ftvrelics", ExpansionSet.buildDate(2010, 8, 27), SetType.SUPPLEMENTAL); + super("From the Vault: Relics", "V10", ExpansionSet.buildDate(2010, 8, 27), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Aether Vial", 1, Rarity.MYTHIC, mage.cards.a.AetherVial.class)); cards.add(new SetCardInfo("Black Vise", 2, Rarity.MYTHIC, mage.cards.b.BlackVise.class)); diff --git a/Mage.Sets/src/mage/sets/FTVTwenty.java b/Mage.Sets/src/mage/sets/FTVTwenty.java index 48de12cc5b..b73355bba5 100644 --- a/Mage.Sets/src/mage/sets/FTVTwenty.java +++ b/Mage.Sets/src/mage/sets/FTVTwenty.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class FTVTwenty extends ExpansionSet { } private FTVTwenty() { - super("From the Vault: Twenty", "V13", "mage.sets.ftvtwenty", ExpansionSet.buildDate(2013, 8, 23), SetType.SUPPLEMENTAL); + super("From the Vault: Twenty", "V13", ExpansionSet.buildDate(2013, 8, 23), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Akroma's Vengeance", 11, Rarity.MYTHIC, mage.cards.a.AkromasVengeance.class)); cards.add(new SetCardInfo("Chainer's Edict", 10, Rarity.MYTHIC, mage.cards.c.ChainersEdict.class)); diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java index 646701a769..4962a458e9 100644 --- a/Mage.Sets/src/mage/sets/FallenEmpires.java +++ b/Mage.Sets/src/mage/sets/FallenEmpires.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class FallenEmpires extends ExpansionSet { } private FallenEmpires() { - super("Fallen Empires", "FEM", "mage.sets.fallenempires", ExpansionSet.buildDate(1994, 10, 1), SetType.EXPANSION); + super("Fallen Empires", "FEM", ExpansionSet.buildDate(1994, 10, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/FateReforged.java b/Mage.Sets/src/mage/sets/FateReforged.java index 3c305cae05..2ef6c0b1d9 100644 --- a/Mage.Sets/src/mage/sets/FateReforged.java +++ b/Mage.Sets/src/mage/sets/FateReforged.java @@ -28,7 +28,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -37,9 +36,7 @@ import mage.cards.repository.CardRepository; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.SetType; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -57,7 +54,7 @@ public class FateReforged extends ExpansionSet { } private FateReforged() { - super("Fate Reforged", "FRF", "mage.sets.fatereforged", ExpansionSet.buildDate(2015, 1, 23), SetType.EXPANSION); + super("Fate Reforged", "FRF", ExpansionSet.buildDate(2015, 1, 23), SetType.EXPANSION); this.blockName = "Khans of Tarkir"; this.parentSet = KhansOfTarkir.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/FifthDawn.java b/Mage.Sets/src/mage/sets/FifthDawn.java index 2768d34261..e143c113a2 100644 --- a/Mage.Sets/src/mage/sets/FifthDawn.java +++ b/Mage.Sets/src/mage/sets/FifthDawn.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class FifthDawn extends ExpansionSet { } private FifthDawn() { - super("Fifth Dawn", "5DN", "mage.sets.fifthdawn", ExpansionSet.buildDate(2004, 5, 4), SetType.EXPANSION); + super("Fifth Dawn", "5DN", ExpansionSet.buildDate(2004, 5, 4), SetType.EXPANSION); this.blockName = "Mirrodin"; this.parentSet = Mirrodin.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java index bd2dddf0bc..fca03e05f2 100644 --- a/Mage.Sets/src/mage/sets/FifthEdition.java +++ b/Mage.Sets/src/mage/sets/FifthEdition.java @@ -1,13 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class FifthEdition extends ExpansionSet { @@ -18,7 +14,7 @@ public class FifthEdition extends ExpansionSet { } private FifthEdition() { - super("Fifth Edition", "5ED", "mage.sets.fifthedition", ExpansionSet.buildDate(1997, 3, 1), SetType.CORE); + super("Fifth Edition", "5ED", ExpansionSet.buildDate(1997, 3, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java index 07c9fadb5f..e063e4d291 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class FourthEdition extends ExpansionSet { } private FourthEdition() { - super("Fourth Edition", "4ED", "mage.sets.fourthedition", ExpansionSet.buildDate(1995, 3, 1), SetType.CORE); + super("Fourth Edition", "4ED", ExpansionSet.buildDate(1995, 3, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/FridayNightMagic.java b/Mage.Sets/src/mage/sets/FridayNightMagic.java index 8db79dabe4..216ec25c35 100644 --- a/Mage.Sets/src/mage/sets/FridayNightMagic.java +++ b/Mage.Sets/src/mage/sets/FridayNightMagic.java @@ -28,7 +28,6 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; @@ -47,7 +46,7 @@ public class FridayNightMagic extends ExpansionSet { } private FridayNightMagic() { - super("Friday Night Magic", "FNMP", "mage.sets.fridaynightmagic", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Friday Night Magic", "FNMP", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Abzan Beastmaster", 180, Rarity.UNCOMMON, mage.cards.a.AbzanBeastmaster.class)); diff --git a/Mage.Sets/src/mage/sets/FutureSight.java b/Mage.Sets/src/mage/sets/FutureSight.java index 93a12f5ce7..5f77746f3e 100644 --- a/Mage.Sets/src/mage/sets/FutureSight.java +++ b/Mage.Sets/src/mage/sets/FutureSight.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class FutureSight extends ExpansionSet { } private FutureSight() { - super("Future Sight", "FUT", "mage.sets.futuresight", ExpansionSet.buildDate(2007, 4, 4), SetType.EXPANSION); + super("Future Sight", "FUT", ExpansionSet.buildDate(2007, 4, 4), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/GameDay.java b/Mage.Sets/src/mage/sets/GameDay.java index b3e04fd68e..587358823e 100644 --- a/Mage.Sets/src/mage/sets/GameDay.java +++ b/Mage.Sets/src/mage/sets/GameDay.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class GameDay extends ExpansionSet { } private GameDay() { - super("Game Day", "MGDC", "mage.sets.gameday", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Game Day", "MGDC", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Anguished Unmaking", 52, Rarity.RARE, mage.cards.a.AnguishedUnmaking.class)); diff --git a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java index 1fc18c5631..46b18b29ab 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java @@ -6,14 +6,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -28,7 +24,7 @@ public class GarrukVsLiliana extends ExpansionSet { } private GarrukVsLiliana() { - super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", ExpansionSet.buildDate(2009, 10, 30), SetType.SUPPLEMENTAL); + super("Duel Decks: Garruk vs. Liliana", "DDD", ExpansionSet.buildDate(2009, 10, 30), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Albino Troll", 3, Rarity.UNCOMMON, mage.cards.a.AlbinoTroll.class)); diff --git a/Mage.Sets/src/mage/sets/Gatecrash.java b/Mage.Sets/src/mage/sets/Gatecrash.java index 30d6417c1e..ae3f3d0fd8 100644 --- a/Mage.Sets/src/mage/sets/Gatecrash.java +++ b/Mage.Sets/src/mage/sets/Gatecrash.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class Gatecrash extends ExpansionSet { } private Gatecrash() { - super("Gatecrash", "GTC", "mage.sets.gatecrash", ExpansionSet.buildDate(2013, 2, 1), SetType.EXPANSION); + super("Gatecrash", "GTC", ExpansionSet.buildDate(2013, 2, 1), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.parentSet = ReturnToRavnica.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/GrandPrix.java b/Mage.Sets/src/mage/sets/GrandPrix.java index aa3a3b0495..9dc9cc8036 100644 --- a/Mage.Sets/src/mage/sets/GrandPrix.java +++ b/Mage.Sets/src/mage/sets/GrandPrix.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class GrandPrix extends ExpansionSet { } private GrandPrix() { - super("Grand Prix", "GPX", "mage.sets.grandprix", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Grand Prix", "GPX", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("All Is Dust", 9, Rarity.MYTHIC, mage.cards.a.AllIsDust.class)); diff --git a/Mage.Sets/src/mage/sets/Guildpact.java b/Mage.Sets/src/mage/sets/Guildpact.java index 11cc919c0a..699d4f4dd9 100644 --- a/Mage.Sets/src/mage/sets/Guildpact.java +++ b/Mage.Sets/src/mage/sets/Guildpact.java @@ -31,9 +31,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; /** * Created by IntelliJ IDEA. User: Loki Date: 20.12.10 Time: 21:01 @@ -46,7 +44,7 @@ public class Guildpact extends ExpansionSet { } private Guildpact() { - super("Guildpact", "GPT", "mage.sets.guildpact", ExpansionSet.buildDate(2006, 1, 3), SetType.EXPANSION); + super("Guildpact", "GPT", ExpansionSet.buildDate(2006, 1, 3), SetType.EXPANSION); this.blockName = "Ravnica"; this.parentSet = RavnicaCityOfGuilds.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java index 9618e2bc9a..e1a9ac092d 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -3,9 +3,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; public class Guru extends ExpansionSet { private static final Guru fINSTANCE = new Guru(); @@ -15,7 +13,7 @@ public class Guru extends ExpansionSet { } private Guru() { - super("Guru", "GUR", "mage.sets.guru", ExpansionSet.buildDate(1990, 1, 2), SetType.PROMOTIONAL); + super("Guru", "GUR", ExpansionSet.buildDate(1990, 1, 2), SetType.PROMOTIONAL); cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class)); cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); cards.add(new SetCardInfo("Mountain", 3, Rarity.LAND, mage.cards.basiclands.Mountain.class)); diff --git a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java b/Mage.Sets/src/mage/sets/HeroesVsMonsters.java index 4b4539950a..558f2fb234 100644 --- a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java +++ b/Mage.Sets/src/mage/sets/HeroesVsMonsters.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class HeroesVsMonsters extends ExpansionSet { } private HeroesVsMonsters() { - super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", ExpansionSet.buildDate(2013, 9, 6), SetType.SUPPLEMENTAL); + super("Duel Decks: Heroes vs. Monsters", "DDL", ExpansionSet.buildDate(2013, 9, 6), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Anax and Cymede", 11, Rarity.RARE, mage.cards.a.AnaxAndCymede.class)); diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java index b12beba883..3b86629e8c 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class Homelands extends ExpansionSet { } private Homelands() { - super("Homelands", "HML", "mage.sets.homelands", ExpansionSet.buildDate(1995, 9, 1), SetType.EXPANSION); + super("Homelands", "HML", ExpansionSet.buildDate(1995, 9, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/HourOfDevastation.java b/Mage.Sets/src/mage/sets/HourOfDevastation.java index 0c511a02bf..1c80191496 100644 --- a/Mage.Sets/src/mage/sets/HourOfDevastation.java +++ b/Mage.Sets/src/mage/sets/HourOfDevastation.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; @@ -44,7 +43,7 @@ public class HourOfDevastation extends ExpansionSet { } private HourOfDevastation() { - super("Hour of Devastation", "HOU", "mage.sets.hourofdevastation", ExpansionSet.buildDate(2017, 7, 14), SetType.EXPANSION); + super("Hour of Devastation", "HOU", ExpansionSet.buildDate(2017, 7, 14), SetType.EXPANSION); this.blockName = "Amonkhet"; this.parentSet = Amonkhet.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java index d68ac5b5f5..6ea8718ef1 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class IceAge extends ExpansionSet { } private IceAge() { - super("Ice Age", "ICE", "mage.sets.iceage", ExpansionSet.buildDate(1995, 5, 1), SetType.EXPANSION); + super("Ice Age", "ICE", ExpansionSet.buildDate(1995, 5, 1), SetType.EXPANSION); this.blockName = "Ice Age"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Innistrad.java b/Mage.Sets/src/mage/sets/Innistrad.java index 6f92db0178..f687790fe8 100644 --- a/Mage.Sets/src/mage/sets/Innistrad.java +++ b/Mage.Sets/src/mage/sets/Innistrad.java @@ -31,12 +31,8 @@ package mage.sets; import mage.constants.SetType; import mage.cards.ExpansionSet; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @author BetaSteward_at_googlemail.com @@ -50,7 +46,7 @@ public class Innistrad extends ExpansionSet { } private Innistrad() { - super("Innistrad", "ISD", "mage.sets.innistrad", ExpansionSet.buildDate(2011, 9, 30), SetType.EXPANSION); + super("Innistrad", "ISD", ExpansionSet.buildDate(2011, 9, 30), SetType.EXPANSION); this.blockName = "Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Invasion.java b/Mage.Sets/src/mage/sets/Invasion.java index 3aaa6400c9..6e957b1e81 100644 --- a/Mage.Sets/src/mage/sets/Invasion.java +++ b/Mage.Sets/src/mage/sets/Invasion.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -48,7 +44,7 @@ public class Invasion extends ExpansionSet { } private Invasion() { - super("Invasion", "INV", "mage.sets.invasion", ExpansionSet.buildDate(2000, 9, 2), SetType.EXPANSION); + super("Invasion", "INV", ExpansionSet.buildDate(2000, 9, 2), SetType.EXPANSION); this.blockName = "Invasion"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java index 58c970537c..e2ee63e127 100644 --- a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java +++ b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class IzzetVsGolgari extends ExpansionSet { } private IzzetVsGolgari() { - super("Duel Decks: Izzet vs. Golgari", "DDJ", "mage.sets.izzetvsgolgari", ExpansionSet.buildDate(2012, 9, 7), SetType.SUPPLEMENTAL); + super("Duel Decks: Izzet vs. Golgari", "DDJ", ExpansionSet.buildDate(2012, 9, 7), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Barren Moor", 78, Rarity.COMMON, mage.cards.b.BarrenMoor.class)); diff --git a/Mage.Sets/src/mage/sets/JaceVsChandra.java b/Mage.Sets/src/mage/sets/JaceVsChandra.java index 6e0ec7f934..23184a7a01 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/JaceVsChandra.java @@ -6,14 +6,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -28,7 +24,7 @@ public class JaceVsChandra extends ExpansionSet { } private JaceVsChandra() { - super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", ExpansionSet.buildDate(2008, 11, 07), SetType.SUPPLEMENTAL); + super("Duel Decks: Jace vs. Chandra", "DD2", ExpansionSet.buildDate(2008, 11, 07), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Aethersnipe", 17, Rarity.COMMON, mage.cards.a.Aethersnipe.class)); diff --git a/Mage.Sets/src/mage/sets/JaceVsVraska.java b/Mage.Sets/src/mage/sets/JaceVsVraska.java index d217681e0f..6e180bdd8e 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/JaceVsVraska.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class JaceVsVraska extends ExpansionSet { } private JaceVsVraska() { - super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", ExpansionSet.buildDate(2014, 3, 14), SetType.SUPPLEMENTAL); + super("Duel Decks: Jace vs. Vraska", "DDM", ExpansionSet.buildDate(2014, 3, 14), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Acidic Slime", 64, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); diff --git a/Mage.Sets/src/mage/sets/JourneyIntoNyx.java b/Mage.Sets/src/mage/sets/JourneyIntoNyx.java index 949ac08304..45dff5d82d 100644 --- a/Mage.Sets/src/mage/sets/JourneyIntoNyx.java +++ b/Mage.Sets/src/mage/sets/JourneyIntoNyx.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class JourneyIntoNyx extends ExpansionSet { } private JourneyIntoNyx() { - super("Journey into Nyx", "JOU", "mage.sets.journeyintonyx", ExpansionSet.buildDate(2014, 5, 2), SetType.EXPANSION); + super("Journey into Nyx", "JOU", ExpansionSet.buildDate(2014, 5, 2), SetType.EXPANSION); this.blockName = "Theros"; this.parentSet = Theros.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/JudgePromo.java b/Mage.Sets/src/mage/sets/JudgePromo.java index e75c530bcd..cf91a0a67e 100644 --- a/Mage.Sets/src/mage/sets/JudgePromo.java +++ b/Mage.Sets/src/mage/sets/JudgePromo.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class JudgePromo extends ExpansionSet { } private JudgePromo() { - super("Judge Promo", "JR", "mage.sets.judgepromo", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Judge Promo", "JR", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Argothian Enchantress", 12, Rarity.RARE, mage.cards.a.ArgothianEnchantress.class)); cards.add(new SetCardInfo("Armageddon", 14, Rarity.RARE, mage.cards.a.Armageddon.class)); diff --git a/Mage.Sets/src/mage/sets/Judgment.java b/Mage.Sets/src/mage/sets/Judgment.java index 1f18bc6c07..2541136059 100644 --- a/Mage.Sets/src/mage/sets/Judgment.java +++ b/Mage.Sets/src/mage/sets/Judgment.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class Judgment extends ExpansionSet { } private Judgment() { - super("Judgment", "JUD", "mage.sets.judgment", ExpansionSet.buildDate(2002, 5, 27), SetType.EXPANSION); + super("Judgment", "JUD", ExpansionSet.buildDate(2002, 5, 27), SetType.EXPANSION); this.blockName = "Odyssey"; this.parentSet = Odyssey.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Kaladesh.java b/Mage.Sets/src/mage/sets/Kaladesh.java index 1ceacb3999..75f24e41be 100644 --- a/Mage.Sets/src/mage/sets/Kaladesh.java +++ b/Mage.Sets/src/mage/sets/Kaladesh.java @@ -28,7 +28,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -36,9 +35,7 @@ import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.constants.SetType; import mage.constants.Rarity; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -55,7 +52,7 @@ public class Kaladesh extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private Kaladesh() { - super("Kaladesh", "KLD", "mage.sets.kaladesh", ExpansionSet.buildDate(2016, 9, 30), SetType.EXPANSION); + super("Kaladesh", "KLD", ExpansionSet.buildDate(2016, 9, 30), SetType.EXPANSION); this.blockName = "Kaladesh"; this.hasBoosters = true; this.hasBasicLands = true; diff --git a/Mage.Sets/src/mage/sets/KhansOfTarkir.java b/Mage.Sets/src/mage/sets/KhansOfTarkir.java index 699820a4be..2c79f379ec 100644 --- a/Mage.Sets/src/mage/sets/KhansOfTarkir.java +++ b/Mage.Sets/src/mage/sets/KhansOfTarkir.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -51,7 +47,7 @@ public class KhansOfTarkir extends ExpansionSet { } private KhansOfTarkir() { - super("Khans of Tarkir", "KTK", "mage.sets.khansoftarkir", ExpansionSet.buildDate(2014, 9, 26), SetType.EXPANSION); + super("Khans of Tarkir", "KTK", ExpansionSet.buildDate(2014, 9, 26), SetType.EXPANSION); this.blockName = "Khans of Tarkir"; this.hasBoosters = true; this.hasBasicLands = true; diff --git a/Mage.Sets/src/mage/sets/KnightsVsDragons.java b/Mage.Sets/src/mage/sets/KnightsVsDragons.java index 41d385c098..1274429a93 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/KnightsVsDragons.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class KnightsVsDragons extends ExpansionSet { } private KnightsVsDragons() { - super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", ExpansionSet.buildDate(2011, 4, 1), SetType.SUPPLEMENTAL); + super("Duel Decks: Knights vs. Dragons", "DDG", ExpansionSet.buildDate(2011, 4, 1), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Alaborn Cavalier", 18, Rarity.UNCOMMON, mage.cards.a.AlabornCavalier.class)); diff --git a/Mage.Sets/src/mage/sets/LaunchParty.java b/Mage.Sets/src/mage/sets/LaunchParty.java index a12d8874ff..85d88e3692 100644 --- a/Mage.Sets/src/mage/sets/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/LaunchParty.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class LaunchParty extends ExpansionSet { } private LaunchParty() { - super("Launch Party", "MLP", "mage.sets.launchparty", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Launch Party", "MLP", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Ajani Vengeant", 4, Rarity.MYTHIC, mage.cards.a.AjaniVengeant.class)); diff --git a/Mage.Sets/src/mage/sets/Legends.java b/Mage.Sets/src/mage/sets/Legends.java index 766cfaf293..c1aa846fed 100644 --- a/Mage.Sets/src/mage/sets/Legends.java +++ b/Mage.Sets/src/mage/sets/Legends.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class Legends extends ExpansionSet { } private Legends() { - super("Legends", "LEG", "mage.sets.legends", ExpansionSet.buildDate(1994, 5, 1), SetType.EXPANSION); + super("Legends", "LEG", ExpansionSet.buildDate(1994, 5, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Legions.java b/Mage.Sets/src/mage/sets/Legions.java index 0bf37fdf85..1467807dda 100644 --- a/Mage.Sets/src/mage/sets/Legions.java +++ b/Mage.Sets/src/mage/sets/Legions.java @@ -27,8 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; @@ -46,7 +44,7 @@ public class Legions extends ExpansionSet { } private Legions() { - super("Legions", "LGN", "mage.sets.legions", ExpansionSet.buildDate(2003, 0, 25), SetType.EXPANSION); + super("Legions", "LGN", ExpansionSet.buildDate(2003, 0, 25), SetType.EXPANSION); this.blockName = "Onslaught"; this.parentSet = Onslaught.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java index 117ecbf12d..120c29968e 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java @@ -1,14 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -23,7 +18,7 @@ public class LimitedEditionAlpha extends ExpansionSet { } private LimitedEditionAlpha() { - super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", ExpansionSet.buildDate(1993, 7, 1), SetType.CORE); + super("Limited Edition Alpha", "LEA", ExpansionSet.buildDate(1993, 7, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java index 160b411508..f8c65a44d9 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java @@ -1,14 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -23,7 +18,7 @@ public class LimitedEditionBeta extends ExpansionSet { } private LimitedEditionBeta() { - super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", ExpansionSet.buildDate(1993, 9, 1), SetType.CORE); + super("Limited Edition Beta", "LEB", ExpansionSet.buildDate(1993, 9, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/Lorwyn.java b/Mage.Sets/src/mage/sets/Lorwyn.java index 06bef22287..8a1e6d1849 100644 --- a/Mage.Sets/src/mage/sets/Lorwyn.java +++ b/Mage.Sets/src/mage/sets/Lorwyn.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Lorwyn extends ExpansionSet { } private Lorwyn() { - super("Lorwyn", "LRW", "mage.sets.lorwyn", ExpansionSet.buildDate(2007, 9, 12), SetType.EXPANSION); + super("Lorwyn", "LRW", ExpansionSet.buildDate(2007, 9, 12), SetType.EXPANSION); this.blockName = "Lorwyn"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Magic2010.java b/Mage.Sets/src/mage/sets/Magic2010.java index 40c436d359..a241098d2b 100644 --- a/Mage.Sets/src/mage/sets/Magic2010.java +++ b/Mage.Sets/src/mage/sets/Magic2010.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Magic2010 extends ExpansionSet { } private Magic2010() { - super("Magic 2010", "M10", "mage.sets.magic2010", ExpansionSet.buildDate(2009, 6, 17), SetType.CORE); + super("Magic 2010", "M10", ExpansionSet.buildDate(2009, 6, 17), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2011.java b/Mage.Sets/src/mage/sets/Magic2011.java index 69768226ec..d450e384cc 100644 --- a/Mage.Sets/src/mage/sets/Magic2011.java +++ b/Mage.Sets/src/mage/sets/Magic2011.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Magic2011 extends ExpansionSet { } private Magic2011() { - super("Magic 2011", "M11", "mage.sets.magic2011", ExpansionSet.buildDate(2010, 6, 16), SetType.CORE); + super("Magic 2011", "M11", ExpansionSet.buildDate(2010, 6, 16), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2012.java b/Mage.Sets/src/mage/sets/Magic2012.java index 7eede4038b..8d13bed68e 100644 --- a/Mage.Sets/src/mage/sets/Magic2012.java +++ b/Mage.Sets/src/mage/sets/Magic2012.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Magic2012 extends ExpansionSet { } private Magic2012() { - super("Magic 2012", "M12", "mage.sets.magic2012", ExpansionSet.buildDate(2011, 6, 9), SetType.CORE); + super("Magic 2012", "M12", ExpansionSet.buildDate(2011, 6, 9), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2013.java b/Mage.Sets/src/mage/sets/Magic2013.java index 632dcfd463..d793eacb7e 100644 --- a/Mage.Sets/src/mage/sets/Magic2013.java +++ b/Mage.Sets/src/mage/sets/Magic2013.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Magic2013 extends ExpansionSet { } private Magic2013() { - super("Magic 2013", "M13", "mage.sets.magic2013", ExpansionSet.buildDate(2012, 6, 7), SetType.CORE); + super("Magic 2013", "M13", ExpansionSet.buildDate(2012, 6, 7), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2014.java b/Mage.Sets/src/mage/sets/Magic2014.java index 61029b2b10..55a1b7af6d 100644 --- a/Mage.Sets/src/mage/sets/Magic2014.java +++ b/Mage.Sets/src/mage/sets/Magic2014.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Magic2014 extends ExpansionSet { } private Magic2014() { - super("Magic 2014", "M14", "mage.sets.magic2014", ExpansionSet.buildDate(2013, 7, 19), SetType.CORE); + super("Magic 2014", "M14", ExpansionSet.buildDate(2013, 7, 19), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Magic2015.java b/Mage.Sets/src/mage/sets/Magic2015.java index 0ef1cd8fe1..e1774e7cc7 100644 --- a/Mage.Sets/src/mage/sets/Magic2015.java +++ b/Mage.Sets/src/mage/sets/Magic2015.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Magic2015 extends ExpansionSet { } private Magic2015() { - super("Magic 2015", "M15", "mage.sets.magic2015", ExpansionSet.buildDate(2014, 7, 18), SetType.CORE); + super("Magic 2015", "M15", ExpansionSet.buildDate(2014, 7, 18), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/MagicOrigins.java b/Mage.Sets/src/mage/sets/MagicOrigins.java index 4b59c80102..0fa55a43ff 100644 --- a/Mage.Sets/src/mage/sets/MagicOrigins.java +++ b/Mage.Sets/src/mage/sets/MagicOrigins.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class MagicOrigins extends ExpansionSet { } private MagicOrigins() { - super("Magic Origins", "ORI", "mage.sets.magicorigins", ExpansionSet.buildDate(2015, 7, 17), SetType.CORE); + super("Magic Origins", "ORI", ExpansionSet.buildDate(2015, 7, 17), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java index 54d0a4a545..d7e730072e 100644 --- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java +++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java @@ -29,9 +29,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; public class MagicPlayerRewards extends ExpansionSet { private static final MagicPlayerRewards fINSTANCE = new MagicPlayerRewards(); @@ -41,7 +39,7 @@ public class MagicPlayerRewards extends ExpansionSet { } private MagicPlayerRewards() { - super("Magic Player Rewards", "MPRP", "mage.sets.magicplayerrewards", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); + super("Magic Player Rewards", "MPRP", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Bituminous Blast", 46, Rarity.SPECIAL, mage.cards.b.BituminousBlast.class)); diff --git a/Mage.Sets/src/mage/sets/MasterpieceSeries.java b/Mage.Sets/src/mage/sets/MasterpieceSeries.java index fa864c399d..ef002104b3 100644 --- a/Mage.Sets/src/mage/sets/MasterpieceSeries.java +++ b/Mage.Sets/src/mage/sets/MasterpieceSeries.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; import mage.cards.FrameStyle; @@ -49,7 +46,7 @@ public class MasterpieceSeries extends ExpansionSet { } private MasterpieceSeries() { - super("Masterpiece Series", "MPS", "mage.sets.masterpieceseries", ExpansionSet.buildDate(2016, 9, 30), SetType.PROMOTIONAL); + super("Masterpiece Series", "MPS", ExpansionSet.buildDate(2016, 9, 30), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Aether Vial", 6, Rarity.MYTHIC, mage.cards.a.AetherVial.class, new CardGraphicInfo(FrameStyle.KLD_INVENTION, false))); diff --git a/Mage.Sets/src/mage/sets/MastersEdition.java b/Mage.Sets/src/mage/sets/MastersEdition.java index 61536179aa..83ab9e6063 100644 --- a/Mage.Sets/src/mage/sets/MastersEdition.java +++ b/Mage.Sets/src/mage/sets/MastersEdition.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class MastersEdition extends ExpansionSet { } private MastersEdition() { - super("Masters Edition", "MED", "mage.sets.mastersedition", ExpansionSet.buildDate(2007, 9, 10), SetType.MAGIC_ONLINE); + super("Masters Edition", "MED", ExpansionSet.buildDate(2007, 9, 10), SetType.MAGIC_ONLINE); this.hasBasicLands = true; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/MastersEditionII.java b/Mage.Sets/src/mage/sets/MastersEditionII.java index a26f2de714..45e88084fe 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionII.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class MastersEditionII extends ExpansionSet { } private MastersEditionII() { - super("Masters Edition II", "ME2", "mage.sets.masterseditionii", ExpansionSet.buildDate(2008, 9, 22), SetType.MAGIC_ONLINE); + super("Masters Edition II", "ME2", ExpansionSet.buildDate(2008, 9, 22), SetType.MAGIC_ONLINE); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/MastersEditionIII.java b/Mage.Sets/src/mage/sets/MastersEditionIII.java index 2663221129..ed969ff4c8 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIII.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class MastersEditionIII extends ExpansionSet { } private MastersEditionIII() { - super("Masters Edition III", "ME3", "mage.sets.masterseditioniii", ExpansionSet.buildDate(2009, 9, 7), SetType.MAGIC_ONLINE); + super("Masters Edition III", "ME3", ExpansionSet.buildDate(2009, 9, 7), SetType.MAGIC_ONLINE); this.hasBasicLands = true; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/MastersEditionIV.java b/Mage.Sets/src/mage/sets/MastersEditionIV.java index 8fcf66ec6e..817ef8163b 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIV.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIV.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class MastersEditionIV extends ExpansionSet { } private MastersEditionIV() { - super("Masters Edition IV", "ME4", "mage.sets.masterseditioniv", ExpansionSet.buildDate(2011, 1, 10), SetType.MAGIC_ONLINE); + super("Masters Edition IV", "ME4", ExpansionSet.buildDate(2011, 1, 10), SetType.MAGIC_ONLINE); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/MediaInserts.java b/Mage.Sets/src/mage/sets/MediaInserts.java index b8a30501fb..179a5ad16a 100644 --- a/Mage.Sets/src/mage/sets/MediaInserts.java +++ b/Mage.Sets/src/mage/sets/MediaInserts.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class MediaInserts extends ExpansionSet { private static final MediaInserts fINSTANCE = new MediaInserts(); @@ -44,7 +40,7 @@ public class MediaInserts extends ExpansionSet { } private MediaInserts() { - super("Media Inserts", "MBP", "mage.sets.mediainserts", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); + super("Media Inserts", "MBP", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Acquire", 83, Rarity.RARE, mage.cards.a.Acquire.class)); diff --git a/Mage.Sets/src/mage/sets/MercadianMasques.java b/Mage.Sets/src/mage/sets/MercadianMasques.java index 6f01811ae7..3fec73831c 100644 --- a/Mage.Sets/src/mage/sets/MercadianMasques.java +++ b/Mage.Sets/src/mage/sets/MercadianMasques.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class MercadianMasques extends ExpansionSet { } private MercadianMasques() { - super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", ExpansionSet.buildDate(1999, 8, 25), SetType.EXPANSION); + super("Mercadian Masques", "MMQ", ExpansionSet.buildDate(1999, 8, 25), SetType.EXPANSION); this.blockName = "Masques"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/MindVsMight.java b/Mage.Sets/src/mage/sets/MindVsMight.java index 3611c85929..a173595446 100644 --- a/Mage.Sets/src/mage/sets/MindVsMight.java +++ b/Mage.Sets/src/mage/sets/MindVsMight.java @@ -6,11 +6,8 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -25,7 +22,7 @@ public class MindVsMight extends ExpansionSet { } private MindVsMight() { - super("Duel Decks: Mind vs. Might", "DDS", "mage.sets.mindvsmight", ExpansionSet.buildDate(2017, 3, 31), SetType.SUPPLEMENTAL); + super("Duel Decks: Mind vs. Might", "DDS", ExpansionSet.buildDate(2017, 3, 31), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/Mirage.java b/Mage.Sets/src/mage/sets/Mirage.java index b3ecc703a9..e4a99c2aa6 100644 --- a/Mage.Sets/src/mage/sets/Mirage.java +++ b/Mage.Sets/src/mage/sets/Mirage.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +44,7 @@ public class Mirage extends ExpansionSet { } private Mirage() { - super("Mirage", "MIR", "mage.sets.mirage", ExpansionSet.buildDate(1996, 8, 21), SetType.EXPANSION); + super("Mirage", "MIR", ExpansionSet.buildDate(1996, 8, 21), SetType.EXPANSION); this.blockName = "Mirage"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Mirrodin.java b/Mage.Sets/src/mage/sets/Mirrodin.java index 754826c3b6..5597b39d0f 100644 --- a/Mage.Sets/src/mage/sets/Mirrodin.java +++ b/Mage.Sets/src/mage/sets/Mirrodin.java @@ -3,12 +3,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class Mirrodin extends ExpansionSet { private static final Mirrodin fINSTANCE = new Mirrodin(); @@ -18,7 +14,7 @@ public class Mirrodin extends ExpansionSet { } private Mirrodin() { - super("Mirrodin", "MRD", "mage.sets.mirrodin", ExpansionSet.buildDate(2003, 9, 2), SetType.EXPANSION); + super("Mirrodin", "MRD", ExpansionSet.buildDate(2003, 9, 2), SetType.EXPANSION); this.blockName = "Mirrodin"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/MirrodinBesieged.java b/Mage.Sets/src/mage/sets/MirrodinBesieged.java index 4d512bec40..d09690def7 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class MirrodinBesieged extends ExpansionSet { } private MirrodinBesieged() { - super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", ExpansionSet.buildDate(2011, 1, 4), SetType.EXPANSION); + super("Mirrodin Besieged", "MBS", ExpansionSet.buildDate(2011, 1, 4), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.parentSet = ScarsOfMirrodin.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/ModernMasters.java b/Mage.Sets/src/mage/sets/ModernMasters.java index e11e4496c1..f4656440ce 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters.java +++ b/Mage.Sets/src/mage/sets/ModernMasters.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class ModernMasters extends ExpansionSet { } private ModernMasters() { - super("Modern Masters", "MMA", "mage.sets.modernmasters", ExpansionSet.buildDate(2013, 6, 7), SetType.SUPPLEMENTAL); + super("Modern Masters", "MMA", ExpansionSet.buildDate(2013, 6, 7), SetType.SUPPLEMENTAL); this.blockName = "Reprint"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/ModernMasters2015.java b/Mage.Sets/src/mage/sets/ModernMasters2015.java index b14f93d28e..632816327b 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters2015.java +++ b/Mage.Sets/src/mage/sets/ModernMasters2015.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class ModernMasters2015 extends ExpansionSet { } private ModernMasters2015() { - super("Modern Masters 2015", "MM2", "mage.sets.modernmasters2015", ExpansionSet.buildDate(2015, 5, 22), SetType.SUPPLEMENTAL); + super("Modern Masters 2015", "MM2", ExpansionSet.buildDate(2015, 5, 22), SetType.SUPPLEMENTAL); this.blockName = "Reprint"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/ModernMasters2017.java b/Mage.Sets/src/mage/sets/ModernMasters2017.java index 6ff1d3f54a..9b7ecc23de 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters2017.java +++ b/Mage.Sets/src/mage/sets/ModernMasters2017.java @@ -28,11 +28,8 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class ModernMasters2017 extends ExpansionSet { } private ModernMasters2017() { - super("Modern Masters 2017", "MM3", "mage.sets.modernmasters2017", ExpansionSet.buildDate(2017, 3, 17), SetType.SUPPLEMENTAL); + super("Modern Masters 2017", "MM3", ExpansionSet.buildDate(2017, 3, 17), SetType.SUPPLEMENTAL); this.blockName = "Reprint"; this.hasBasicLands = false; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/Morningtide.java b/Mage.Sets/src/mage/sets/Morningtide.java index 97eab08049..e83235a820 100644 --- a/Mage.Sets/src/mage/sets/Morningtide.java +++ b/Mage.Sets/src/mage/sets/Morningtide.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class Morningtide extends ExpansionSet { } private Morningtide() { - super("Morningtide", "MOR", "mage.sets.morningtide", ExpansionSet.buildDate(2008, 1, 1), SetType.EXPANSION); + super("Morningtide", "MOR", ExpansionSet.buildDate(2008, 1, 1), SetType.EXPANSION); this.blockName = "Lorwyn"; this.parentSet = Morningtide.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Nemesis.java b/Mage.Sets/src/mage/sets/Nemesis.java index 8f7f535f04..c694e00ca8 100644 --- a/Mage.Sets/src/mage/sets/Nemesis.java +++ b/Mage.Sets/src/mage/sets/Nemesis.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class Nemesis extends ExpansionSet { } private Nemesis() { - super("Nemesis", "NEM", "mage.sets.nemesis", ExpansionSet.buildDate(2000, 1, 5), SetType.EXPANSION); + super("Nemesis", "NEM", ExpansionSet.buildDate(2000, 1, 5), SetType.EXPANSION); this.blockName = "Masques"; this.parentSet = MercadianMasques.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/NewPhyrexia.java b/Mage.Sets/src/mage/sets/NewPhyrexia.java index 4be0507bd9..adf5a1b643 100644 --- a/Mage.Sets/src/mage/sets/NewPhyrexia.java +++ b/Mage.Sets/src/mage/sets/NewPhyrexia.java @@ -1,14 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class NewPhyrexia extends ExpansionSet { private static final NewPhyrexia fINSTANCE = new NewPhyrexia(); @@ -18,7 +13,7 @@ public class NewPhyrexia extends ExpansionSet { } private NewPhyrexia() { - super("New Phyrexia", "NPH", "mage.sets.newphyrexia", ExpansionSet.buildDate(2011, 4, 4), SetType.EXPANSION); + super("New Phyrexia", "NPH", ExpansionSet.buildDate(2011, 4, 4), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.parentSet = ScarsOfMirrodin.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/NinthEdition.java b/Mage.Sets/src/mage/sets/NinthEdition.java index 03088dd210..5cdacf31e2 100644 --- a/Mage.Sets/src/mage/sets/NinthEdition.java +++ b/Mage.Sets/src/mage/sets/NinthEdition.java @@ -1,13 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class NinthEdition extends ExpansionSet { @@ -18,7 +14,7 @@ public class NinthEdition extends ExpansionSet { } private NinthEdition() { - super("Ninth Edition", "9ED", "mage.sets.ninthedition", ExpansionSet.buildDate(2005, 7, 29), SetType.CORE); + super("Ninth Edition", "9ED", ExpansionSet.buildDate(2005, 7, 29), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/NissaVsObNixilis.java b/Mage.Sets/src/mage/sets/NissaVsObNixilis.java index 8ab9b31ad7..a581c99d26 100644 --- a/Mage.Sets/src/mage/sets/NissaVsObNixilis.java +++ b/Mage.Sets/src/mage/sets/NissaVsObNixilis.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -46,7 +45,7 @@ public class NissaVsObNixilis extends ExpansionSet { } private NissaVsObNixilis() { - super("Duel Decks: Nissa vs. Ob Nixilis", "DDR", "mage.sets.nissavsobnixilis", ExpansionSet.buildDate(2016, 9, 2), SetType.SUPPLEMENTAL); + super("Duel Decks: Nissa vs. Ob Nixilis", "DDR", ExpansionSet.buildDate(2016, 9, 2), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java index e617769a1f..10cbefa289 100644 --- a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java +++ b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java @@ -6,7 +6,6 @@ package mage.sets; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -14,9 +13,7 @@ import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.constants.SetType; import mage.constants.Rarity; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -33,7 +30,7 @@ public class OathOfTheGatewatch extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private OathOfTheGatewatch() { - super("Oath of the Gatewatch", "OGW", "mage.sets.oathofthegatewatch", ExpansionSet.buildDate(2016, 1, 22), SetType.EXPANSION); + super("Oath of the Gatewatch", "OGW", ExpansionSet.buildDate(2016, 1, 22), SetType.EXPANSION); this.blockName = "Battle for Zendikar"; this.parentSet = BattleForZendikar.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/Odyssey.java b/Mage.Sets/src/mage/sets/Odyssey.java index c55e1a37ed..858e6ab9ac 100644 --- a/Mage.Sets/src/mage/sets/Odyssey.java +++ b/Mage.Sets/src/mage/sets/Odyssey.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -45,7 +44,7 @@ public class Odyssey extends ExpansionSet { } private Odyssey() { - super("Odyssey", "ODY", "mage.sets.odyssey", ExpansionSet.buildDate(2001, 9, 22), SetType.EXPANSION); + super("Odyssey", "ODY", ExpansionSet.buildDate(2001, 9, 22), SetType.EXPANSION); this.blockName = "Odyssey"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/Onslaught.java b/Mage.Sets/src/mage/sets/Onslaught.java index 94eb742599..dafe14b3c1 100644 --- a/Mage.Sets/src/mage/sets/Onslaught.java +++ b/Mage.Sets/src/mage/sets/Onslaught.java @@ -3,12 +3,9 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class Onslaught extends ExpansionSet { private static final Onslaught fINSTANCE = new Onslaught(); @@ -18,7 +15,7 @@ public class Onslaught extends ExpansionSet { } private Onslaught() { - super("Onslaught", "ONS", "mage.sets.onslaught", ExpansionSet.buildDate(2002, 10, 7), SetType.EXPANSION); + super("Onslaught", "ONS", ExpansionSet.buildDate(2002, 10, 7), SetType.EXPANSION); this.blockName = "Onslaught"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/PDSFireAndLightning.java b/Mage.Sets/src/mage/sets/PDSFireAndLightning.java index 4e958c8861..62fe447227 100644 --- a/Mage.Sets/src/mage/sets/PDSFireAndLightning.java +++ b/Mage.Sets/src/mage/sets/PDSFireAndLightning.java @@ -45,7 +45,7 @@ public class PDSFireAndLightning extends ExpansionSet { } private PDSFireAndLightning() { - super("Premium Deck Series: Fire and Lightning", "PD2", "mage.sets.pdsfireandlightning", ExpansionSet.buildDate(2010, 11, 1), + super("Premium Deck Series: Fire and Lightning", "PD2", ExpansionSet.buildDate(2010, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Ball Lightning", 12, Rarity.RARE, mage.cards.b.BallLightning.class)); diff --git a/Mage.Sets/src/mage/sets/PDSGraveborn.java b/Mage.Sets/src/mage/sets/PDSGraveborn.java index b5518703a6..8e54ee713e 100644 --- a/Mage.Sets/src/mage/sets/PDSGraveborn.java +++ b/Mage.Sets/src/mage/sets/PDSGraveborn.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class PDSGraveborn extends ExpansionSet { } private PDSGraveborn() { - super("Premium Deck Series: Graveborn", "PD3", "mage.sets.pdsgraveborn", ExpansionSet.buildDate(2011, 11, 1), SetType.SUPPLEMENTAL); + super("Premium Deck Series: Graveborn", "PD3", ExpansionSet.buildDate(2011, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Animate Dead", 16, Rarity.UNCOMMON, mage.cards.a.AnimateDead.class)); cards.add(new SetCardInfo("Avatar of Woe", 6, Rarity.RARE, mage.cards.a.AvatarOfWoe.class)); diff --git a/Mage.Sets/src/mage/sets/PDSSlivers.java b/Mage.Sets/src/mage/sets/PDSSlivers.java index 967ea6a60a..1b08d364b8 100644 --- a/Mage.Sets/src/mage/sets/PDSSlivers.java +++ b/Mage.Sets/src/mage/sets/PDSSlivers.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class PDSSlivers extends ExpansionSet { } private PDSSlivers() { - super("Premium Deck Series: Slivers", "H09", "mage.sets.pdsslivers", ExpansionSet.buildDate(2009, 11, 1), SetType.SUPPLEMENTAL); + super("Premium Deck Series: Slivers", "H09", ExpansionSet.buildDate(2009, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Acidic Sliver", 13, Rarity.UNCOMMON, mage.cards.a.AcidicSliver.class)); cards.add(new SetCardInfo("Amoeboid Changeling", 3, Rarity.COMMON, mage.cards.a.AmoeboidChangeling.class)); diff --git a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java b/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java index e591000c28..a3f83a8453 100644 --- a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java +++ b/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java @@ -45,7 +45,7 @@ public class PhyrexiaVsTheCoalition extends ExpansionSet { } private PhyrexiaVsTheCoalition() { - super("Duel Decks: Phyrexia vs. the Coalition", "DDE", "mage.sets.phyrexiavsthecoalition", ExpansionSet.buildDate(2010, 3, 19), + super("Duel Decks: Phyrexia vs. the Coalition", "DDE", ExpansionSet.buildDate(2010, 3, 19), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/PlanarChaos.java b/Mage.Sets/src/mage/sets/PlanarChaos.java index 9b03ce7f71..1e4b0626a5 100644 --- a/Mage.Sets/src/mage/sets/PlanarChaos.java +++ b/Mage.Sets/src/mage/sets/PlanarChaos.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class PlanarChaos extends ExpansionSet { } private PlanarChaos() { - super("Planar Chaos", "PLC", "mage.sets.planarchaos", ExpansionSet.buildDate(2007, 1, 2), SetType.EXPANSION); + super("Planar Chaos", "PLC", ExpansionSet.buildDate(2007, 1, 2), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Planechase.java b/Mage.Sets/src/mage/sets/Planechase.java index 80b724ab48..4073fda9ee 100644 --- a/Mage.Sets/src/mage/sets/Planechase.java +++ b/Mage.Sets/src/mage/sets/Planechase.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Planechase extends ExpansionSet { } private Planechase() { - super("Planechase", "HOP", "mage.sets.planechase", ExpansionSet.buildDate(2009, 8, 4), SetType.SUPPLEMENTAL); + super("Planechase", "HOP", ExpansionSet.buildDate(2009, 8, 4), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Akroma's Vengeance", 1, Rarity.RARE, mage.cards.a.AkromasVengeance.class)); cards.add(new SetCardInfo("Ancient Den", 130, Rarity.COMMON, mage.cards.a.AncientDen.class)); diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java index f9112b64a3..c53594dab9 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Planechase2012 extends ExpansionSet { } private Planechase2012() { - super("Planechase 2012 Edition", "PC2", "mage.sets.planechase2012", ExpansionSet.buildDate(2012, 6, 1), SetType.SUPPLEMENTAL); + super("Planechase 2012 Edition", "PC2", ExpansionSet.buildDate(2012, 6, 1), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Arc Trail", 39, Rarity.UNCOMMON, mage.cards.a.ArcTrail.class)); cards.add(new SetCardInfo("Armillary Sphere", 108, Rarity.COMMON, mage.cards.a.ArmillarySphere.class)); diff --git a/Mage.Sets/src/mage/sets/PlanechaseAnthology.java b/Mage.Sets/src/mage/sets/PlanechaseAnthology.java index 5feaf04ddd..f5b7f67cf7 100644 --- a/Mage.Sets/src/mage/sets/PlanechaseAnthology.java +++ b/Mage.Sets/src/mage/sets/PlanechaseAnthology.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; @@ -44,7 +43,7 @@ public class PlanechaseAnthology extends ExpansionSet { } private PlanechaseAnthology() { - super("Planechase Anthology", "PCA", "mage.sets.planechaseanthology", ExpansionSet.buildDate(2016, 11, 25), SetType.SUPPLEMENTAL); + super("Planechase Anthology", "PCA", ExpansionSet.buildDate(2016, 11, 25), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; } diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java index 74e892920f..a29b870f70 100644 --- a/Mage.Sets/src/mage/sets/Planeshift.java +++ b/Mage.Sets/src/mage/sets/Planeshift.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Planeshift extends ExpansionSet { } private Planeshift() { - super("Planeshift", "PLS", "mage.sets.planeshift", ExpansionSet.buildDate(2001, 1, 5), SetType.EXPANSION); + super("Planeshift", "PLS", ExpansionSet.buildDate(2001, 1, 5), SetType.EXPANSION); this.blockName = "Invasion"; this.parentSet = Invasion.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Portal.java b/Mage.Sets/src/mage/sets/Portal.java index 55a1ddcf78..1d7eae6edf 100644 --- a/Mage.Sets/src/mage/sets/Portal.java +++ b/Mage.Sets/src/mage/sets/Portal.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -55,7 +51,7 @@ public class Portal extends ExpansionSet { } private Portal() { - super("Portal", "POR", "mage.sets.portal", ExpansionSet.buildDate(1997, 5, 1), SetType.SUPPLEMENTAL); + super("Portal", "POR", ExpansionSet.buildDate(1997, 5, 1), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; this.hasBasicLands = true; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/PortalSecondAge.java b/Mage.Sets/src/mage/sets/PortalSecondAge.java index 86a6ebe59d..034f6e54d6 100644 --- a/Mage.Sets/src/mage/sets/PortalSecondAge.java +++ b/Mage.Sets/src/mage/sets/PortalSecondAge.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -55,7 +51,7 @@ public class PortalSecondAge extends ExpansionSet { } private PortalSecondAge() { - super("Portal Second Age", "PO2", "mage.sets.portalsecondage", ExpansionSet.buildDate(1998, 6, 24), SetType.SUPPLEMENTAL); + super("Portal Second Age", "PO2", ExpansionSet.buildDate(1998, 6, 24), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; this.hasBasicLands = true; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java b/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java index b38f31ddec..20faf9156a 100644 --- a/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java +++ b/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class PortalThreeKingdoms extends ExpansionSet { } private PortalThreeKingdoms() { - super("Portal Three Kingdoms", "PTK", "mage.sets.portalthreekingdoms", ExpansionSet.buildDate(1999, 5, 1), SetType.SUPPLEMENTAL); + super("Portal Three Kingdoms", "PTK", ExpansionSet.buildDate(1999, 5, 1), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; this.hasBasicLands = true; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/PrereleaseEvents.java b/Mage.Sets/src/mage/sets/PrereleaseEvents.java index dd51db4d5a..c862031764 100644 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ b/Mage.Sets/src/mage/sets/PrereleaseEvents.java @@ -3,12 +3,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class PrereleaseEvents extends ExpansionSet { private static final PrereleaseEvents fINSTANCE = new PrereleaseEvents(); @@ -18,7 +14,7 @@ public class PrereleaseEvents extends ExpansionSet { } private PrereleaseEvents() { - super("Prerelease Events", "PTC", "mage.sets.prereleaseevents", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); + super("Prerelease Events", "PTC", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Abbot of Keral Keep", 198, Rarity.RARE, mage.cards.a.AbbotOfKeralKeep.class)); diff --git a/Mage.Sets/src/mage/sets/Prophecy.java b/Mage.Sets/src/mage/sets/Prophecy.java index 06c6481493..e4a7e8f3bc 100644 --- a/Mage.Sets/src/mage/sets/Prophecy.java +++ b/Mage.Sets/src/mage/sets/Prophecy.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class Prophecy extends ExpansionSet { } private Prophecy() { - super("Prophecy", "PCY", "mage.sets.prophecy", ExpansionSet.buildDate(2000, 4, 27), SetType.EXPANSION); + super("Prophecy", "PCY", ExpansionSet.buildDate(2000, 4, 27), SetType.EXPANSION); this.blockName = "Masques"; this.parentSet = MercadianMasques.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java index 4f6664b844..f8cd6edbd8 100644 --- a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java +++ b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java @@ -31,12 +31,8 @@ package mage.sets; import mage.constants.SetType; import mage.cards.ExpansionSet; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class RavnicaCityOfGuilds extends ExpansionSet { } private RavnicaCityOfGuilds() { - super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnica", ExpansionSet.buildDate(2005, 9, 24), SetType.EXPANSION); + super("Ravnica: City of Guilds", "RAV", ExpansionSet.buildDate(2005, 9, 24), SetType.EXPANSION); this.blockName = "Ravnica"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/ReturnToRavnica.java b/Mage.Sets/src/mage/sets/ReturnToRavnica.java index 45c515af11..8fe6649382 100644 --- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java +++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java @@ -30,12 +30,8 @@ package mage.sets; import mage.constants.SetType; import mage.cards.ExpansionSet; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class ReturnToRavnica extends ExpansionSet { } private ReturnToRavnica() { - super("Return to Ravnica", "RTR", "mage.sets.returntoravnica", ExpansionSet.buildDate(2012, 9, 29), SetType.EXPANSION); + super("Return to Ravnica", "RTR", ExpansionSet.buildDate(2012, 9, 29), SetType.EXPANSION); this.blockName = "Return to Ravnica"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/RevisedEdition.java b/Mage.Sets/src/mage/sets/RevisedEdition.java index 8354b09048..a53ead62ff 100644 --- a/Mage.Sets/src/mage/sets/RevisedEdition.java +++ b/Mage.Sets/src/mage/sets/RevisedEdition.java @@ -1,14 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -23,7 +18,7 @@ public class RevisedEdition extends ExpansionSet { } private RevisedEdition() { - super("Revised Edition", "3ED", "mage.sets.revisededition", ExpansionSet.buildDate(1994, 3, 1), SetType.CORE); + super("Revised Edition", "3ED", ExpansionSet.buildDate(1994, 3, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java index 4cf8b2a7e2..5f555442a7 100644 --- a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java +++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class RiseOfTheEldrazi extends ExpansionSet { } private RiseOfTheEldrazi() { - super("Rise of the Eldrazi", "ROE", "mage.sets.riseoftheeldrazi", ExpansionSet.buildDate(2010, 3, 17), SetType.EXPANSION); + super("Rise of the Eldrazi", "ROE", ExpansionSet.buildDate(2010, 3, 17), SetType.EXPANSION); this.blockName = "Zendikar"; this.parentSet = Zendikar.getInstance(); this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java index bb4c697f20..7dfe4b7093 100644 --- a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class SaviorsOfKamigawa extends ExpansionSet { } private SaviorsOfKamigawa() { - super("Saviors of Kamigawa", "SOK", "mage.sets.saviorsofkamigawa", ExpansionSet.buildDate(2005, 5, 3), SetType.EXPANSION); + super("Saviors of Kamigawa", "SOK", ExpansionSet.buildDate(2005, 5, 3), SetType.EXPANSION); this.blockName = "Kamigawa"; this.parentSet = ChampionsOfKamigawa.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java index 1680833bdc..d0550abc01 100644 --- a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java +++ b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java @@ -31,12 +31,8 @@ package mage.sets; import mage.constants.SetType; import mage.cards.ExpansionSet; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -51,7 +47,7 @@ public class ScarsOfMirrodin extends ExpansionSet { } private ScarsOfMirrodin() { - super("Scars of Mirrodin", "SOM", "mage.sets.scarsofmirrodin", ExpansionSet.buildDate(2010, 10, 1), SetType.EXPANSION); + super("Scars of Mirrodin", "SOM", ExpansionSet.buildDate(2010, 10, 1), SetType.EXPANSION); this.blockName = "Scars of Mirrodin"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Scourge.java b/Mage.Sets/src/mage/sets/Scourge.java index 044fdb0516..df8f5c2c19 100644 --- a/Mage.Sets/src/mage/sets/Scourge.java +++ b/Mage.Sets/src/mage/sets/Scourge.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class Scourge extends ExpansionSet { } private Scourge() { - super("Scourge", "SCG", "mage.sets.scourge", ExpansionSet.buildDate(2003, 5, 17), SetType.EXPANSION); + super("Scourge", "SCG", ExpansionSet.buildDate(2003, 5, 17), SetType.EXPANSION); this.blockName = "Onslaught"; this.parentSet = Onslaught.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java index db71a77129..157d56b39c 100644 --- a/Mage.Sets/src/mage/sets/SeventhEdition.java +++ b/Mage.Sets/src/mage/sets/SeventhEdition.java @@ -27,15 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +45,7 @@ public class SeventhEdition extends ExpansionSet { } private SeventhEdition() { - super("Seventh Edition", "7ED", "mage.sets.seventhedition", ExpansionSet.buildDate(2001, 3, 11), SetType.CORE); + super("Seventh Edition", "7ED", ExpansionSet.buildDate(2001, 3, 11), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/Shadowmoor.java b/Mage.Sets/src/mage/sets/Shadowmoor.java index af12876e18..fa5fd0a024 100644 --- a/Mage.Sets/src/mage/sets/Shadowmoor.java +++ b/Mage.Sets/src/mage/sets/Shadowmoor.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Shadowmoor extends ExpansionSet { } private Shadowmoor() { - super("Shadowmoor", "SHM", "mage.sets.shadowmoor", ExpansionSet.buildDate(2008, 4, 2), SetType.EXPANSION); + super("Shadowmoor", "SHM", ExpansionSet.buildDate(2008, 4, 2), SetType.EXPANSION); this.blockName = "Shadowmoor"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java b/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java index abee1d117c..dfdd6d227a 100644 --- a/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java +++ b/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java @@ -55,7 +55,7 @@ public class ShadowsOverInnistrad extends ExpansionSet { protected final EnumMap> savedDoubleFacedCards; private ShadowsOverInnistrad() { - super("Shadows over Innistrad", "SOI", "mage.sets.shadowsoverinnistrad", ExpansionSet.buildDate(2016, 4, 8), SetType.EXPANSION); + super("Shadows over Innistrad", "SOI", ExpansionSet.buildDate(2016, 4, 8), SetType.EXPANSION); this.blockName = "Shadows over Innistrad"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/ShardsOfAlara.java b/Mage.Sets/src/mage/sets/ShardsOfAlara.java index 99965e545b..06f025ef79 100644 --- a/Mage.Sets/src/mage/sets/ShardsOfAlara.java +++ b/Mage.Sets/src/mage/sets/ShardsOfAlara.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class ShardsOfAlara extends ExpansionSet { } private ShardsOfAlara() { - super("Shards of Alara", "ALA", "mage.sets.shardsofalara", ExpansionSet.buildDate(2008, 8, 27), SetType.EXPANSION); + super("Shards of Alara", "ALA", ExpansionSet.buildDate(2008, 8, 27), SetType.EXPANSION); this.blockName = "Shards of Alara"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/SorinVsTibalt.java b/Mage.Sets/src/mage/sets/SorinVsTibalt.java index cead21335f..968fcd1e18 100644 --- a/Mage.Sets/src/mage/sets/SorinVsTibalt.java +++ b/Mage.Sets/src/mage/sets/SorinVsTibalt.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class SorinVsTibalt extends ExpansionSet { } private SorinVsTibalt() { - super("Duel Decks: Sorin vs. Tibalt", "DDK", "mage.sets.sorinvstibalt", ExpansionSet.buildDate(2013, 3, 15), SetType.SUPPLEMENTAL); + super("Duel Decks: Sorin vs. Tibalt", "DDK", ExpansionSet.buildDate(2013, 3, 15), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Absorb Vis", 31, Rarity.COMMON, mage.cards.a.AbsorbVis.class)); diff --git a/Mage.Sets/src/mage/sets/SpeedVsCunning.java b/Mage.Sets/src/mage/sets/SpeedVsCunning.java index b8eb0867d6..c858d3daf4 100644 --- a/Mage.Sets/src/mage/sets/SpeedVsCunning.java +++ b/Mage.Sets/src/mage/sets/SpeedVsCunning.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class SpeedVsCunning extends ExpansionSet { } private SpeedVsCunning() { - super("Duel Decks: Speed vs. Cunning", "DDN", "mage.sets.speedvscunning", ExpansionSet.buildDate(2014, 9, 5), SetType.SUPPLEMENTAL); + super("Duel Decks: Speed vs. Cunning", "DDN", ExpansionSet.buildDate(2014, 9, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Act of Treason", 26, Rarity.COMMON, mage.cards.a.ActOfTreason.class)); diff --git a/Mage.Sets/src/mage/sets/StarWars.java b/Mage.Sets/src/mage/sets/StarWars.java index d2d7bad70c..4e02a45288 100644 --- a/Mage.Sets/src/mage/sets/StarWars.java +++ b/Mage.Sets/src/mage/sets/StarWars.java @@ -27,7 +27,6 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.FrameStyle; @@ -47,7 +46,7 @@ public class StarWars extends ExpansionSet { } private StarWars() { - super("Star Wars", "SWS", "mage.sets.starwars", ExpansionSet.buildDate(2015, 12, 25), SetType.CUSTOM_SET); + super("Star Wars", "SWS", ExpansionSet.buildDate(2015, 12, 25), SetType.CUSTOM_SET); this.blockName = "Star Wars"; this.hasBoosters = true; this.hasBasicLands = true; diff --git a/Mage.Sets/src/mage/sets/Starter1999.java b/Mage.Sets/src/mage/sets/Starter1999.java index b8da07d664..c1bcf1a98d 100644 --- a/Mage.Sets/src/mage/sets/Starter1999.java +++ b/Mage.Sets/src/mage/sets/Starter1999.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class Starter1999 extends ExpansionSet { } private Starter1999() { - super("Starter 1999", "S99", "mage.sets.starter1999", ExpansionSet.buildDate(1999, 7, 1), SetType.SUPPLEMENTAL); + super("Starter 1999", "S99", ExpansionSet.buildDate(1999, 7, 1), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; this.hasBasicLands = true; this.hasBoosters = true; diff --git a/Mage.Sets/src/mage/sets/Starter2000.java b/Mage.Sets/src/mage/sets/Starter2000.java index d94f6ef385..b1d56c9eb4 100644 --- a/Mage.Sets/src/mage/sets/Starter2000.java +++ b/Mage.Sets/src/mage/sets/Starter2000.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -55,7 +51,7 @@ public class Starter2000 extends ExpansionSet { } private Starter2000() { - super("Starter 2000", "S00", "mage.sets.starter2000", ExpansionSet.buildDate(2000, 7, 1), SetType.SUPPLEMENTAL); + super("Starter 2000", "S00", ExpansionSet.buildDate(2000, 7, 1), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; this.hasBasicLands = true; this.hasBoosters = false; diff --git a/Mage.Sets/src/mage/sets/Stronghold.java b/Mage.Sets/src/mage/sets/Stronghold.java index 9dfb81ebd1..366d17bb71 100644 --- a/Mage.Sets/src/mage/sets/Stronghold.java +++ b/Mage.Sets/src/mage/sets/Stronghold.java @@ -44,7 +44,7 @@ public class Stronghold extends ExpansionSet { } private Stronghold() { - super("Stronghold", "STH", "mage.sets.stronghold", ExpansionSet.buildDate(1998, 3, 2), SetType.EXPANSION); + super("Stronghold", "STH", ExpansionSet.buildDate(1998, 3, 2), SetType.EXPANSION); this.blockName = "Tempest"; this.parentSet = Tempest.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/SuperSeries.java b/Mage.Sets/src/mage/sets/SuperSeries.java index 222da87de0..30f5f5170d 100644 --- a/Mage.Sets/src/mage/sets/SuperSeries.java +++ b/Mage.Sets/src/mage/sets/SuperSeries.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class SuperSeries extends ExpansionSet { } private SuperSeries() { - super("Super Series", "SUS", "mage.sets.superseries", ExpansionSet.buildDate(1996, 1, 1), SetType.PROMOTIONAL); + super("Super Series", "SUS", ExpansionSet.buildDate(1996, 1, 1), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("City of Brass", 6, Rarity.SPECIAL, mage.cards.c.CityOfBrass.class)); cards.add(new SetCardInfo("Crusade", 4, Rarity.SPECIAL, mage.cards.c.Crusade.class)); diff --git a/Mage.Sets/src/mage/sets/Tempest.java b/Mage.Sets/src/mage/sets/Tempest.java index 0be6696537..793161f752 100644 --- a/Mage.Sets/src/mage/sets/Tempest.java +++ b/Mage.Sets/src/mage/sets/Tempest.java @@ -14,7 +14,7 @@ public class Tempest extends ExpansionSet { } private Tempest() { - super("Tempest", "TMP", "mage.sets.tempest", ExpansionSet.buildDate(1997, 10, 1), SetType.EXPANSION); + super("Tempest", "TMP", ExpansionSet.buildDate(1997, 10, 1), SetType.EXPANSION); this.blockName = "Tempest"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/TempestRemastered.java b/Mage.Sets/src/mage/sets/TempestRemastered.java index 358e22d822..7cd0a90216 100644 --- a/Mage.Sets/src/mage/sets/TempestRemastered.java +++ b/Mage.Sets/src/mage/sets/TempestRemastered.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class TempestRemastered extends ExpansionSet { } private TempestRemastered() { - super("Tempest Remastered", "TPR", "mage.sets.tempestremastered", ExpansionSet.buildDate(2015, 5, 6), SetType.MAGIC_ONLINE); + super("Tempest Remastered", "TPR", ExpansionSet.buildDate(2015, 5, 6), SetType.MAGIC_ONLINE); this.hasBasicLands = true; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/TenthEdition.java b/Mage.Sets/src/mage/sets/TenthEdition.java index 3192b7e59d..357aaab709 100644 --- a/Mage.Sets/src/mage/sets/TenthEdition.java +++ b/Mage.Sets/src/mage/sets/TenthEdition.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class TenthEdition extends ExpansionSet { } private TenthEdition() { - super("Tenth Edition", "10E", "mage.sets.tenthedition", ExpansionSet.buildDate(2007, 6, 14), SetType.CORE); + super("Tenth Edition", "10E", ExpansionSet.buildDate(2007, 6, 14), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; diff --git a/Mage.Sets/src/mage/sets/TheDark.java b/Mage.Sets/src/mage/sets/TheDark.java index 1e266f1a33..4679cb5028 100644 --- a/Mage.Sets/src/mage/sets/TheDark.java +++ b/Mage.Sets/src/mage/sets/TheDark.java @@ -27,12 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +44,7 @@ public class TheDark extends ExpansionSet { } private TheDark() { - super("The Dark", "DRK", "mage.sets.thedark", ExpansionSet.buildDate(1994, 7, 1), SetType.EXPANSION); + super("The Dark", "DRK", ExpansionSet.buildDate(1994, 7, 1), SetType.EXPANSION); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/Theros.java b/Mage.Sets/src/mage/sets/Theros.java index c191267e7a..21f6097e9b 100644 --- a/Mage.Sets/src/mage/sets/Theros.java +++ b/Mage.Sets/src/mage/sets/Theros.java @@ -27,14 +27,10 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -49,7 +45,7 @@ public class Theros extends ExpansionSet { } private Theros() { - super("Theros", "THS", "mage.sets.theros", ExpansionSet.buildDate(2013, 9, 27), SetType.EXPANSION); + super("Theros", "THS", ExpansionSet.buildDate(2013, 9, 27), SetType.EXPANSION); this.blockName = "Theros"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java index 789f587a88..206faf76ce 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/TimeSpiral.java @@ -1,6 +1,5 @@ package mage.sets; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.Card; import mage.cards.ExpansionSet; @@ -8,9 +7,7 @@ import mage.cards.repository.CardCriteria; import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; public class TimeSpiral extends ExpansionSet { @@ -21,7 +18,7 @@ public class TimeSpiral extends ExpansionSet { } private TimeSpiral() { - super("Time Spiral", "TSP", "mage.sets.timespiral", ExpansionSet.buildDate(2006, 9, 9), SetType.EXPANSION); + super("Time Spiral", "TSP", ExpansionSet.buildDate(2006, 9, 9), SetType.EXPANSION); this.blockName = "Time Spiral"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java index 927a985095..ebdc36c44b 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java +++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet { } private TimeSpiralTimeshifted() { - super("Time Spiral \"Timeshifted\"", "TSB", "mage.sets.timeshifted", ExpansionSet.buildDate(2006, 9, 9), SetType.EXPANSION); + super("Time Spiral \"Timeshifted\"", "TSB", ExpansionSet.buildDate(2006, 9, 9), SetType.EXPANSION); this.blockName = "Time Spiral"; this.parentSet = TimeSpiral.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Torment.java b/Mage.Sets/src/mage/sets/Torment.java index e85258937e..bb21ca0ce6 100644 --- a/Mage.Sets/src/mage/sets/Torment.java +++ b/Mage.Sets/src/mage/sets/Torment.java @@ -44,7 +44,7 @@ public class Torment extends ExpansionSet { } private Torment() { - super("Torment", "TOR", "mage.sets.torment", ExpansionSet.buildDate(2002, 1, 26), SetType.EXPANSION); + super("Torment", "TOR", ExpansionSet.buildDate(2002, 1, 26), SetType.EXPANSION); this.blockName = "Odyssey"; this.parentSet = Odyssey.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UginsFate.java b/Mage.Sets/src/mage/sets/UginsFate.java index 319c67c16a..51a4ba5354 100644 --- a/Mage.Sets/src/mage/sets/UginsFate.java +++ b/Mage.Sets/src/mage/sets/UginsFate.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class UginsFate extends ExpansionSet { } private UginsFate() { - super("Ugin's Fate", "UGIN", "mage.sets.uginsfate", ExpansionSet.buildDate(2015, 1, 16), SetType.PROMOTIONAL); + super("Ugin's Fate", "UGIN", ExpansionSet.buildDate(2015, 1, 16), SetType.PROMOTIONAL); this.hasBoosters = false; cards.add(new SetCardInfo("Ainok Tracker", 96, Rarity.COMMON, mage.cards.a.AinokTracker.class)); cards.add(new SetCardInfo("Altar of the Brood", 216, Rarity.RARE, mage.cards.a.AltarOfTheBrood.class)); diff --git a/Mage.Sets/src/mage/sets/Unglued.java b/Mage.Sets/src/mage/sets/Unglued.java index 0fc3291da2..5ed2a561ec 100644 --- a/Mage.Sets/src/mage/sets/Unglued.java +++ b/Mage.Sets/src/mage/sets/Unglued.java @@ -3,10 +3,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; import mage.cards.FrameStyle; @@ -22,7 +19,7 @@ public class Unglued extends ExpansionSet { } private Unglued() { - super("Unglued", "UGL", "mage.sets.unglued", ExpansionSet.buildDate(1998, 8, 11), SetType.JOKESET); + super("Unglued", "UGL", ExpansionSet.buildDate(1998, 8, 11), SetType.JOKESET); cards.add(new SetCardInfo("Forest", 88, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(FrameStyle.UGL_FULL_ART_BASIC, false))); cards.add(new SetCardInfo("Island", 85, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(FrameStyle.UGL_FULL_ART_BASIC, false))); cards.add(new SetCardInfo("Mountain", 87, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(FrameStyle.UGL_FULL_ART_BASIC, false))); diff --git a/Mage.Sets/src/mage/sets/Unhinged.java b/Mage.Sets/src/mage/sets/Unhinged.java index e20b84573d..feee56a700 100644 --- a/Mage.Sets/src/mage/sets/Unhinged.java +++ b/Mage.Sets/src/mage/sets/Unhinged.java @@ -3,10 +3,7 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; import mage.cards.FrameStyle; @@ -22,7 +19,7 @@ public class Unhinged extends ExpansionSet { } private Unhinged() { - super("Unhinged", "UNH", "mage.sets.unhinged", ExpansionSet.buildDate(2004, 11, 20), SetType.JOKESET); + super("Unhinged", "UNH", ExpansionSet.buildDate(2004, 11, 20), SetType.JOKESET); cards.add(new SetCardInfo("Forest", 140, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false))); cards.add(new SetCardInfo("Island", 137, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false))); cards.add(new SetCardInfo("Mountain", 139, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false))); diff --git a/Mage.Sets/src/mage/sets/UnlimitedEdition.java b/Mage.Sets/src/mage/sets/UnlimitedEdition.java index f006d6f367..fc05dfdde9 100644 --- a/Mage.Sets/src/mage/sets/UnlimitedEdition.java +++ b/Mage.Sets/src/mage/sets/UnlimitedEdition.java @@ -1,14 +1,9 @@ package mage.sets; -import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -23,7 +18,7 @@ public class UnlimitedEdition extends ExpansionSet { } private UnlimitedEdition() { - super("Unlimited Edition", "2ED", "mage.sets.unlimitededition", ExpansionSet.buildDate(1993, 11, 1), SetType.CORE); + super("Unlimited Edition", "2ED", ExpansionSet.buildDate(1993, 11, 1), SetType.CORE); this.hasBoosters = true; this.numBoosterLands = 0; this.numBoosterCommon = 11; diff --git a/Mage.Sets/src/mage/sets/UrzasDestiny.java b/Mage.Sets/src/mage/sets/UrzasDestiny.java index 2c66b6077c..1dabc48458 100644 --- a/Mage.Sets/src/mage/sets/UrzasDestiny.java +++ b/Mage.Sets/src/mage/sets/UrzasDestiny.java @@ -44,7 +44,7 @@ public class UrzasDestiny extends ExpansionSet { } private UrzasDestiny() { - super("Urza's Destiny", "UDS", "mage.sets.urzasdestiny", ExpansionSet.buildDate(1999, 6, 7), SetType.EXPANSION); + super("Urza's Destiny", "UDS", ExpansionSet.buildDate(1999, 6, 7), SetType.EXPANSION); this.blockName = "Urza"; this.parentSet = UrzasSaga.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UrzasLegacy.java b/Mage.Sets/src/mage/sets/UrzasLegacy.java index 96de90c48a..a381931309 100644 --- a/Mage.Sets/src/mage/sets/UrzasLegacy.java +++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java @@ -44,7 +44,7 @@ public class UrzasLegacy extends ExpansionSet { } private UrzasLegacy() { - super("Urza's Legacy", "ULG", "mage.sets.urzaslegacy", ExpansionSet.buildDate(1999, 3, 6), SetType.EXPANSION); + super("Urza's Legacy", "ULG", ExpansionSet.buildDate(1999, 3, 6), SetType.EXPANSION); this.blockName = "Urza"; this.parentSet = UrzasSaga.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/UrzasSaga.java b/Mage.Sets/src/mage/sets/UrzasSaga.java index 80c3ea9f7a..af1b7d6428 100644 --- a/Mage.Sets/src/mage/sets/UrzasSaga.java +++ b/Mage.Sets/src/mage/sets/UrzasSaga.java @@ -45,7 +45,7 @@ public class UrzasSaga extends ExpansionSet { } private UrzasSaga() { - super("Urza's Saga", "USG", "mage.sets.urzassaga", ExpansionSet.buildDate(1998, 10, 12), SetType.EXPANSION); + super("Urza's Saga", "USG", ExpansionSet.buildDate(1998, 10, 12), SetType.EXPANSION); this.blockName = "Urza"; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/VenserVsKoth.java b/Mage.Sets/src/mage/sets/VenserVsKoth.java index 5e7d53680c..3c86e8e3d9 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/VenserVsKoth.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class VenserVsKoth extends ExpansionSet { } private VenserVsKoth() { - super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", ExpansionSet.buildDate(2012, 3, 30), SetType.SUPPLEMENTAL); + super("Duel Decks: Venser vs. Koth", "DDI", ExpansionSet.buildDate(2012, 3, 30), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Aether Membrane", 48, Rarity.UNCOMMON, mage.cards.a.AetherMembrane.class)); diff --git a/Mage.Sets/src/mage/sets/VintageMasters.java b/Mage.Sets/src/mage/sets/VintageMasters.java index e04ab6d429..18a4ab3fc0 100644 --- a/Mage.Sets/src/mage/sets/VintageMasters.java +++ b/Mage.Sets/src/mage/sets/VintageMasters.java @@ -28,7 +28,6 @@ package mage.sets; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -50,7 +49,7 @@ public class VintageMasters extends ExpansionSet { } private VintageMasters() { - super("Vintage Masters", "VMA", "mage.sets.vintagemasters", ExpansionSet.buildDate(2014, 6, 16), SetType.MAGIC_ONLINE); + super("Vintage Masters", "VMA", ExpansionSet.buildDate(2014, 6, 16), SetType.MAGIC_ONLINE); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterSpecial = 1; diff --git a/Mage.Sets/src/mage/sets/Visions.java b/Mage.Sets/src/mage/sets/Visions.java index 95a144ff6b..749024e0fc 100644 --- a/Mage.Sets/src/mage/sets/Visions.java +++ b/Mage.Sets/src/mage/sets/Visions.java @@ -44,7 +44,7 @@ public class Visions extends ExpansionSet { } private Visions() { - super("Visions", "VIS", "mage.sets.visions", ExpansionSet.buildDate(1997, 1, 11), SetType.EXPANSION); + super("Visions", "VIS", ExpansionSet.buildDate(1997, 1, 11), SetType.EXPANSION); this.blockName = "Mirage"; this.parentSet = Mirage.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/WPNGateway.java b/Mage.Sets/src/mage/sets/WPNGateway.java index 5eec5005e9..1784e706c9 100644 --- a/Mage.Sets/src/mage/sets/WPNGateway.java +++ b/Mage.Sets/src/mage/sets/WPNGateway.java @@ -5,11 +5,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -24,7 +22,7 @@ public class WPNGateway extends ExpansionSet { } private WPNGateway() { - super("WPN Gateway", "GRC", "mage.sets.wpngateway", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("WPN Gateway", "GRC", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Auramancer", 77, Rarity.SPECIAL, mage.cards.a.Auramancer.class)); diff --git a/Mage.Sets/src/mage/sets/Weatherlight.java b/Mage.Sets/src/mage/sets/Weatherlight.java index 9a288f1067..fe13584ad5 100644 --- a/Mage.Sets/src/mage/sets/Weatherlight.java +++ b/Mage.Sets/src/mage/sets/Weatherlight.java @@ -31,9 +31,7 @@ package mage.sets; import mage.constants.SetType; import mage.cards.ExpansionSet; -import java.util.GregorianCalendar; import mage.constants.Rarity; -import java.util.List; /** * @@ -48,7 +46,7 @@ public class Weatherlight extends ExpansionSet { } private Weatherlight() { - super("Weatherlight", "WTH", "mage.sets.weatherlight", ExpansionSet.buildDate(1997, 5, 31), SetType.EXPANSION); + super("Weatherlight", "WTH", ExpansionSet.buildDate(1997, 5, 31), SetType.EXPANSION); this.blockName = "Mirage"; this.parentSet = Mirage.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java index ac79e8f52c..45483e39c5 100644 --- a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java +++ b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class WelcomeDeck2016 extends ExpansionSet { } private WelcomeDeck2016() { - super("Welcome Deck 2016", "W16", "mage.sets.welcomedeck2016", ExpansionSet.buildDate(2016, 3, 8), SetType.SUPPLEMENTAL_STANDARD_LEGAL); + super("Welcome Deck 2016", "W16", ExpansionSet.buildDate(2016, 3, 8), SetType.SUPPLEMENTAL_STANDARD_LEGAL); this.hasBasicLands = false; this.hasBoosters = false; cards.add(new SetCardInfo("Aegis Angel", 1, Rarity.RARE, mage.cards.a.AegisAngel.class)); diff --git a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java index eaa7306d9b..948030fc29 100644 --- a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java +++ b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; /** * @@ -47,7 +45,7 @@ public class WorldMagicCupQualifier extends ExpansionSet { } private WorldMagicCupQualifier() { - super("World Magic Cup Qualifier", "WMCQ", "mage.sets.worldmagiccupqualifier", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("World Magic Cup Qualifier", "WMCQ", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Abrupt Decay", 6, Rarity.RARE, mage.cards.a.AbruptDecay.class)); diff --git a/Mage.Sets/src/mage/sets/Worldwake.java b/Mage.Sets/src/mage/sets/Worldwake.java index 7dad44c27f..498ecc6eda 100644 --- a/Mage.Sets/src/mage/sets/Worldwake.java +++ b/Mage.Sets/src/mage/sets/Worldwake.java @@ -44,7 +44,7 @@ public class Worldwake extends ExpansionSet { } private Worldwake() { - super("Worldwake", "WWK", "mage.sets.worldwake", ExpansionSet.buildDate(2010, 1, 30), SetType.EXPANSION); + super("Worldwake", "WWK", ExpansionSet.buildDate(2010, 1, 30), SetType.EXPANSION); this.blockName = "Zendikar"; this.parentSet = Zendikar.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/Zendikar.java b/Mage.Sets/src/mage/sets/Zendikar.java index afcd17e1a4..3ced2a5111 100644 --- a/Mage.Sets/src/mage/sets/Zendikar.java +++ b/Mage.Sets/src/mage/sets/Zendikar.java @@ -28,11 +28,9 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; import mage.ObjectColor; import mage.cards.CardGraphicInfo; import mage.cards.FrameStyle; @@ -50,7 +48,7 @@ public class Zendikar extends ExpansionSet { } private Zendikar() { - super("Zendikar", "ZEN", "mage.sets.zendikar", ExpansionSet.buildDate(2009, 8, 26), SetType.EXPANSION); + super("Zendikar", "ZEN", ExpansionSet.buildDate(2009, 8, 26), SetType.EXPANSION); this.blockName = "Zendikar"; this.hasBoosters = true; this.numBoosterLands = 1; diff --git a/Mage.Sets/src/mage/sets/ZendikarExpeditions.java b/Mage.Sets/src/mage/sets/ZendikarExpeditions.java index e2fe2c056e..07ec5698ab 100644 --- a/Mage.Sets/src/mage/sets/ZendikarExpeditions.java +++ b/Mage.Sets/src/mage/sets/ZendikarExpeditions.java @@ -27,11 +27,9 @@ */ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; /** * @@ -46,7 +44,7 @@ public class ZendikarExpeditions extends ExpansionSet { } private ZendikarExpeditions() { - super("Zendikar Expeditions", "EXP", "mage.sets.zendikarexpeditions", ExpansionSet.buildDate(2015, 10, 2), SetType.PROMOTIONAL); + super("Zendikar Expeditions", "EXP", ExpansionSet.buildDate(2015, 10, 2), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; cards.add(new SetCardInfo("Ancient Tomb", 36, Rarity.MYTHIC, mage.cards.a.AncientTomb.class)); diff --git a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java b/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java index e70bac3db8..25c39c545a 100644 --- a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java +++ b/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java @@ -28,14 +28,10 @@ package mage.sets; -import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -50,7 +46,7 @@ public class ZendikarVsEldrazi extends ExpansionSet { } private ZendikarVsEldrazi() { - super("Duel Decks: Zendikar vs. Eldrazi", "DDP", "mage.sets.zendikarvseldrazi", ExpansionSet.buildDate(2015, 8, 28), SetType.SUPPLEMENTAL); + super("Duel Decks: Zendikar vs. Eldrazi", "DDP", ExpansionSet.buildDate(2015, 8, 28), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; cards.add(new SetCardInfo("Affa Guard Hound", 2, Rarity.UNCOMMON, mage.cards.a.AffaGuardHound.class)); diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index c2e84a1b81..4ea414f18b 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -127,17 +127,15 @@ public abstract class ExpansionSet implements Serializable { protected int numBoosterDoubleFaced; // -1 = include normally 0 = exclude 1-n = include explicit protected int ratioBoosterMythic; - protected String packageName; - protected int maxCardNumberInBooster; // used to ommit cards with collector numbers beyond the regular cards in a set for boosters + protected int maxCardNumberInBooster; // used to omit cards with collector numbers beyond the regular cards in a set for boosters protected final EnumMap> savedCards; - public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) { + public ExpansionSet(String name, String code, Date releaseDate, SetType setType) { this.name = name; this.code = code; this.releaseDate = releaseDate; this.setType = setType; - this.packageName = packageName; this.maxCardNumberInBooster = Integer.MAX_VALUE; savedCards = new EnumMap<>(Rarity.class); } @@ -162,10 +160,6 @@ public abstract class ExpansionSet implements Serializable { return setType; } - public String getPackageName() { - return packageName; - } - public String getBlockName() { return blockName; } diff --git a/Mage/src/main/java/mage/cards/repository/CardScanner.java b/Mage/src/main/java/mage/cards/repository/CardScanner.java index fe8930566a..f70bc4ef31 100644 --- a/Mage/src/main/java/mage/cards/repository/CardScanner.java +++ b/Mage/src/main/java/mage/cards/repository/CardScanner.java @@ -29,12 +29,9 @@ package mage.cards.repository; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import mage.cards.*; -import mage.util.ClassScanner; import org.apache.log4j.Logger; /** @@ -54,13 +51,8 @@ public class CardScanner { scanned = true; List cardsToAdd = new ArrayList<>(); - Map> packageMap = new HashMap<>(); for (ExpansionSet set : Sets.getInstance().values()) { - ClassLoader cl = set.getClass().getClassLoader(); - if(!packageMap.containsKey(cl)) packageMap.put(cl, new ArrayList()); - List packages = packageMap.get(cl); - packages.add(set.getPackageName()); ExpansionRepository.instance.add(new ExpansionInfo(set)); } ExpansionRepository.instance.setContentVersion(ExpansionRepository.instance.getContentVersionConstant());