diff --git a/Mage.Sets/src/mage/sets/AetherRevolt.java b/Mage.Sets/src/mage/sets/AetherRevolt.java index 6907a28cd60..f3bf57958c0 100644 --- a/Mage.Sets/src/mage/sets/AetherRevolt.java +++ b/Mage.Sets/src/mage/sets/AetherRevolt.java @@ -35,7 +35,6 @@ import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.constants.SetType; -import mage.constants.Rarity; /** * @@ -52,7 +51,7 @@ public class AetherRevolt extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private AetherRevolt() { - super("Aether Revolt", "AER", "mage.sets.aetherrevolt", new GregorianCalendar(2017, 1, 20).getTime(), SetType.EXPANSION); + super("Aether Revolt", "AER", "mage.sets.aetherrevolt", 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 bf4809c244c..c8e1f9e6007 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java @@ -49,7 +49,7 @@ public class AjaniVsNicolBolas extends ExpansionSet { } private AjaniVsNicolBolas() { - super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", new GregorianCalendar(2011, 9, 2).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", 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 4ce9b174786..259787a7083 100644 --- a/Mage.Sets/src/mage/sets/AlaraReborn.java +++ b/Mage.Sets/src/mage/sets/AlaraReborn.java @@ -45,7 +45,7 @@ public class AlaraReborn extends ExpansionSet { } private AlaraReborn() { - super("Alara Reborn", "ARB", "mage.sets.alarareborn", new GregorianCalendar(2009, 3, 25).getTime(), SetType.EXPANSION); + super("Alara Reborn", "ARB", "mage.sets.alarareborn", 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 cc9a3ecb4fb..438f338c2d1 100644 --- a/Mage.Sets/src/mage/sets/Alliances.java +++ b/Mage.Sets/src/mage/sets/Alliances.java @@ -18,7 +18,7 @@ public class Alliances extends ExpansionSet { } private Alliances() { - super("Alliances", "ALL", "mage.sets.alliances", new GregorianCalendar(1996, 6, 10).getTime(), SetType.EXPANSION); + super("Alliances", "ALL", "mage.sets.alliances", 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 10428b067dd..ddca6fc0aaf 100644 --- a/Mage.Sets/src/mage/sets/Amonkhet.java +++ b/Mage.Sets/src/mage/sets/Amonkhet.java @@ -46,7 +46,7 @@ public class Amonkhet extends ExpansionSet { } private Amonkhet() { - super("Amonkhet", "AKH", "mage.sets.amonkhet", new GregorianCalendar(2017, 4, 28).getTime(), SetType.EXPANSION); + super("Amonkhet", "AKH", "mage.sets.amonkhet", 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 2b8ac0d9fcf..3473997882d 100644 --- a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java @@ -27,20 +27,17 @@ */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class AnthologyDivineVsDemonic extends ExpansionSet { + private static final AnthologyDivineVsDemonic fINSTANCE = new AnthologyDivineVsDemonic(); public static AnthologyDivineVsDemonic getInstance() { @@ -48,7 +45,7 @@ public class AnthologyDivineVsDemonic extends ExpansionSet { } private AnthologyDivineVsDemonic() { - super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", "mage.sets.anthologydivinevsdemonic", new GregorianCalendar(2014, 12, 5).getTime(), + super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", "mage.sets.anthologydivinevsdemonic", 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 6b59651062e..3770362cecf 100644 --- a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java @@ -27,20 +27,17 @@ */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class AnthologyElvesVsGoblins extends ExpansionSet { + private static final AnthologyElvesVsGoblins fINSTANCE = new AnthologyElvesVsGoblins(); public static AnthologyElvesVsGoblins getInstance() { @@ -48,7 +45,7 @@ public class AnthologyElvesVsGoblins extends ExpansionSet { } private AnthologyElvesVsGoblins() { - super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", "mage.sets.anthologyelvesvsgoblins", new GregorianCalendar(2014, 12, 5).getTime(), + super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", "mage.sets.anthologyelvesvsgoblins", 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 014a80dab45..da8a8044b39 100644 --- a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java @@ -27,20 +27,17 @@ */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class AnthologyGarrukVsLiliana extends ExpansionSet { + private static final AnthologyGarrukVsLiliana fINSTANCE = new AnthologyGarrukVsLiliana(); public static AnthologyGarrukVsLiliana getInstance() { @@ -48,7 +45,7 @@ public class AnthologyGarrukVsLiliana extends ExpansionSet { } private AnthologyGarrukVsLiliana() { - super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", "mage.sets.anthologygarrukvsliliana", new GregorianCalendar(2014, 12, 5).getTime(), + super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", "mage.sets.anthologygarrukvsliliana", 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 142eef89ffc..95f9e67d1ac 100644 --- a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java @@ -27,20 +27,17 @@ */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class AnthologyJaceVsChandra extends ExpansionSet { + private static final AnthologyJaceVsChandra fINSTANCE = new AnthologyJaceVsChandra(); public static AnthologyJaceVsChandra getInstance() { @@ -48,7 +45,7 @@ public class AnthologyJaceVsChandra extends ExpansionSet { } private AnthologyJaceVsChandra() { - super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", "mage.sets.anthologyjacevschandra", new GregorianCalendar(2014, 12, 5).getTime(), + super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", "mage.sets.anthologyjacevschandra", 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 b0c3dbebf52..72742856ba0 100644 --- a/Mage.Sets/src/mage/sets/Antiquities.java +++ b/Mage.Sets/src/mage/sets/Antiquities.java @@ -50,7 +50,7 @@ public class Antiquities extends ExpansionSet { } private Antiquities() { - super("Antiquities", "ATQ", "mage.sets.antiquities", new GregorianCalendar(1994, 2, 1).getTime(), SetType.EXPANSION); + super("Antiquities", "ATQ", "mage.sets.antiquities", 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 17383d68040..ff3953f0626 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -15,7 +15,7 @@ public class Apocalypse extends ExpansionSet { } private Apocalypse() { - super("Apocalypse", "APC", "mage.sets.apocalypse", new GregorianCalendar(2001, 5, 1).getTime(), SetType.EXPANSION); + super("Apocalypse", "APC", "mage.sets.apocalypse", 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 774ea7e507d..f1438efdbd1 100644 --- a/Mage.Sets/src/mage/sets/ArabianNights.java +++ b/Mage.Sets/src/mage/sets/ArabianNights.java @@ -50,7 +50,7 @@ public class ArabianNights extends ExpansionSet { } private ArabianNights() { - super("Arabian Nights", "ARN", "mage.sets.arabiannights", new GregorianCalendar(1993, 11, 1).getTime(), SetType.EXPANSION); + super("Arabian Nights", "ARN", "mage.sets.arabiannights", 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 0a49c4faa07..70873c4aeb6 100644 --- a/Mage.Sets/src/mage/sets/Archenemy.java +++ b/Mage.Sets/src/mage/sets/Archenemy.java @@ -50,7 +50,7 @@ public class Archenemy extends ExpansionSet { } private Archenemy() { - super("Archenemy", "ARC", "mage.sets.archenemy", new GregorianCalendar(2010, 6, 18).getTime(), SetType.SUPPLEMENTAL); + super("Archenemy", "ARC", "mage.sets.archenemy", 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 d64500df296..fc87d3f614a 100644 --- a/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java +++ b/Mage.Sets/src/mage/sets/ArchenemyNicolBolas.java @@ -47,7 +47,7 @@ public class ArchenemyNicolBolas extends ExpansionSet { } private ArchenemyNicolBolas() { - super("Archenemy: Nicol Bolas", "ANB", "mage.sets.archenemynicolbolas", new GregorianCalendar(2017, 6, 16).getTime(), SetType.SUPPLEMENTAL); + super("Archenemy: Nicol Bolas", "ANB", "mage.sets.archenemynicolbolas", 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 810f3e953fe..58a04707625 100644 --- a/Mage.Sets/src/mage/sets/ArenaLeague.java +++ b/Mage.Sets/src/mage/sets/ArenaLeague.java @@ -50,7 +50,7 @@ public class ArenaLeague extends ExpansionSet { } private ArenaLeague() { - super("Arena League", "ARENA", "mage.sets.arenaleague", new GregorianCalendar(1996, 7, 4).getTime(), SetType.PROMOTIONAL); + super("Arena League", "ARENA", "mage.sets.arenaleague", 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 d4486c33d6c..4673b100a4a 100644 --- a/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java +++ b/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java @@ -50,7 +50,7 @@ public class AsiaPacificLandProgram extends ExpansionSet { } private AsiaPacificLandProgram() { - super("Asia Pacific Land Program", "APAC", "mage.sets.asiapacificlandprogram", new GregorianCalendar(1997, 10, 13).getTime(), SetType.PROMOTIONAL); + super("Asia Pacific Land Program", "APAC", "mage.sets.asiapacificlandprogram", 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 88981fe7d33..482f2560aad 100644 --- a/Mage.Sets/src/mage/sets/AvacynRestored.java +++ b/Mage.Sets/src/mage/sets/AvacynRestored.java @@ -49,7 +49,7 @@ public class AvacynRestored extends ExpansionSet { } private AvacynRestored() { - super("Avacyn Restored", "AVR", "mage.sets.avacynrestored", new GregorianCalendar(2012, 4, 4).getTime(), SetType.EXPANSION); + super("Avacyn Restored", "AVR", "mage.sets.avacynrestored", 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 0c862a51fc6..a973e5cc773 100644 --- a/Mage.Sets/src/mage/sets/BattleForZendikar.java +++ b/Mage.Sets/src/mage/sets/BattleForZendikar.java @@ -55,7 +55,7 @@ public class BattleForZendikar extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private BattleForZendikar() { - super("Battle for Zendikar", "BFZ", "mage.sets.battleforzendikar", new GregorianCalendar(2015, 10, 2).getTime(), SetType.EXPANSION); + super("Battle for Zendikar", "BFZ", "mage.sets.battleforzendikar", 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 242dc914119..90e10630a7f 100644 --- a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java @@ -46,7 +46,7 @@ public class BetrayersOfKamigawa extends ExpansionSet { } private BetrayersOfKamigawa() { - super("Betrayers of Kamigawa", "BOK", "mage.sets.betrayersofkamigawa", new GregorianCalendar(2005, 1, 4).getTime(), SetType.EXPANSION); + super("Betrayers of Kamigawa", "BOK", "mage.sets.betrayersofkamigawa", 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 3c6d9984ddf..e8c40dd412d 100644 --- a/Mage.Sets/src/mage/sets/BlessedVsCursed.java +++ b/Mage.Sets/src/mage/sets/BlessedVsCursed.java @@ -48,7 +48,7 @@ public class BlessedVsCursed extends ExpansionSet { } private BlessedVsCursed() { - super("Duel Decks: Blessed vs. Cursed", "DDQ", "mage.sets.blessedvscursed", new GregorianCalendar(2016, 2, 26).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Blessed vs. Cursed", "DDQ", "mage.sets.blessedvscursed", 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 9f9cdf268fe..f5ee069a6a8 100644 --- a/Mage.Sets/src/mage/sets/BornOfTheGods.java +++ b/Mage.Sets/src/mage/sets/BornOfTheGods.java @@ -47,7 +47,7 @@ public class BornOfTheGods extends ExpansionSet { } private BornOfTheGods() { - super("Born of the Gods", "BNG", "mage.sets.bornofthegods", new GregorianCalendar(2014, 2, 7).getTime(), SetType.EXPANSION); + super("Born of the Gods", "BNG", "mage.sets.bornofthegods", 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 c957adf2451..b7844402f48 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -17,7 +17,7 @@ public class ChampionsOfKamigawa extends ExpansionSet { } private ChampionsOfKamigawa() { - super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa", new GregorianCalendar(2004, 9, 1).getTime(), SetType.EXPANSION); + super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa", 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 8ab0d58e407..54e90f168de 100644 --- a/Mage.Sets/src/mage/sets/Champs.java +++ b/Mage.Sets/src/mage/sets/Champs.java @@ -47,7 +47,7 @@ public class Champs extends ExpansionSet { } private Champs() { - super("Champs", "CP", "mage.sets.champs", new GregorianCalendar(2006, 3, 18).getTime(), SetType.PROMOTIONAL); + super("Champs", "CP", "mage.sets.champs", 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 5df8a150623..c9bfa6de8a7 100644 --- a/Mage.Sets/src/mage/sets/Chronicles.java +++ b/Mage.Sets/src/mage/sets/Chronicles.java @@ -49,7 +49,7 @@ public class Chronicles extends ExpansionSet { } private Chronicles() { - super("Chronicles", "CHR", "mage.sets.chronicles", new GregorianCalendar(1995, 6, 1).getTime(), SetType.SUPPLEMENTAL); + super("Chronicles", "CHR", "mage.sets.chronicles", 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 4f6f89d0fa0..91e15e9dca6 100644 --- a/Mage.Sets/src/mage/sets/ClashPack.java +++ b/Mage.Sets/src/mage/sets/ClashPack.java @@ -46,7 +46,7 @@ public class ClashPack extends ExpansionSet { } private ClashPack() { - super("Clash Pack", "CLASH", "mage.sets.clashpack", new GregorianCalendar(2014, 7, 18).getTime(), SetType.SUPPLEMENTAL); + super("Clash Pack", "CLASH", "mage.sets.clashpack", 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 23a2d84785c..75904836dbd 100644 --- a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java +++ b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java @@ -49,7 +49,7 @@ public class ClassicSixthEdition extends ExpansionSet { } private ClassicSixthEdition() { - super("Classic Sixth Edition", "6ED", "mage.sets.classicsixthedition", new GregorianCalendar(1999, 3, 28).getTime(), SetType.CORE); + super("Classic Sixth Edition", "6ED", "mage.sets.classicsixthedition", 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 60e79e302d4..7cfc43adc0b 100644 --- a/Mage.Sets/src/mage/sets/Coldsnap.java +++ b/Mage.Sets/src/mage/sets/Coldsnap.java @@ -47,7 +47,7 @@ public class Coldsnap extends ExpansionSet { } private Coldsnap() { - super("Coldsnap", "CSP", "mage.sets.coldsnap", new GregorianCalendar(2006, 6, 21).getTime(), SetType.EXPANSION); + super("Coldsnap", "CSP", "mage.sets.coldsnap", 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 4916af74ecf..dee59cebd00 100644 --- a/Mage.Sets/src/mage/sets/Commander.java +++ b/Mage.Sets/src/mage/sets/Commander.java @@ -51,7 +51,7 @@ public class Commander extends ExpansionSet { } private Commander() { - super("Commander", "CMD", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.SUPPLEMENTAL); + super("Commander", "CMD", "mage.sets.commander", 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 983cbce2dab..de67b05e1d5 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013.java @@ -51,7 +51,7 @@ public class Commander2013 extends ExpansionSet { } private Commander2013() { - super("Commander 2013 Edition", "C13", "mage.sets.commander2013", new GregorianCalendar(2013, 11, 01).getTime(), SetType.SUPPLEMENTAL); + super("Commander 2013 Edition", "C13", "mage.sets.commander2013", 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 55bbdec34dc..49b5f164ca0 100644 --- a/Mage.Sets/src/mage/sets/Commander2014.java +++ b/Mage.Sets/src/mage/sets/Commander2014.java @@ -50,7 +50,7 @@ public class Commander2014 extends ExpansionSet { } private Commander2014() { - super("Commander 2014 Edition", "C14", "mage.sets.commander2014", new GregorianCalendar(2014, 11, 07).getTime(), SetType.SUPPLEMENTAL); + super("Commander 2014 Edition", "C14", "mage.sets.commander2014", 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 8f3d5d88f3b..7212abf7dff 100644 --- a/Mage.Sets/src/mage/sets/Commander2015.java +++ b/Mage.Sets/src/mage/sets/Commander2015.java @@ -50,7 +50,7 @@ public class Commander2015 extends ExpansionSet { } private Commander2015() { - super("Commander 2015 Edition", "C15", "mage.sets.commander2015", new GregorianCalendar(2015, 11, 13).getTime(), SetType.SUPPLEMENTAL); + super("Commander 2015 Edition", "C15", "mage.sets.commander2015", 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 62a3b70b9e5..ec9190eb1e0 100644 --- a/Mage.Sets/src/mage/sets/Commander2016.java +++ b/Mage.Sets/src/mage/sets/Commander2016.java @@ -47,7 +47,7 @@ public class Commander2016 extends ExpansionSet { } private Commander2016() { - super("Commander 2016 Edition", "C16", "mage.sets.commander2016", new GregorianCalendar(2016, 11, 11).getTime(), SetType.SUPPLEMENTAL); + super("Commander 2016 Edition", "C16", "mage.sets.commander2016", 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 19d1076bee8..f3e43d0b943 100644 --- a/Mage.Sets/src/mage/sets/CommanderAnthology.java +++ b/Mage.Sets/src/mage/sets/CommanderAnthology.java @@ -45,7 +45,7 @@ public class CommanderAnthology extends ExpansionSet { } private CommanderAnthology() { - super("Commander Anthology", "CMA2", "mage.sets.commanderanthology", new GregorianCalendar(2017, 6, 9).getTime(), SetType.SUPPLEMENTAL); + super("Commander Anthology", "CMA2", "mage.sets.commanderanthology", 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 23aee349668..a1df5cd168b 100644 --- a/Mage.Sets/src/mage/sets/CommandersArsenal.java +++ b/Mage.Sets/src/mage/sets/CommandersArsenal.java @@ -47,7 +47,7 @@ public class CommandersArsenal extends ExpansionSet { } private CommandersArsenal() { - super("Commander's Arsenal", "CMA", "mage.sets.commandersarsenal", new GregorianCalendar(2012, 11, 2).getTime(), SetType.SUPPLEMENTAL); + super("Commander's Arsenal", "CMA", "mage.sets.commandersarsenal", 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 36a0ba55385..5f13a99b217 100644 --- a/Mage.Sets/src/mage/sets/Conflux.java +++ b/Mage.Sets/src/mage/sets/Conflux.java @@ -47,7 +47,7 @@ public class Conflux extends ExpansionSet { } private Conflux() { - super("Conflux", "CON", "mage.sets.conflux", new GregorianCalendar(2009, 0, 31).getTime(), SetType.EXPANSION); + super("Conflux", "CON", "mage.sets.conflux", 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 88102cfcb81..9923e02bf13 100644 --- a/Mage.Sets/src/mage/sets/Conspiracy.java +++ b/Mage.Sets/src/mage/sets/Conspiracy.java @@ -48,7 +48,7 @@ public class Conspiracy extends ExpansionSet { } private Conspiracy() { - super("Conspiracy", "CNS", "mage.sets.conspiracy", new GregorianCalendar(2014, 6, 6).getTime(), SetType.SUPPLEMENTAL); + super("Conspiracy", "CNS", "mage.sets.conspiracy", 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 5a3641de2e2..f7825f040bd 100644 --- a/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java +++ b/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java @@ -48,7 +48,7 @@ public class ConspiracyTakeTheCrown extends ExpansionSet { } private ConspiracyTakeTheCrown() { - super("Conspiracy: Take the Crown", "CN2", "mage.sets.conspiracytakethecrown", new GregorianCalendar(2016, 8, 26).getTime(), SetType.SUPPLEMENTAL); + super("Conspiracy: Take the Crown", "CN2", "mage.sets.conspiracytakethecrown", 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 87d13ba6e54..1f7fd3a365f 100644 --- a/Mage.Sets/src/mage/sets/DarkAscension.java +++ b/Mage.Sets/src/mage/sets/DarkAscension.java @@ -46,7 +46,7 @@ public class DarkAscension extends ExpansionSet { } private DarkAscension() { - super("Dark Ascension", "DKA", "mage.sets.darkascension", new GregorianCalendar(2012, 1, 3).getTime(), SetType.EXPANSION); + super("Dark Ascension", "DKA", "mage.sets.darkascension", 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 6745097d4a1..55969a4ec68 100644 --- a/Mage.Sets/src/mage/sets/Darksteel.java +++ b/Mage.Sets/src/mage/sets/Darksteel.java @@ -16,7 +16,7 @@ public class Darksteel extends ExpansionSet { } public Darksteel() { - super("Darksteel", "DST", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), SetType.EXPANSION); + super("Darksteel", "DST", "mage.sets.darksteel", 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 7dcde42f525..3a2492c45f3 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -46,7 +46,7 @@ public class Dissension extends ExpansionSet { } private Dissension() { - super("Dissension", "DIS", "mage.sets.dissension", new GregorianCalendar(2006, 4, 5).getTime(), SetType.EXPANSION); + super("Dissension", "DIS", "mage.sets.dissension", 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 cb61b8ab71c..7b67f6b86fc 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DivineVsDemonic.java @@ -50,7 +50,7 @@ public class DivineVsDemonic extends ExpansionSet { } private DivineVsDemonic() { - super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", new GregorianCalendar(2009, 04, 10).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", 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 b8605766029..9b0b1ab3c15 100644 --- a/Mage.Sets/src/mage/sets/DragonsMaze.java +++ b/Mage.Sets/src/mage/sets/DragonsMaze.java @@ -56,7 +56,7 @@ public class DragonsMaze extends ExpansionSet { List savedSpecialRares = new ArrayList<>(); private DragonsMaze() { - super("Dragon's Maze", "DGM", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), SetType.EXPANSION); + super("Dragon's Maze", "DGM", "mage.sets.dragonsmaze", 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 9abeed5301a..b09dcbd0e4a 100644 --- a/Mage.Sets/src/mage/sets/DragonsOfTarkir.java +++ b/Mage.Sets/src/mage/sets/DragonsOfTarkir.java @@ -51,7 +51,7 @@ public class DragonsOfTarkir extends ExpansionSet { } private DragonsOfTarkir() { - super("Dragons of Tarkir", "DTK", "mage.sets.dragonsoftarkir", new GregorianCalendar(2015, 3, 27).getTime(), SetType.EXPANSION); + super("Dragons of Tarkir", "DTK", "mage.sets.dragonsoftarkir", 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 7f176a53eea..d8edfc0a28b 100644 --- a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java +++ b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java @@ -47,7 +47,7 @@ public class DuelsOfThePlaneswalkers extends ExpansionSet { } private DuelsOfThePlaneswalkers() { - super("Duels of the Planeswalkers", "DPA", "mage.sets.duelsoftheplaneswalkers", new GregorianCalendar(2010, 6, 4).getTime(), SetType.SUPPLEMENTAL); + super("Duels of the Planeswalkers", "DPA", "mage.sets.duelsoftheplaneswalkers", 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 3e2f5dc38f3..940d4bf8d7a 100644 --- a/Mage.Sets/src/mage/sets/EighthEdition.java +++ b/Mage.Sets/src/mage/sets/EighthEdition.java @@ -18,7 +18,7 @@ public class EighthEdition extends ExpansionSet { } private EighthEdition() { - super("Eighth Edition", "8ED", "mage.sets.eighthedition", new GregorianCalendar(2003, 7, 28).getTime(), SetType.CORE); + super("Eighth Edition", "8ED", "mage.sets.eighthedition", 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 4762a40d405..6a19a7003a8 100644 --- a/Mage.Sets/src/mage/sets/EldritchMoon.java +++ b/Mage.Sets/src/mage/sets/EldritchMoon.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; +import mage.constants.SetType; /** * @@ -46,7 +44,7 @@ public class EldritchMoon extends ExpansionSet { } private EldritchMoon() { - super("Eldritch Moon", "EMN", "mage.sets.eldritchmoon", new GregorianCalendar(2016, 7, 26).getTime(), SetType.EXPANSION); + super("Eldritch Moon", "EMN", "mage.sets.eldritchmoon", 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 85147d6bdec..432d5c501cd 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsKiora.java +++ b/Mage.Sets/src/mage/sets/ElspethVsKiora.java @@ -48,7 +48,7 @@ public class ElspethVsKiora extends ExpansionSet { } private ElspethVsKiora() { - super("Duel Decks: Elspeth vs. Kiora", "DDO", "mage.sets.elspethvskiora", new GregorianCalendar(2015, 2, 27).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Elspeth vs. Kiora", "DDO", "mage.sets.elspethvskiora", 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 34745319d21..a9a52b362be 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java @@ -18,7 +18,7 @@ public class ElspethVsTezzeret extends ExpansionSet { } private ElspethVsTezzeret() { - super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", 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 dafe42dbff6..fd3bfc36c89 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java @@ -28,7 +28,7 @@ public class ElvesVsGoblins extends ExpansionSet { } private ElvesVsGoblins() { - super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", new GregorianCalendar(2007, 11, 16).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", 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 a265d9b4c9d..ab40673dace 100644 --- a/Mage.Sets/src/mage/sets/EternalMasters.java +++ b/Mage.Sets/src/mage/sets/EternalMasters.java @@ -47,7 +47,7 @@ public class EternalMasters extends ExpansionSet { } private EternalMasters() { - super("Eternal Masters", "EMA", "mage.sets.eternalmasters", new GregorianCalendar(2016, 6, 10).getTime(), SetType.SUPPLEMENTAL); + super("Eternal Masters", "EMA", "mage.sets.eternalmasters", 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 7115fed39ba..881dafb08ff 100644 --- a/Mage.Sets/src/mage/sets/EuropeanLandProgram.java +++ b/Mage.Sets/src/mage/sets/EuropeanLandProgram.java @@ -28,19 +28,15 @@ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ - public class EuropeanLandProgram extends ExpansionSet { private static final EuropeanLandProgram fINSTANCE = new EuropeanLandProgram(); @@ -50,7 +46,7 @@ public class EuropeanLandProgram extends ExpansionSet { } private EuropeanLandProgram() { - super("European Land Program", "EURO", "mage.sets.europeanlandprogram", new GregorianCalendar(2000, 2, 14).getTime(), SetType.PROMOTIONAL); + super("European Land Program", "EURO", "mage.sets.europeanlandprogram", 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 3a4f427d371..ddcc7ec993a 100644 --- a/Mage.Sets/src/mage/sets/Eventide.java +++ b/Mage.Sets/src/mage/sets/Eventide.java @@ -15,7 +15,7 @@ public class Eventide extends ExpansionSet { } private Eventide() { - super("Eventide", "EVE", "mage.sets.eventide", new GregorianCalendar(2008, 6, 25).getTime(), SetType.EXPANSION); + super("Eventide", "EVE", "mage.sets.eventide", 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 945866a5e0b..56339fce97f 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.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.constants.SetType; /** * @@ -47,7 +44,7 @@ public class Exodus extends ExpansionSet { } private Exodus() { - super("Exodus", "EXO", "mage.sets.exodus", new GregorianCalendar(1998, 5, 6).getTime(), SetType.EXPANSION); + super("Exodus", "EXO", "mage.sets.exodus", 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 cfe6da47d06..44c1236944f 100644 --- a/Mage.Sets/src/mage/sets/FTVAngels.java +++ b/Mage.Sets/src/mage/sets/FTVAngels.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVAngels extends ExpansionSet { + private static final FTVAngels fINSTANCE = new FTVAngels(); public static FTVAngels getInstance() { @@ -46,7 +45,7 @@ public class FTVAngels extends ExpansionSet { } private FTVAngels() { - super("From the Vault: Angels", "V15", "mage.sets.ftvangels", new GregorianCalendar(2015, 8, 21).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Angels", "V15", "mage.sets.ftvangels", 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 1d9fef0c904..f3e4e8e88d8 100644 --- a/Mage.Sets/src/mage/sets/FTVAnnihilation.java +++ b/Mage.Sets/src/mage/sets/FTVAnnihilation.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVAnnihilation extends ExpansionSet { + private static final FTVAnnihilation fINSTANCE = new FTVAnnihilation(); public static FTVAnnihilation getInstance() { @@ -46,7 +45,7 @@ public class FTVAnnihilation extends ExpansionSet { } private FTVAnnihilation() { - super("From the Vault: Annihilation", "V14", "mage.sets.ftvannihilation", new GregorianCalendar(2014, 8, 22).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Annihilation", "V14", "mage.sets.ftvannihilation", 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 cab4e302f5d..1e88b6bfb2d 100644 --- a/Mage.Sets/src/mage/sets/FTVDragons.java +++ b/Mage.Sets/src/mage/sets/FTVDragons.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVDragons extends ExpansionSet { + private static final FTVDragons fINSTANCE = new FTVDragons(); public static FTVDragons getInstance() { @@ -46,7 +45,7 @@ public class FTVDragons extends ExpansionSet { } private FTVDragons() { - super("From the Vault: Dragons", "DRB", "mage.sets.ftvdragons", new GregorianCalendar(2008, 8, 29).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Dragons", "DRB", "mage.sets.ftvdragons", 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 bb7a907d8cb..29754f5685d 100644 --- a/Mage.Sets/src/mage/sets/FTVExiled.java +++ b/Mage.Sets/src/mage/sets/FTVExiled.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVExiled extends ExpansionSet { + private static final FTVExiled fINSTANCE = new FTVExiled(); public static FTVExiled getInstance() { @@ -46,7 +45,7 @@ public class FTVExiled extends ExpansionSet { } private FTVExiled() { - super("From the Vault: Exiled", "V09", "mage.sets.ftvexiled", new GregorianCalendar(2009, 8, 28).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Exiled", "V09", "mage.sets.ftvexiled", 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)); @@ -64,4 +63,4 @@ public class FTVExiled extends ExpansionSet { cards.add(new SetCardInfo("Tinker", 14, Rarity.MYTHIC, mage.cards.t.Tinker.class)); cards.add(new SetCardInfo("Trinisphere", 15, Rarity.MYTHIC, mage.cards.t.Trinisphere.class)); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/FTVLegends.java b/Mage.Sets/src/mage/sets/FTVLegends.java index ae0f3e26620..4bad79b0a03 100644 --- a/Mage.Sets/src/mage/sets/FTVLegends.java +++ b/Mage.Sets/src/mage/sets/FTVLegends.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVLegends extends ExpansionSet { + private static final FTVLegends fINSTANCE = new FTVLegends(); public static FTVLegends getInstance() { @@ -46,7 +45,7 @@ public class FTVLegends extends ExpansionSet { } private FTVLegends() { - super("From the Vault: Legends", "V11", "mage.sets.ftvlegends", new GregorianCalendar(2011, 8, 26).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Legends", "V11", "mage.sets.ftvlegends", 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 1222eee785d..7782fce9237 100644 --- a/Mage.Sets/src/mage/sets/FTVLore.java +++ b/Mage.Sets/src/mage/sets/FTVLore.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVLore extends ExpansionSet { + private static final FTVLore fINSTANCE = new FTVLore(); public static FTVLore getInstance() { @@ -46,7 +45,7 @@ public class FTVLore extends ExpansionSet { } private FTVLore() { - super("From the Vault: Lore", "V16", "mage.sets.ftvlore", new GregorianCalendar(2016, 8, 19).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Lore", "V16", "mage.sets.ftvlore", 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 40c7b37198e..a3c7bd34daf 100644 --- a/Mage.Sets/src/mage/sets/FTVRealms.java +++ b/Mage.Sets/src/mage/sets/FTVRealms.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVRealms extends ExpansionSet { + private static final FTVRealms fINSTANCE = new FTVRealms(); public static FTVRealms getInstance() { @@ -46,7 +45,7 @@ public class FTVRealms extends ExpansionSet { } private FTVRealms() { - super("From the Vault: Realms", "V12", "mage.sets.ftvrealms", new GregorianCalendar(2012, 8, 31).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Realms", "V12", "mage.sets.ftvrealms", 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 d53d7cd2cfc..b94ecfddab6 100644 --- a/Mage.Sets/src/mage/sets/FTVRelics.java +++ b/Mage.Sets/src/mage/sets/FTVRelics.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVRelics extends ExpansionSet { + private static final FTVRelics fINSTANCE = new FTVRelics(); public static FTVRelics getInstance() { @@ -46,7 +45,7 @@ public class FTVRelics extends ExpansionSet { } private FTVRelics() { - super("From the Vault: Relics", "V10", "mage.sets.ftvrelics", new GregorianCalendar(2010, 8, 27).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Relics", "V10", "mage.sets.ftvrelics", 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 65516a84ea6..48de12cc5bd 100644 --- a/Mage.Sets/src/mage/sets/FTVTwenty.java +++ b/Mage.Sets/src/mage/sets/FTVTwenty.java @@ -24,21 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * * @author fireshoes */ public class FTVTwenty extends ExpansionSet { + private static final FTVTwenty fINSTANCE = new FTVTwenty(); public static FTVTwenty getInstance() { @@ -46,7 +45,7 @@ public class FTVTwenty extends ExpansionSet { } private FTVTwenty() { - super("From the Vault: Twenty", "V13", "mage.sets.ftvtwenty", new GregorianCalendar(2013, 8, 23).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Twenty", "V13", "mage.sets.ftvtwenty", 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)); @@ -69,4 +68,4 @@ public class FTVTwenty extends ExpansionSet { cards.add(new SetCardInfo("Venser, Shaper Savant", 15, Rarity.MYTHIC, mage.cards.v.VenserShaperSavant.class)); cards.add(new SetCardInfo("Wall of Blossoms", 6, Rarity.MYTHIC, mage.cards.w.WallOfBlossoms.class)); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java index 1000abc14e6..646701a769f 100644 --- a/Mage.Sets/src/mage/sets/FallenEmpires.java +++ b/Mage.Sets/src/mage/sets/FallenEmpires.java @@ -50,7 +50,7 @@ public class FallenEmpires extends ExpansionSet { } private FallenEmpires() { - super("Fallen Empires", "FEM", "mage.sets.fallenempires", new GregorianCalendar(1994, 10, 1).getTime(), SetType.EXPANSION); + super("Fallen Empires", "FEM", "mage.sets.fallenempires", 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 0cb22243df2..3c305cae057 100644 --- a/Mage.Sets/src/mage/sets/FateReforged.java +++ b/Mage.Sets/src/mage/sets/FateReforged.java @@ -57,7 +57,7 @@ public class FateReforged extends ExpansionSet { } private FateReforged() { - super("Fate Reforged", "FRF", "mage.sets.fatereforged", new GregorianCalendar(2015, 1, 23).getTime(), SetType.EXPANSION); + super("Fate Reforged", "FRF", "mage.sets.fatereforged", 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 52764784ea3..2768d34261c 100644 --- a/Mage.Sets/src/mage/sets/FifthDawn.java +++ b/Mage.Sets/src/mage/sets/FifthDawn.java @@ -46,7 +46,7 @@ public class FifthDawn extends ExpansionSet { } private FifthDawn() { - super("Fifth Dawn", "5DN", "mage.sets.fifthdawn", new GregorianCalendar(2004, 5, 4).getTime(), SetType.EXPANSION); + super("Fifth Dawn", "5DN", "mage.sets.fifthdawn", 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 2b45ca04e68..bd2dddf0bc1 100644 --- a/Mage.Sets/src/mage/sets/FifthEdition.java +++ b/Mage.Sets/src/mage/sets/FifthEdition.java @@ -18,7 +18,7 @@ public class FifthEdition extends ExpansionSet { } private FifthEdition() { - super("Fifth Edition", "5ED", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE); + super("Fifth Edition", "5ED", "mage.sets.fifthedition", 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 adcee2af22f..07c9fadb5fc 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -50,7 +50,7 @@ public class FourthEdition extends ExpansionSet { } private FourthEdition() { - super("Fourth Edition", "4ED", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), SetType.CORE); + super("Fourth Edition", "4ED", "mage.sets.fourthedition", 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 239e1bfd7fd..8db79dabe48 100644 --- a/Mage.Sets/src/mage/sets/FridayNightMagic.java +++ b/Mage.Sets/src/mage/sets/FridayNightMagic.java @@ -47,7 +47,7 @@ public class FridayNightMagic extends ExpansionSet { } private FridayNightMagic() { - super("Friday Night Magic", "FNMP", "mage.sets.fridaynightmagic", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("Friday Night Magic", "FNMP", "mage.sets.fridaynightmagic", 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 32a83bafe88..93a12f5ce76 100644 --- a/Mage.Sets/src/mage/sets/FutureSight.java +++ b/Mage.Sets/src/mage/sets/FutureSight.java @@ -46,7 +46,7 @@ public class FutureSight extends ExpansionSet { } private FutureSight() { - super("Future Sight", "FUT", "mage.sets.futuresight", new GregorianCalendar(2007, 4, 4).getTime(), SetType.EXPANSION); + super("Future Sight", "FUT", "mage.sets.futuresight", 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 9550eafe368..b3e04fd68e9 100644 --- a/Mage.Sets/src/mage/sets/GameDay.java +++ b/Mage.Sets/src/mage/sets/GameDay.java @@ -47,7 +47,7 @@ public class GameDay extends ExpansionSet { } private GameDay() { - super("Game Day", "MGDC", "mage.sets.gameday", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("Game Day", "MGDC", "mage.sets.gameday", 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 556c3255ff1..1fc18c56311 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java @@ -28,7 +28,7 @@ public class GarrukVsLiliana extends ExpansionSet { } private GarrukVsLiliana() { - super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", new GregorianCalendar(2009, 10, 30).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", 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 c7f779077b7..30d6417c1ee 100644 --- a/Mage.Sets/src/mage/sets/Gatecrash.java +++ b/Mage.Sets/src/mage/sets/Gatecrash.java @@ -46,7 +46,7 @@ public class Gatecrash extends ExpansionSet { } private Gatecrash() { - super("Gatecrash", "GTC", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 1).getTime(), SetType.EXPANSION); + super("Gatecrash", "GTC", "mage.sets.gatecrash", 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 becbb98b416..aa3a3b04955 100644 --- a/Mage.Sets/src/mage/sets/GrandPrix.java +++ b/Mage.Sets/src/mage/sets/GrandPrix.java @@ -47,7 +47,7 @@ public class GrandPrix extends ExpansionSet { } private GrandPrix() { - super("Grand Prix", "GPX", "mage.sets.grandprix", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("Grand Prix", "GPX", "mage.sets.grandprix", 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 a0aa689b63a..11cc919c0ab 100644 --- a/Mage.Sets/src/mage/sets/Guildpact.java +++ b/Mage.Sets/src/mage/sets/Guildpact.java @@ -46,7 +46,7 @@ public class Guildpact extends ExpansionSet { } private Guildpact() { - super("Guildpact", "GPT", "mage.sets.guildpact", new GregorianCalendar(2006, 1, 3).getTime(), SetType.EXPANSION); + super("Guildpact", "GPT", "mage.sets.guildpact", 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 4ab171b190b..9618e2bc9a6 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -15,7 +15,7 @@ public class Guru extends ExpansionSet { } private Guru() { - super("Guru", "GUR", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), SetType.PROMOTIONAL); + super("Guru", "GUR", "mage.sets.guru", 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 bb3d92649f0..4b4539950a8 100644 --- a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java +++ b/Mage.Sets/src/mage/sets/HeroesVsMonsters.java @@ -49,7 +49,7 @@ public class HeroesVsMonsters extends ExpansionSet { } private HeroesVsMonsters() { - super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", new GregorianCalendar(2013, 9, 6).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", 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 7b799a20b96..b12beba883b 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -50,7 +50,7 @@ public class Homelands extends ExpansionSet { } private Homelands() { - super("Homelands", "HML", "mage.sets.homelands", new GregorianCalendar(1995, 9, 1).getTime(), SetType.EXPANSION); + super("Homelands", "HML", "mage.sets.homelands", 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 11993b9332d..0c511a02bf0 100644 --- a/Mage.Sets/src/mage/sets/HourOfDevastation.java +++ b/Mage.Sets/src/mage/sets/HourOfDevastation.java @@ -24,15 +24,12 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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 HourOfDevastation extends ExpansionSet { } private HourOfDevastation() { - super("Hour of Devastation", "HOU", "mage.sets.hourofdevastation", new GregorianCalendar(2017, 7, 14).getTime(), SetType.EXPANSION); + super("Hour of Devastation", "HOU", "mage.sets.hourofdevastation", 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 9996dea222e..d68ac5b5f50 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -50,7 +50,7 @@ public class IceAge extends ExpansionSet { } private IceAge() { - super("Ice Age", "ICE", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), SetType.EXPANSION); + super("Ice Age", "ICE", "mage.sets.iceage", 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 1440c03be94..6f92db0178a 100644 --- a/Mage.Sets/src/mage/sets/Innistrad.java +++ b/Mage.Sets/src/mage/sets/Innistrad.java @@ -50,7 +50,7 @@ public class Innistrad extends ExpansionSet { } private Innistrad() { - super("Innistrad", "ISD", "mage.sets.innistrad", new GregorianCalendar(2011, 9, 30).getTime(), SetType.EXPANSION); + super("Innistrad", "ISD", "mage.sets.innistrad", 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 f943b428a52..3aaa6400c97 100644 --- a/Mage.Sets/src/mage/sets/Invasion.java +++ b/Mage.Sets/src/mage/sets/Invasion.java @@ -48,7 +48,7 @@ public class Invasion extends ExpansionSet { } private Invasion() { - super("Invasion", "INV", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION); + super("Invasion", "INV", "mage.sets.invasion", 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 a390de132c4..58c970537c1 100644 --- a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java +++ b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java @@ -49,7 +49,7 @@ public class IzzetVsGolgari extends ExpansionSet { } private IzzetVsGolgari() { - super("Duel Decks: Izzet vs. Golgari", "DDJ", "mage.sets.izzetvsgolgari", new GregorianCalendar(2012, 9, 7).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Izzet vs. Golgari", "DDJ", "mage.sets.izzetvsgolgari", 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 1b8a3626148..6e0ec7f9340 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/JaceVsChandra.java @@ -28,7 +28,7 @@ public class JaceVsChandra extends ExpansionSet { } private JaceVsChandra() { - super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", new GregorianCalendar(2008, 11, 07).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", 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 e958f05ba75..d217681e0f0 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/JaceVsVraska.java @@ -50,7 +50,7 @@ public class JaceVsVraska extends ExpansionSet { } private JaceVsVraska() { - super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", new GregorianCalendar(2014, 3, 14).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", 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 02e5e1283bf..949ac083045 100644 --- a/Mage.Sets/src/mage/sets/JourneyIntoNyx.java +++ b/Mage.Sets/src/mage/sets/JourneyIntoNyx.java @@ -47,7 +47,7 @@ public class JourneyIntoNyx extends ExpansionSet { } private JourneyIntoNyx() { - super("Journey into Nyx", "JOU", "mage.sets.journeyintonyx", new GregorianCalendar(2014, 5, 2).getTime(), SetType.EXPANSION); + super("Journey into Nyx", "JOU", "mage.sets.journeyintonyx", 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 71391bf3c19..e75c530bcd7 100644 --- a/Mage.Sets/src/mage/sets/JudgePromo.java +++ b/Mage.Sets/src/mage/sets/JudgePromo.java @@ -50,7 +50,7 @@ public class JudgePromo extends ExpansionSet { } private JudgePromo() { - super("Judge Promo", "JR", "mage.sets.judgepromo", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("Judge Promo", "JR", "mage.sets.judgepromo", 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 0bde0e4a1ab..1f18bc6c072 100644 --- a/Mage.Sets/src/mage/sets/Judgment.java +++ b/Mage.Sets/src/mage/sets/Judgment.java @@ -46,7 +46,7 @@ public class Judgment extends ExpansionSet { } private Judgment() { - super("Judgment", "JUD", "mage.sets.judgment", new GregorianCalendar(2002, 5, 27).getTime(), SetType.EXPANSION); + super("Judgment", "JUD", "mage.sets.judgment", 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 c08ca8d3e93..1ceacb39998 100644 --- a/Mage.Sets/src/mage/sets/Kaladesh.java +++ b/Mage.Sets/src/mage/sets/Kaladesh.java @@ -55,7 +55,7 @@ public class Kaladesh extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private Kaladesh() { - super("Kaladesh", "KLD", "mage.sets.kaladesh", new GregorianCalendar(2016, 9, 30).getTime(), SetType.EXPANSION); + super("Kaladesh", "KLD", "mage.sets.kaladesh", 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 e26830955f7..699820a4be1 100644 --- a/Mage.Sets/src/mage/sets/KhansOfTarkir.java +++ b/Mage.Sets/src/mage/sets/KhansOfTarkir.java @@ -51,7 +51,7 @@ public class KhansOfTarkir extends ExpansionSet { } private KhansOfTarkir() { - super("Khans of Tarkir", "KTK", "mage.sets.khansoftarkir", new GregorianCalendar(2014, 9, 26).getTime(), SetType.EXPANSION); + super("Khans of Tarkir", "KTK", "mage.sets.khansoftarkir", 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 82cb4277461..41d385c098a 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/KnightsVsDragons.java @@ -50,7 +50,7 @@ public class KnightsVsDragons extends ExpansionSet { } private KnightsVsDragons() { - super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", new GregorianCalendar(2011, 4, 1).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", 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 0aa5a01be15..a12d8874ff1 100644 --- a/Mage.Sets/src/mage/sets/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/LaunchParty.java @@ -47,7 +47,7 @@ public class LaunchParty extends ExpansionSet { } private LaunchParty() { - super("Launch Party", "MLP", "mage.sets.launchparty", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("Launch Party", "MLP", "mage.sets.launchparty", 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 c39d355b725..0f61b9bb981 100644 --- a/Mage.Sets/src/mage/sets/Legends.java +++ b/Mage.Sets/src/mage/sets/Legends.java @@ -47,7 +47,7 @@ public class Legends extends ExpansionSet { } private Legends() { - super("Legends", "LEG", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), SetType.EXPANSION); + super("Legends", "LEG", "mage.sets.legends", 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 7394b9ee6da..0bf37fdf85c 100644 --- a/Mage.Sets/src/mage/sets/Legions.java +++ b/Mage.Sets/src/mage/sets/Legions.java @@ -46,7 +46,7 @@ public class Legions extends ExpansionSet { } private Legions() { - super("Legions", "LGN", "mage.sets.legions", new GregorianCalendar(2003, 0, 25).getTime(), SetType.EXPANSION); + super("Legions", "LGN", "mage.sets.legions", 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 2764434b050..117ecbf12d0 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java @@ -23,7 +23,7 @@ public class LimitedEditionAlpha extends ExpansionSet { } private LimitedEditionAlpha() { - super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), SetType.CORE); + super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", 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 65901775ec1..160b4115088 100644 --- a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java +++ b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java @@ -23,7 +23,7 @@ public class LimitedEditionBeta extends ExpansionSet { } private LimitedEditionBeta() { - super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), SetType.CORE); + super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", 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 0a363667ba7..06bef222876 100644 --- a/Mage.Sets/src/mage/sets/Lorwyn.java +++ b/Mage.Sets/src/mage/sets/Lorwyn.java @@ -49,7 +49,7 @@ public class Lorwyn extends ExpansionSet { } private Lorwyn() { - super("Lorwyn", "LRW", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION); + super("Lorwyn", "LRW", "mage.sets.lorwyn", 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 7fac5e2b7b6..40c436d359f 100644 --- a/Mage.Sets/src/mage/sets/Magic2010.java +++ b/Mage.Sets/src/mage/sets/Magic2010.java @@ -50,7 +50,7 @@ public class Magic2010 extends ExpansionSet { } private Magic2010() { - super("Magic 2010", "M10", "mage.sets.magic2010", new GregorianCalendar(2009, 6, 17).getTime(), SetType.CORE); + super("Magic 2010", "M10", "mage.sets.magic2010", 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 9d3b43d59b6..69768226ec1 100644 --- a/Mage.Sets/src/mage/sets/Magic2011.java +++ b/Mage.Sets/src/mage/sets/Magic2011.java @@ -50,7 +50,7 @@ public class Magic2011 extends ExpansionSet { } private Magic2011() { - super("Magic 2011", "M11", "mage.sets.magic2011", new GregorianCalendar(2010, 6, 16).getTime(), SetType.CORE); + super("Magic 2011", "M11", "mage.sets.magic2011", 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 7fc52cc118b..7eede4038b9 100644 --- a/Mage.Sets/src/mage/sets/Magic2012.java +++ b/Mage.Sets/src/mage/sets/Magic2012.java @@ -49,7 +49,7 @@ public class Magic2012 extends ExpansionSet { } private Magic2012() { - super("Magic 2012", "M12", "mage.sets.magic2012", new GregorianCalendar(2011, 6, 9).getTime(), SetType.CORE); + super("Magic 2012", "M12", "mage.sets.magic2012", 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 c05075e92a6..632dcfd4636 100644 --- a/Mage.Sets/src/mage/sets/Magic2013.java +++ b/Mage.Sets/src/mage/sets/Magic2013.java @@ -49,7 +49,7 @@ public class Magic2013 extends ExpansionSet { } private Magic2013() { - super("Magic 2013", "M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE); + super("Magic 2013", "M13", "mage.sets.magic2013", 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 9c716f83013..61029b2b109 100644 --- a/Mage.Sets/src/mage/sets/Magic2014.java +++ b/Mage.Sets/src/mage/sets/Magic2014.java @@ -49,7 +49,7 @@ public class Magic2014 extends ExpansionSet { } private Magic2014() { - super("Magic 2014", "M14", "mage.sets.magic2014", new GregorianCalendar(2013, 7, 19).getTime(), SetType.CORE); + super("Magic 2014", "M14", "mage.sets.magic2014", 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 7c8fe78edb7..0ef1cd8fe18 100644 --- a/Mage.Sets/src/mage/sets/Magic2015.java +++ b/Mage.Sets/src/mage/sets/Magic2015.java @@ -49,7 +49,7 @@ public class Magic2015 extends ExpansionSet { } private Magic2015() { - super("Magic 2015", "M15", "mage.sets.magic2015", new GregorianCalendar(2014, 7, 18).getTime(), SetType.CORE); + super("Magic 2015", "M15", "mage.sets.magic2015", 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 19ea6805e7a..4b59c801027 100644 --- a/Mage.Sets/src/mage/sets/MagicOrigins.java +++ b/Mage.Sets/src/mage/sets/MagicOrigins.java @@ -49,7 +49,7 @@ public class MagicOrigins extends ExpansionSet { } private MagicOrigins() { - super("Magic Origins", "ORI", "mage.sets.magicorigins", new GregorianCalendar(2015, 7, 17).getTime(), SetType.CORE); + super("Magic Origins", "ORI", "mage.sets.magicorigins", 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 265e3e2b674..54d0a4a5457 100644 --- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java +++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java @@ -41,7 +41,7 @@ public class MagicPlayerRewards extends ExpansionSet { } private MagicPlayerRewards() { - super("Magic Player Rewards", "MPRP", "mage.sets.magicplayerrewards", new GregorianCalendar(1990, 1, 1).getTime(), SetType.PROMOTIONAL); + super("Magic Player Rewards", "MPRP", "mage.sets.magicplayerrewards", 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 06409497224..fa864c399d8 100644 --- a/Mage.Sets/src/mage/sets/MasterpieceSeries.java +++ b/Mage.Sets/src/mage/sets/MasterpieceSeries.java @@ -49,7 +49,7 @@ public class MasterpieceSeries extends ExpansionSet { } private MasterpieceSeries() { - super("Masterpiece Series", "MPS", "mage.sets.masterpieceseries", new GregorianCalendar(2016, 9, 30).getTime(), SetType.PROMOTIONAL); + super("Masterpiece Series", "MPS", "mage.sets.masterpieceseries", 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 a2eba02dfa4..61536179aac 100644 --- a/Mage.Sets/src/mage/sets/MastersEdition.java +++ b/Mage.Sets/src/mage/sets/MastersEdition.java @@ -49,7 +49,7 @@ public class MastersEdition extends ExpansionSet { } private MastersEdition() { - super("Masters Edition", "MED", "mage.sets.mastersedition", new GregorianCalendar(2007, 9, 10).getTime(), SetType.MAGIC_ONLINE); + super("Masters Edition", "MED", "mage.sets.mastersedition", 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 66bfe8d85d0..a26f2de7146 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionII.java @@ -46,7 +46,7 @@ public class MastersEditionII extends ExpansionSet { } private MastersEditionII() { - super("Masters Edition II", "ME2", "mage.sets.masterseditionii", new GregorianCalendar(2008, 9, 22).getTime(), SetType.MAGIC_ONLINE); + super("Masters Edition II", "ME2", "mage.sets.masterseditionii", 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 d38bdbd7bab..26632211294 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIII.java @@ -49,7 +49,7 @@ public class MastersEditionIII extends ExpansionSet { } private MastersEditionIII() { - super("Masters Edition III", "ME3", "mage.sets.masterseditioniii", new GregorianCalendar(2009, 9, 7).getTime(), SetType.MAGIC_ONLINE); + super("Masters Edition III", "ME3", "mage.sets.masterseditioniii", 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 742dae7e70b..8fcf66ec6e0 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIV.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIV.java @@ -47,7 +47,7 @@ public class MastersEditionIV extends ExpansionSet { } private MastersEditionIV() { - super("Masters Edition IV", "ME4", "mage.sets.masterseditioniv", new GregorianCalendar(2011, 1, 10).getTime(), SetType.MAGIC_ONLINE); + super("Masters Edition IV", "ME4", "mage.sets.masterseditioniv", 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 ed5f044b356..b8a30501fb8 100644 --- a/Mage.Sets/src/mage/sets/MediaInserts.java +++ b/Mage.Sets/src/mage/sets/MediaInserts.java @@ -44,7 +44,7 @@ public class MediaInserts extends ExpansionSet { } private MediaInserts() { - super("Media Inserts", "MBP", "mage.sets.mediainserts", new GregorianCalendar(1990, 1, 1).getTime(), SetType.PROMOTIONAL); + super("Media Inserts", "MBP", "mage.sets.mediainserts", 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 3379f77fb4d..56b49711847 100644 --- a/Mage.Sets/src/mage/sets/MercadianMasques.java +++ b/Mage.Sets/src/mage/sets/MercadianMasques.java @@ -50,7 +50,7 @@ public class MercadianMasques extends ExpansionSet { } private MercadianMasques() { - super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), SetType.EXPANSION); + super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", 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 b1c3b675505..3611c859292 100644 --- a/Mage.Sets/src/mage/sets/MindVsMight.java +++ b/Mage.Sets/src/mage/sets/MindVsMight.java @@ -25,7 +25,7 @@ public class MindVsMight extends ExpansionSet { } private MindVsMight() { - super("Duel Decks: Mind vs. Might", "DDS", "mage.sets.mindvsmight", new GregorianCalendar(2017, 3, 31).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Mind vs. Might", "DDS", "mage.sets.mindvsmight", 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 4c97d43b7b9..b3ecc703a9c 100644 --- a/Mage.Sets/src/mage/sets/Mirage.java +++ b/Mage.Sets/src/mage/sets/Mirage.java @@ -49,7 +49,7 @@ public class Mirage extends ExpansionSet { } private Mirage() { - super("Mirage", "MIR", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), SetType.EXPANSION); + super("Mirage", "MIR", "mage.sets.mirage", 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 c1b7fa399b6..754826c3b6b 100644 --- a/Mage.Sets/src/mage/sets/Mirrodin.java +++ b/Mage.Sets/src/mage/sets/Mirrodin.java @@ -18,7 +18,7 @@ public class Mirrodin extends ExpansionSet { } private Mirrodin() { - super("Mirrodin", "MRD", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), SetType.EXPANSION); + super("Mirrodin", "MRD", "mage.sets.mirrodin", 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 0fe41f5f078..4d512bec40c 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java @@ -50,7 +50,7 @@ public class MirrodinBesieged extends ExpansionSet { } private MirrodinBesieged() { - super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION); + super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", 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 b37850d097d..e11e4496c16 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters.java +++ b/Mage.Sets/src/mage/sets/ModernMasters.java @@ -47,7 +47,7 @@ public class ModernMasters extends ExpansionSet { } private ModernMasters() { - super("Modern Masters", "MMA", "mage.sets.modernmasters", new GregorianCalendar(2013, 6, 7).getTime(), SetType.SUPPLEMENTAL); + super("Modern Masters", "MMA", "mage.sets.modernmasters", 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 d61d89f19d1..b14f93d28ea 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters2015.java +++ b/Mage.Sets/src/mage/sets/ModernMasters2015.java @@ -47,7 +47,7 @@ public class ModernMasters2015 extends ExpansionSet { } private ModernMasters2015() { - super("Modern Masters 2015", "MM2", "mage.sets.modernmasters2015", new GregorianCalendar(2015, 5, 22).getTime(), SetType.SUPPLEMENTAL); + super("Modern Masters 2015", "MM2", "mage.sets.modernmasters2015", 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 c6dca86b843..6ff1d3f54a8 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters2017.java +++ b/Mage.Sets/src/mage/sets/ModernMasters2017.java @@ -47,7 +47,7 @@ public class ModernMasters2017 extends ExpansionSet { } private ModernMasters2017() { - super("Modern Masters 2017", "MM3", "mage.sets.modernmasters2017", new GregorianCalendar(2017, 3, 17).getTime(), SetType.SUPPLEMENTAL); + super("Modern Masters 2017", "MM3", "mage.sets.modernmasters2017", 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 092cd1d7865..97eab08049f 100644 --- a/Mage.Sets/src/mage/sets/Morningtide.java +++ b/Mage.Sets/src/mage/sets/Morningtide.java @@ -46,7 +46,7 @@ public class Morningtide extends ExpansionSet { } private Morningtide() { - super("Morningtide", "MOR", "mage.sets.morningtide", new GregorianCalendar(2008, 1, 1).getTime(), SetType.EXPANSION); + super("Morningtide", "MOR", "mage.sets.morningtide", 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 c035b2889de..8f7f535f04f 100644 --- a/Mage.Sets/src/mage/sets/Nemesis.java +++ b/Mage.Sets/src/mage/sets/Nemesis.java @@ -29,9 +29,8 @@ 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.constants.SetType; /** * @@ -46,7 +45,7 @@ public class Nemesis extends ExpansionSet { } private Nemesis() { - super("Nemesis", "NEM", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), SetType.EXPANSION); + super("Nemesis", "NEM", "mage.sets.nemesis", 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 53392b26b1b..4be0507bd92 100644 --- a/Mage.Sets/src/mage/sets/NewPhyrexia.java +++ b/Mage.Sets/src/mage/sets/NewPhyrexia.java @@ -18,7 +18,7 @@ public class NewPhyrexia extends ExpansionSet { } private NewPhyrexia() { - super("New Phyrexia", "NPH", "mage.sets.newphyrexia", new GregorianCalendar(2011, 4, 4).getTime(), SetType.EXPANSION); + super("New Phyrexia", "NPH", "mage.sets.newphyrexia", 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 9ee3850a83a..03088dd210c 100644 --- a/Mage.Sets/src/mage/sets/NinthEdition.java +++ b/Mage.Sets/src/mage/sets/NinthEdition.java @@ -18,7 +18,7 @@ public class NinthEdition extends ExpansionSet { } private NinthEdition() { - super("Ninth Edition", "9ED", "mage.sets.ninthedition", new GregorianCalendar(2005, 7, 29).getTime(), SetType.CORE); + super("Ninth Edition", "9ED", "mage.sets.ninthedition", 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 b3ef2053445..8ab9b31ad7c 100644 --- a/Mage.Sets/src/mage/sets/NissaVsObNixilis.java +++ b/Mage.Sets/src/mage/sets/NissaVsObNixilis.java @@ -28,19 +28,17 @@ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class NissaVsObNixilis extends ExpansionSet { + private static final NissaVsObNixilis fINSTANCE = new NissaVsObNixilis(); public static NissaVsObNixilis getInstance() { @@ -48,9 +46,10 @@ public class NissaVsObNixilis extends ExpansionSet { } private NissaVsObNixilis() { - super("Duel Decks: Nissa vs. Ob Nixilis", "DDR", "mage.sets.nissavsobnixilis", new GregorianCalendar(2016, 9, 2).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Nissa vs. Ob Nixilis", "DDR", "mage.sets.nissavsobnixilis", ExpansionSet.buildDate(2016, 9, 2), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Abundance", 2, Rarity.RARE, mage.cards.a.Abundance.class)); cards.add(new SetCardInfo("Altar's Reap", 37, Rarity.COMMON, mage.cards.a.AltarsReap.class)); cards.add(new SetCardInfo("Ambition's Cost", 38, Rarity.UNCOMMON, mage.cards.a.AmbitionsCost.class)); diff --git a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java index 1a619bbd299..e617769a1fb 100644 --- a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java +++ b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java @@ -33,7 +33,7 @@ public class OathOfTheGatewatch extends ExpansionSet { protected final List savedSpecialLand = new ArrayList<>(); private OathOfTheGatewatch() { - super("Oath of the Gatewatch", "OGW", "mage.sets.oathofthegatewatch", new GregorianCalendar(2016, 1, 22).getTime(), SetType.EXPANSION); + super("Oath of the Gatewatch", "OGW", "mage.sets.oathofthegatewatch", 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 965a4dc035a..c55e1a37edc 100644 --- a/Mage.Sets/src/mage/sets/Odyssey.java +++ b/Mage.Sets/src/mage/sets/Odyssey.java @@ -45,7 +45,7 @@ public class Odyssey extends ExpansionSet { } private Odyssey() { - super("Odyssey", "ODY", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), SetType.EXPANSION); + super("Odyssey", "ODY", "mage.sets.odyssey", 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 e8929530085..94eb7425998 100644 --- a/Mage.Sets/src/mage/sets/Onslaught.java +++ b/Mage.Sets/src/mage/sets/Onslaught.java @@ -18,7 +18,7 @@ public class Onslaught extends ExpansionSet { } private Onslaught() { - super("Onslaught", "ONS", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), SetType.EXPANSION); + super("Onslaught", "ONS", "mage.sets.onslaught", 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 04a9db4de5d..4e958c8861c 100644 --- a/Mage.Sets/src/mage/sets/PDSFireAndLightning.java +++ b/Mage.Sets/src/mage/sets/PDSFireAndLightning.java @@ -24,24 +24,20 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author fireshoes */ public class PDSFireAndLightning extends ExpansionSet { + private static final PDSFireAndLightning fINSTANCE = new PDSFireAndLightning(); public static PDSFireAndLightning getInstance() { @@ -49,7 +45,7 @@ public class PDSFireAndLightning extends ExpansionSet { } private PDSFireAndLightning() { - super("Premium Deck Series: Fire and Lightning", "PD2", "mage.sets.pdsfireandlightning", new GregorianCalendar(2010, 11, 1).getTime(), + super("Premium Deck Series: Fire and Lightning", "PD2", "mage.sets.pdsfireandlightning", ExpansionSet.buildDate(2010, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Ball Lightning", 12, Rarity.RARE, mage.cards.b.BallLightning.class)); @@ -87,4 +83,4 @@ public class PDSFireAndLightning extends ExpansionSet { cards.add(new SetCardInfo("Thunderbolt", 19, Rarity.COMMON, mage.cards.t.Thunderbolt.class)); cards.add(new SetCardInfo("Vulshok Sorcerer", 11, Rarity.COMMON, mage.cards.v.VulshokSorcerer.class)); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/PDSGraveborn.java b/Mage.Sets/src/mage/sets/PDSGraveborn.java index 19ea2dd13e9..b5518703a68 100644 --- a/Mage.Sets/src/mage/sets/PDSGraveborn.java +++ b/Mage.Sets/src/mage/sets/PDSGraveborn.java @@ -49,7 +49,7 @@ public class PDSGraveborn extends ExpansionSet { } private PDSGraveborn() { - super("Premium Deck Series: Graveborn", "PD3", "mage.sets.pdsgraveborn", new GregorianCalendar(2011, 11, 1).getTime(), SetType.SUPPLEMENTAL); + super("Premium Deck Series: Graveborn", "PD3", "mage.sets.pdsgraveborn", 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 1fff8dd5ffa..967ea6a60a6 100644 --- a/Mage.Sets/src/mage/sets/PDSSlivers.java +++ b/Mage.Sets/src/mage/sets/PDSSlivers.java @@ -49,7 +49,7 @@ public class PDSSlivers extends ExpansionSet { } private PDSSlivers() { - super("Premium Deck Series: Slivers", "H09", "mage.sets.pdsslivers", new GregorianCalendar(2009, 11, 1).getTime(), SetType.SUPPLEMENTAL); + super("Premium Deck Series: Slivers", "H09", "mage.sets.pdsslivers", 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 362681a2b63..e591000c284 100644 --- a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java +++ b/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java @@ -27,21 +27,17 @@ */ 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; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * * @author LevelX2 */ - public class PhyrexiaVsTheCoalition extends ExpansionSet { + private static final PhyrexiaVsTheCoalition fINSTANCE = new PhyrexiaVsTheCoalition(); public static PhyrexiaVsTheCoalition getInstance() { @@ -49,7 +45,7 @@ public class PhyrexiaVsTheCoalition extends ExpansionSet { } private PhyrexiaVsTheCoalition() { - super("Duel Decks: Phyrexia vs. the Coalition", "DDE", "mage.sets.phyrexiavsthecoalition", new GregorianCalendar(2010, 3, 19).getTime(), + super("Duel Decks: Phyrexia vs. the Coalition", "DDE", "mage.sets.phyrexiavsthecoalition", 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 2940e6bcb0f..9b03ce7f710 100644 --- a/Mage.Sets/src/mage/sets/PlanarChaos.java +++ b/Mage.Sets/src/mage/sets/PlanarChaos.java @@ -46,7 +46,7 @@ public class PlanarChaos extends ExpansionSet { } private PlanarChaos() { - super("Planar Chaos", "PLC", "mage.sets.planarchaos", new GregorianCalendar(2007, 1, 2).getTime(), SetType.EXPANSION); + super("Planar Chaos", "PLC", "mage.sets.planarchaos", 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 5638ccf1812..80b724ab486 100644 --- a/Mage.Sets/src/mage/sets/Planechase.java +++ b/Mage.Sets/src/mage/sets/Planechase.java @@ -50,7 +50,7 @@ public class Planechase extends ExpansionSet { } private Planechase() { - super("Planechase", "HOP", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.SUPPLEMENTAL); + super("Planechase", "HOP", "mage.sets.planechase", 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 da12b6a0ba3..f9112b64a3f 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -50,7 +50,7 @@ public class Planechase2012 extends ExpansionSet { } private Planechase2012() { - super("Planechase 2012 Edition", "PC2", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.SUPPLEMENTAL); + super("Planechase 2012 Edition", "PC2", "mage.sets.planechase2012", 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 589fc9a622e..5feaf04ddda 100644 --- a/Mage.Sets/src/mage/sets/PlanechaseAnthology.java +++ b/Mage.Sets/src/mage/sets/PlanechaseAnthology.java @@ -24,15 +24,12 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.sets; import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import mage.constants.Rarity; -import java.util.List; /** * @@ -47,8 +44,8 @@ public class PlanechaseAnthology extends ExpansionSet { } private PlanechaseAnthology() { - super("Planechase Anthology", "PCA", "mage.sets.planechaseanthology", new GregorianCalendar(2016, 11, 25).getTime(), SetType.SUPPLEMENTAL); + super("Planechase Anthology", "PCA", "mage.sets.planechaseanthology", ExpansionSet.buildDate(2016, 11, 25), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java index 8cd7167cc1a..74e892920f4 100644 --- a/Mage.Sets/src/mage/sets/Planeshift.java +++ b/Mage.Sets/src/mage/sets/Planeshift.java @@ -49,7 +49,7 @@ public class Planeshift extends ExpansionSet { } private Planeshift() { - super("Planeshift", "PLS", "mage.sets.planeshift", new GregorianCalendar(2001, 1, 5).getTime(), SetType.EXPANSION); + super("Planeshift", "PLS", "mage.sets.planeshift", 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 5f96b61c7a8..55a1ddcf78b 100644 --- a/Mage.Sets/src/mage/sets/Portal.java +++ b/Mage.Sets/src/mage/sets/Portal.java @@ -55,7 +55,7 @@ public class Portal extends ExpansionSet { } private Portal() { - super("Portal", "POR", "mage.sets.portal", new GregorianCalendar(1997, 5, 1).getTime(), SetType.SUPPLEMENTAL); + super("Portal", "POR", "mage.sets.portal", 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 3d66c4c00ec..86a6ebe59dd 100644 --- a/Mage.Sets/src/mage/sets/PortalSecondAge.java +++ b/Mage.Sets/src/mage/sets/PortalSecondAge.java @@ -55,7 +55,7 @@ public class PortalSecondAge extends ExpansionSet { } private PortalSecondAge() { - super("Portal Second Age", "PO2", "mage.sets.portalsecondage", new GregorianCalendar(1998, 6, 24).getTime(), SetType.SUPPLEMENTAL); + super("Portal Second Age", "PO2", "mage.sets.portalsecondage", 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 131b484f33e..b38f31ddec9 100644 --- a/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java +++ b/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java @@ -50,7 +50,7 @@ public class PortalThreeKingdoms extends ExpansionSet { } private PortalThreeKingdoms() { - super("Portal Three Kingdoms", "PTK", "mage.sets.portalthreekingdoms", new GregorianCalendar(1999, 5, 1).getTime(), SetType.SUPPLEMENTAL); + super("Portal Three Kingdoms", "PTK", "mage.sets.portalthreekingdoms", 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 608d8078b3d..dd51db4d5a6 100644 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ b/Mage.Sets/src/mage/sets/PrereleaseEvents.java @@ -18,7 +18,7 @@ public class PrereleaseEvents extends ExpansionSet { } private PrereleaseEvents() { - super("Prerelease Events", "PTC", "mage.sets.prereleaseevents", new GregorianCalendar(1990, 1, 1).getTime(), SetType.PROMOTIONAL); + super("Prerelease Events", "PTC", "mage.sets.prereleaseevents", 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 d0d0eaf2bd9..06c6481493b 100644 --- a/Mage.Sets/src/mage/sets/Prophecy.java +++ b/Mage.Sets/src/mage/sets/Prophecy.java @@ -47,7 +47,7 @@ public class Prophecy extends ExpansionSet { } private Prophecy() { - super("Prophecy", "PCY", "mage.sets.prophecy", new GregorianCalendar(2000, 4, 27).getTime(), SetType.EXPANSION); + super("Prophecy", "PCY", "mage.sets.prophecy", 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 d3eb39a1339..4f6664b844a 100644 --- a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java +++ b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java @@ -50,7 +50,7 @@ public class RavnicaCityOfGuilds extends ExpansionSet { } private RavnicaCityOfGuilds() { - super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnica", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION); + super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnica", 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 3e706502658..45c515af111 100644 --- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java +++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java @@ -50,7 +50,7 @@ public class ReturnToRavnica extends ExpansionSet { } private ReturnToRavnica() { - super("Return to Ravnica", "RTR", "mage.sets.returntoravnica", new GregorianCalendar(2012, 9, 29).getTime(), SetType.EXPANSION); + super("Return to Ravnica", "RTR", "mage.sets.returntoravnica", 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 070f34c8380..8354b090488 100644 --- a/Mage.Sets/src/mage/sets/RevisedEdition.java +++ b/Mage.Sets/src/mage/sets/RevisedEdition.java @@ -23,7 +23,7 @@ public class RevisedEdition extends ExpansionSet { } private RevisedEdition() { - super("Revised Edition", "3ED", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), SetType.CORE); + super("Revised Edition", "3ED", "mage.sets.revisededition", 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 1ad427c1053..4cf8b2a7e2f 100644 --- a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java +++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java @@ -50,7 +50,7 @@ public class RiseOfTheEldrazi extends ExpansionSet { } private RiseOfTheEldrazi() { - super("Rise of the Eldrazi", "ROE", "mage.sets.riseoftheeldrazi", new GregorianCalendar(2010, 3, 17).getTime(), SetType.EXPANSION); + super("Rise of the Eldrazi", "ROE", "mage.sets.riseoftheeldrazi", 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 42d10472ee2..bb4c697f203 100644 --- a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java @@ -46,7 +46,7 @@ public class SaviorsOfKamigawa extends ExpansionSet { } private SaviorsOfKamigawa() { - super("Saviors of Kamigawa", "SOK", "mage.sets.saviorsofkamigawa", new GregorianCalendar(2005, 5, 3).getTime(), SetType.EXPANSION); + super("Saviors of Kamigawa", "SOK", "mage.sets.saviorsofkamigawa", 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 09554f26423..1680833bdc5 100644 --- a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java +++ b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java @@ -51,7 +51,7 @@ public class ScarsOfMirrodin extends ExpansionSet { } private ScarsOfMirrodin() { - super("Scars of Mirrodin", "SOM", "mage.sets.scarsofmirrodin", new GregorianCalendar(2010, 10, 1).getTime(), SetType.EXPANSION); + super("Scars of Mirrodin", "SOM", "mage.sets.scarsofmirrodin", 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 e9cd29ef29f..044fdb0516c 100644 --- a/Mage.Sets/src/mage/sets/Scourge.java +++ b/Mage.Sets/src/mage/sets/Scourge.java @@ -47,7 +47,7 @@ public class Scourge extends ExpansionSet { } private Scourge() { - super("Scourge", "SCG", "mage.sets.scourge", new GregorianCalendar(2003, 5, 17).getTime(), SetType.EXPANSION); + super("Scourge", "SCG", "mage.sets.scourge", 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 615ccc32781..db71a771290 100644 --- a/Mage.Sets/src/mage/sets/SeventhEdition.java +++ b/Mage.Sets/src/mage/sets/SeventhEdition.java @@ -50,7 +50,7 @@ public class SeventhEdition extends ExpansionSet { } private SeventhEdition() { - super("Seventh Edition", "7ED", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), SetType.CORE); + super("Seventh Edition", "7ED", "mage.sets.seventhedition", 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 f476c5577ce..af12876e186 100644 --- a/Mage.Sets/src/mage/sets/Shadowmoor.java +++ b/Mage.Sets/src/mage/sets/Shadowmoor.java @@ -49,7 +49,7 @@ public class Shadowmoor extends ExpansionSet { } private Shadowmoor() { - super("Shadowmoor", "SHM", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION); + super("Shadowmoor", "SHM", "mage.sets.shadowmoor", 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 2238d9c5b1d..abee1d117c7 100644 --- a/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java +++ b/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java @@ -29,9 +29,9 @@ package mage.sets; import java.util.ArrayList; import java.util.EnumMap; -import java.util.GregorianCalendar; import java.util.List; import mage.cards.Card; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; @@ -39,9 +39,6 @@ import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; import mage.util.RandomUtil; -import mage.ObjectColor; -import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; /** * @@ -58,7 +55,7 @@ public class ShadowsOverInnistrad extends ExpansionSet { protected final EnumMap> savedDoubleFacedCards; private ShadowsOverInnistrad() { - super("Shadows over Innistrad", "SOI", "mage.sets.shadowsoverinnistrad", new GregorianCalendar(2016, 3, 8).getTime(), SetType.EXPANSION); + super("Shadows over Innistrad", "SOI", "mage.sets.shadowsoverinnistrad", 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 40dc0607a82..99965e545be 100644 --- a/Mage.Sets/src/mage/sets/ShardsOfAlara.java +++ b/Mage.Sets/src/mage/sets/ShardsOfAlara.java @@ -50,7 +50,7 @@ public class ShardsOfAlara extends ExpansionSet { } private ShardsOfAlara() { - super("Shards of Alara", "ALA", "mage.sets.shardsofalara", new GregorianCalendar(2008, 8, 27).getTime(), SetType.EXPANSION); + super("Shards of Alara", "ALA", "mage.sets.shardsofalara", 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 47ea994ccab..cead21335f3 100644 --- a/Mage.Sets/src/mage/sets/SorinVsTibalt.java +++ b/Mage.Sets/src/mage/sets/SorinVsTibalt.java @@ -49,7 +49,7 @@ public class SorinVsTibalt extends ExpansionSet { } private SorinVsTibalt() { - super("Duel Decks: Sorin vs. Tibalt", "DDK", "mage.sets.sorinvstibalt", new GregorianCalendar(2013, 3, 15).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Sorin vs. Tibalt", "DDK", "mage.sets.sorinvstibalt", 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 9054dd9032e..b8eb0867d62 100644 --- a/Mage.Sets/src/mage/sets/SpeedVsCunning.java +++ b/Mage.Sets/src/mage/sets/SpeedVsCunning.java @@ -49,7 +49,7 @@ public class SpeedVsCunning extends ExpansionSet { } private SpeedVsCunning() { - super("Duel Decks: Speed vs. Cunning", "DDN", "mage.sets.speedvscunning", new GregorianCalendar(2014, 9, 5).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Speed vs. Cunning", "DDN", "mage.sets.speedvscunning", 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 2fab1456eb8..d2d7bad70c6 100644 --- a/Mage.Sets/src/mage/sets/StarWars.java +++ b/Mage.Sets/src/mage/sets/StarWars.java @@ -47,7 +47,7 @@ public class StarWars extends ExpansionSet { } private StarWars() { - super("Star Wars", "SWS", "mage.sets.starwars", new GregorianCalendar(2015, 12, 25).getTime(), SetType.CUSTOM_SET); + super("Star Wars", "SWS", "mage.sets.starwars", 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 74f0ddd1b26..b8da07d6646 100644 --- a/Mage.Sets/src/mage/sets/Starter1999.java +++ b/Mage.Sets/src/mage/sets/Starter1999.java @@ -50,7 +50,7 @@ public class Starter1999 extends ExpansionSet { } private Starter1999() { - super("Starter 1999", "S99", "mage.sets.starter1999", new GregorianCalendar(1999, 7, 1).getTime(), SetType.SUPPLEMENTAL); + super("Starter 1999", "S99", "mage.sets.starter1999", 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 415390ea1dd..d94f6ef3859 100644 --- a/Mage.Sets/src/mage/sets/Starter2000.java +++ b/Mage.Sets/src/mage/sets/Starter2000.java @@ -55,7 +55,7 @@ public class Starter2000 extends ExpansionSet { } private Starter2000() { - super("Starter 2000", "S00", "mage.sets.starter2000", new GregorianCalendar(2000, 7, 1).getTime(), SetType.SUPPLEMENTAL); + super("Starter 2000", "S00", "mage.sets.starter2000", 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 ce03b0937c6..9dfb81ebd16 100644 --- a/Mage.Sets/src/mage/sets/Stronghold.java +++ b/Mage.Sets/src/mage/sets/Stronghold.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.constants.SetType; /** * @@ -47,7 +44,7 @@ public class Stronghold extends ExpansionSet { } private Stronghold() { - super("Stronghold", "STH", "mage.sets.stronghold", new GregorianCalendar(1998, 1, 21).getTime(), SetType.EXPANSION); + super("Stronghold", "STH", "mage.sets.stronghold", 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 867ac12ff68..222da87de00 100644 --- a/Mage.Sets/src/mage/sets/SuperSeries.java +++ b/Mage.Sets/src/mage/sets/SuperSeries.java @@ -50,7 +50,7 @@ public class SuperSeries extends ExpansionSet { } private SuperSeries() { - super("Super Series", "SUS", "mage.sets.superseries", new GregorianCalendar(1996, 1, 1).getTime(), SetType.PROMOTIONAL); + super("Super Series", "SUS", "mage.sets.superseries", 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 133ba0e6d34..0be6696537a 100644 --- a/Mage.Sets/src/mage/sets/Tempest.java +++ b/Mage.Sets/src/mage/sets/Tempest.java @@ -1,16 +1,12 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; +import mage.constants.Rarity; 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 Tempest extends ExpansionSet { + private static final Tempest fINSTANCE = new Tempest(); public static Tempest getInstance() { @@ -18,7 +14,7 @@ public class Tempest extends ExpansionSet { } private Tempest() { - super("Tempest", "TMP", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), SetType.EXPANSION); + super("Tempest", "TMP", "mage.sets.tempest", 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 70076653656..358e22d822b 100644 --- a/Mage.Sets/src/mage/sets/TempestRemastered.java +++ b/Mage.Sets/src/mage/sets/TempestRemastered.java @@ -50,7 +50,7 @@ public class TempestRemastered extends ExpansionSet { } private TempestRemastered() { - super("Tempest Remastered", "TPR", "mage.sets.tempestremastered", new GregorianCalendar(2015, 5, 6).getTime(), SetType.MAGIC_ONLINE); + super("Tempest Remastered", "TPR", "mage.sets.tempestremastered", 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 60b8df06e2d..3192b7e59de 100644 --- a/Mage.Sets/src/mage/sets/TenthEdition.java +++ b/Mage.Sets/src/mage/sets/TenthEdition.java @@ -50,7 +50,7 @@ public class TenthEdition extends ExpansionSet { } private TenthEdition() { - super("Tenth Edition", "10E", "mage.sets.tenthedition", new GregorianCalendar(2007, 6, 14).getTime(), SetType.CORE); + super("Tenth Edition", "10E", "mage.sets.tenthedition", 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 73724d11412..1e266f1a33e 100644 --- a/Mage.Sets/src/mage/sets/TheDark.java +++ b/Mage.Sets/src/mage/sets/TheDark.java @@ -47,7 +47,7 @@ public class TheDark extends ExpansionSet { } private TheDark() { - super("The Dark", "DRK", "mage.sets.thedark", new GregorianCalendar(1994, 7, 1).getTime(), SetType.EXPANSION); + super("The Dark", "DRK", "mage.sets.thedark", 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 e52de4422b7..c191267e7a6 100644 --- a/Mage.Sets/src/mage/sets/Theros.java +++ b/Mage.Sets/src/mage/sets/Theros.java @@ -49,7 +49,7 @@ public class Theros extends ExpansionSet { } private Theros() { - super("Theros", "THS", "mage.sets.theros", new GregorianCalendar(2013, 9, 27).getTime(), SetType.EXPANSION); + super("Theros", "THS", "mage.sets.theros", 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 4502bd99d1a..789f587a884 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/TimeSpiral.java @@ -21,7 +21,7 @@ public class TimeSpiral extends ExpansionSet { } private TimeSpiral() { - super("Time Spiral", "TSP", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION); + super("Time Spiral", "TSP", "mage.sets.timespiral", 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 82121804c8d..927a985095d 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java +++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java @@ -46,7 +46,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet { } private TimeSpiralTimeshifted() { - super("Time Spiral \"Timeshifted\"", "TSB", "mage.sets.timeshifted", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION); + super("Time Spiral \"Timeshifted\"", "TSB", "mage.sets.timeshifted", 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 45bceb861ed..e85258937e6 100644 --- a/Mage.Sets/src/mage/sets/Torment.java +++ b/Mage.Sets/src/mage/sets/Torment.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.constants.SetType; /** * @@ -47,7 +44,7 @@ public class Torment extends ExpansionSet { } private Torment() { - super("Torment", "TOR", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), SetType.EXPANSION); + super("Torment", "TOR", "mage.sets.torment", 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 0dcd59e4492..319c67c16a3 100644 --- a/Mage.Sets/src/mage/sets/UginsFate.java +++ b/Mage.Sets/src/mage/sets/UginsFate.java @@ -47,7 +47,7 @@ public class UginsFate extends ExpansionSet { } private UginsFate() { - super("Ugin's Fate", "UGIN", "mage.sets.uginsfate", new GregorianCalendar(2015, 1, 16).getTime(), SetType.PROMOTIONAL); + super("Ugin's Fate", "UGIN", "mage.sets.uginsfate", 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 6467e8efc9f..0fc3291da2c 100644 --- a/Mage.Sets/src/mage/sets/Unglued.java +++ b/Mage.Sets/src/mage/sets/Unglued.java @@ -22,7 +22,7 @@ public class Unglued extends ExpansionSet { } private Unglued() { - super("Unglued", "UGL", "mage.sets.unglued", new GregorianCalendar(1998, 8, 11).getTime(), SetType.JOKESET); + super("Unglued", "UGL", "mage.sets.unglued", 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 ca84b14ffcb..e20b84573d2 100644 --- a/Mage.Sets/src/mage/sets/Unhinged.java +++ b/Mage.Sets/src/mage/sets/Unhinged.java @@ -22,7 +22,7 @@ public class Unhinged extends ExpansionSet { } private Unhinged() { - super("Unhinged", "UNH", "mage.sets.unhinged", new GregorianCalendar(2004, 11, 20).getTime(), SetType.JOKESET); + super("Unhinged", "UNH", "mage.sets.unhinged", 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 405f9b39bd5..f006d6f3671 100644 --- a/Mage.Sets/src/mage/sets/UnlimitedEdition.java +++ b/Mage.Sets/src/mage/sets/UnlimitedEdition.java @@ -23,7 +23,7 @@ public class UnlimitedEdition extends ExpansionSet { } private UnlimitedEdition() { - super("Unlimited Edition", "2ED", "mage.sets.unlimitededition", new GregorianCalendar(1993, 11, 1).getTime(), SetType.CORE); + super("Unlimited Edition", "2ED", "mage.sets.unlimitededition", 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 fe932593305..2c66b6077cd 100644 --- a/Mage.Sets/src/mage/sets/UrzasDestiny.java +++ b/Mage.Sets/src/mage/sets/UrzasDestiny.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; +import mage.constants.SetType; /** * @@ -46,7 +44,7 @@ public class UrzasDestiny extends ExpansionSet { } private UrzasDestiny() { - super("Urza's Destiny", "UDS", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION); + super("Urza's Destiny", "UDS", "mage.sets.urzasdestiny", 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 7d8e29ff6b6..96de90c48a6 100644 --- a/Mage.Sets/src/mage/sets/UrzasLegacy.java +++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java @@ -24,16 +24,12 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ 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.constants.SetType; /** * @@ -48,7 +44,7 @@ public class UrzasLegacy extends ExpansionSet { } private UrzasLegacy() { - super("Urza's Legacy", "ULG", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION); + super("Urza's Legacy", "ULG", "mage.sets.urzaslegacy", 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 ae3d1e1ded6..80c3ea9f7ab 100644 --- a/Mage.Sets/src/mage/sets/UrzasSaga.java +++ b/Mage.Sets/src/mage/sets/UrzasSaga.java @@ -24,18 +24,13 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.sets; -import java.util.GregorianCalendar; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import java.util.List; -import mage.ObjectColor; -import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; +import mage.constants.SetType; /** * @@ -50,7 +45,7 @@ public class UrzasSaga extends ExpansionSet { } private UrzasSaga() { - super("Urza's Saga", "USG", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION); + super("Urza's Saga", "USG", "mage.sets.urzassaga", 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 4d10b3eed99..5e7d53680c1 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/VenserVsKoth.java @@ -50,7 +50,7 @@ public class VenserVsKoth extends ExpansionSet { } private VenserVsKoth() { - super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", new GregorianCalendar(2012, 3, 30).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", 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 0ac4a1ddc09..e04ab6d4298 100644 --- a/Mage.Sets/src/mage/sets/VintageMasters.java +++ b/Mage.Sets/src/mage/sets/VintageMasters.java @@ -50,7 +50,7 @@ public class VintageMasters extends ExpansionSet { } private VintageMasters() { - super("Vintage Masters", "VMA", "mage.sets.vintagemasters", new GregorianCalendar(2014, 6, 16).getTime(), SetType.MAGIC_ONLINE); + super("Vintage Masters", "VMA", "mage.sets.vintagemasters", 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 995b5652a7b..95a144ff6b9 100644 --- a/Mage.Sets/src/mage/sets/Visions.java +++ b/Mage.Sets/src/mage/sets/Visions.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.constants.SetType; /** * @@ -47,7 +44,7 @@ public class Visions extends ExpansionSet { } private Visions() { - super("Visions", "VIS", "mage.sets.visions", new GregorianCalendar(1997, 0, 11).getTime(), SetType.EXPANSION); + super("Visions", "VIS", "mage.sets.visions", 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 5d2a51a7525..5eec5005e9b 100644 --- a/Mage.Sets/src/mage/sets/WPNGateway.java +++ b/Mage.Sets/src/mage/sets/WPNGateway.java @@ -24,7 +24,7 @@ public class WPNGateway extends ExpansionSet { } private WPNGateway() { - super("WPN Gateway", "GRC", "mage.sets.wpngateway", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("WPN Gateway", "GRC", "mage.sets.wpngateway", 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 f59ff16f054..9a288f10673 100644 --- a/Mage.Sets/src/mage/sets/Weatherlight.java +++ b/Mage.Sets/src/mage/sets/Weatherlight.java @@ -48,7 +48,7 @@ public class Weatherlight extends ExpansionSet { } private Weatherlight() { - super("Weatherlight", "WTH", "mage.sets.weatherlight", new GregorianCalendar(1997, 5, 31).getTime(), SetType.EXPANSION); + super("Weatherlight", "WTH", "mage.sets.weatherlight", 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 65a096d3dfb..ac79e8f52cb 100644 --- a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java +++ b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java @@ -46,7 +46,7 @@ public class WelcomeDeck2016 extends ExpansionSet { } private WelcomeDeck2016() { - super("Welcome Deck 2016", "W16", "mage.sets.welcomedeck2016", new GregorianCalendar(2016, 3, 8).getTime(), SetType.SUPPLEMENTAL_STANDARD_LEGAL); + super("Welcome Deck 2016", "W16", "mage.sets.welcomedeck2016", 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 0819b4fbdb9..eaa7306d9b3 100644 --- a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java +++ b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java @@ -47,7 +47,7 @@ public class WorldMagicCupQualifier extends ExpansionSet { } private WorldMagicCupQualifier() { - super("World Magic Cup Qualifier", "WMCQ", "mage.sets.worldmagiccupqualifier", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); + super("World Magic Cup Qualifier", "WMCQ", "mage.sets.worldmagiccupqualifier", 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 57122ea9c5a..7dad44c27f4 100644 --- a/Mage.Sets/src/mage/sets/Worldwake.java +++ b/Mage.Sets/src/mage/sets/Worldwake.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,19 +20,16 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - 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.constants.SetType; /** * @@ -47,7 +44,7 @@ public class Worldwake extends ExpansionSet { } private Worldwake() { - super("Worldwake", "WWK", "mage.sets.worldwake", new GregorianCalendar(2010, 0, 30).getTime(), SetType.EXPANSION); + super("Worldwake", "WWK", "mage.sets.worldwake", 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 f1e9c80da16..afcd17e1a4b 100644 --- a/Mage.Sets/src/mage/sets/Zendikar.java +++ b/Mage.Sets/src/mage/sets/Zendikar.java @@ -50,7 +50,7 @@ public class Zendikar extends ExpansionSet { } private Zendikar() { - super("Zendikar", "ZEN", "mage.sets.zendikar", new GregorianCalendar(2009, 8, 26).getTime(), SetType.EXPANSION); + super("Zendikar", "ZEN", "mage.sets.zendikar", 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 643b1c5f938..e2fe2c056ed 100644 --- a/Mage.Sets/src/mage/sets/ZendikarExpeditions.java +++ b/Mage.Sets/src/mage/sets/ZendikarExpeditions.java @@ -46,7 +46,7 @@ public class ZendikarExpeditions extends ExpansionSet { } private ZendikarExpeditions() { - super("Zendikar Expeditions", "EXP", "mage.sets.zendikarexpeditions", new GregorianCalendar(2015, 10, 2).getTime(), SetType.PROMOTIONAL); + super("Zendikar Expeditions", "EXP", "mage.sets.zendikarexpeditions", 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 254d1d8e314..e70bac3db82 100644 --- a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java +++ b/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java @@ -50,7 +50,7 @@ public class ZendikarVsEldrazi extends ExpansionSet { } private ZendikarVsEldrazi() { - super("Duel Decks: Zendikar vs. Eldrazi", "DDP", "mage.sets.zendikarvseldrazi", new GregorianCalendar(2015, 8, 28).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Zendikar vs. Eldrazi", "DDP", "mage.sets.zendikarvseldrazi", 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 f69dabcdb6e..c2e84a1b81f 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -31,6 +31,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.EnumMap; +import java.util.GregorianCalendar; import java.util.Iterator; import java.util.List; import mage.cards.repository.CardCriteria; @@ -298,6 +299,11 @@ public abstract class ExpansionSet implements Serializable { } } + public static Date buildDate(int year, int month, int day) { + // The month starts with 0 = jan ... dec = 11 + return new GregorianCalendar(year, month - 1, day).getTime(); + } + /** * Can be overwritten if sometimes special cards will be generated instead * of common slots