deck: fixed outdated names for some old sets (part 2)

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java

@@ -543,7 +543,7 @@ public class ScryfallImageSupportCards {
             add("WOT"); // Wilds of Eldraine: Enchanting Tales
             add("WOC"); // Wilds of Eldraine Commander
             add("LCI"); // The Lost Caverns of Ixalan
-            add("LCC"); // The Lost Caverns of Ixalan Commander
+            add("LCC"); // The The Lost Caverns of Ixalan Commander
             add("REX"); // Jurassic World Collection
             add("SPG"); // Special Guests
             add("RVR"); // Ravnica Remastered

Mage.Sets/src/mage/sets/DuelDecksAnthologyDivineVsDemonic.java

@@ -16,7 +16,7 @@ public static DuelDecksAnthologyDivineVsDemonic getInstance() {
     }
 
     private DuelDecksAnthologyDivineVsDemonic() {
-        super("Duel Decks: Anthology, Divine vs. Demonic", "DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL);
+        super("Duel Decks Anthology: Divine vs. Demonic", "DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL);
         this.blockName = "Duel Decks: Anthology";
         this.hasBasicLands = true;
 

Mage.Sets/src/mage/sets/DuelDecksAnthologyElvesVsGoblins.java

@@ -16,7 +16,7 @@ public static DuelDecksAnthologyElvesVsGoblins getInstance() {
     }
 
     private DuelDecksAnthologyElvesVsGoblins() {
-        super("Duel Decks: Anthology, Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2014, 12, 5),
+        super("Duel Decks Anthology: Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2014, 12, 5),
                 SetType.SUPPLEMENTAL);
         this.blockName = "Duel Decks: Anthology";
         this.hasBasicLands = true;

Mage.Sets/src/mage/sets/DuelDecksAnthologyGarrukVsLiliana.java

@@ -17,7 +17,7 @@ public static DuelDecksAnthologyGarrukVsLiliana getInstance() {
     }
 
     private DuelDecksAnthologyGarrukVsLiliana() {
-        super("Duel Decks: Anthology, Garruk vs. Liliana", "GVL", ExpansionSet.buildDate(2014, 12, 5),
+        super("Duel Decks Anthology: Garruk vs. Liliana", "GVL", ExpansionSet.buildDate(2014, 12, 5),
                 SetType.SUPPLEMENTAL);
         this.blockName = "Duel Decks: Anthology";
         this.hasBasicLands = true;

Mage.Sets/src/mage/sets/DuelDecksAnthologyJaceVsChandra.java

@@ -17,7 +17,7 @@ public static DuelDecksAnthologyJaceVsChandra getInstance() {
     }
 
     private DuelDecksAnthologyJaceVsChandra() {
-        super("Duel Decks: Anthology, Jace vs. Chandra", "JVC", ExpansionSet.buildDate(2014, 12, 5),
+        super("Duel Decks Anthology: Jace vs. Chandra", "JVC", ExpansionSet.buildDate(2014, 12, 5),
                 SetType.SUPPLEMENTAL);
         this.blockName = "Duel Decks: Anthology";
         this.hasBasicLands = true;

Mage.Sets/src/mage/sets/GuildsOfRavnicaGuildKits.java → Mage.Sets/src/mage/sets/GRNGuildKit.java

@@ -8,16 +8,16 @@
 /**
  * @author TheElk801
  */
-public final class GuildsOfRavnicaGuildKits extends ExpansionSet {
+public final class GRNGuildKit extends ExpansionSet {
 
-    private static final GuildsOfRavnicaGuildKits instance = new GuildsOfRavnicaGuildKits();
+    private static final GRNGuildKit instance = new GRNGuildKit();
 
-    public static GuildsOfRavnicaGuildKits getInstance() {
+    public static GRNGuildKit getInstance() {
         return instance;
     }
 
-    private GuildsOfRavnicaGuildKits() {
-        super("Guilds of Ravnica Guild Kits", "GK1", ExpansionSet.buildDate(2018, 11, 2), SetType.SUPPLEMENTAL);
+    private GRNGuildKit() {
+        super("GRN Guild Kit", "GK1", ExpansionSet.buildDate(2018, 11, 2), SetType.SUPPLEMENTAL);
         this.blockName = "Guild Kits";
         this.hasBasicLands = true;
 

Mage.Sets/src/mage/sets/GlobalSeriesJiangYangguAndMuYanling.java

@@ -16,7 +16,7 @@ public static GlobalSeriesJiangYangguAndMuYanling getInstance() {
     }
 
     private GlobalSeriesJiangYangguAndMuYanling() {
-        super("Global Series: Jiang Yanggu & Mu Yanling", "GS1", ExpansionSet.buildDate(2018, 6, 22), SetType.SUPPLEMENTAL);
+        super("Global Series Jiang Yanggu & Mu Yanling", "GS1", ExpansionSet.buildDate(2018, 6, 22), SetType.SUPPLEMENTAL);
         this.blockName = "Global Series";
         this.hasBasicLands = true;
 

Mage.Sets/src/mage/sets/HASCONPromo2017.java → Mage.Sets/src/mage/sets/HasCon2017.java

@@ -8,16 +8,16 @@
 /**
  * @author Saga
  */
-public final class HASCONPromo2017 extends ExpansionSet {
+public final class HasCon2017 extends ExpansionSet {
 
-    private static final HASCONPromo2017 instance = new HASCONPromo2017();
+    private static final HasCon2017 instance = new HasCon2017();
 
-    public static HASCONPromo2017 getInstance() {
+    public static HasCon2017 getInstance() {
         return instance;
     }
 
-    private HASCONPromo2017() {
-        super("HASCON Promo 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKE_SET);
+    private HasCon2017() {
+        super("HasCon 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKE_SET);
         this.hasBasicLands = false;
 
         cards.add(new ExpansionSet.SetCardInfo("Grimlock, Dinobot Leader", 1, Rarity.MYTHIC, mage.cards.g.GrimlockDinobotLeader.class));

Mage.Sets/src/mage/sets/MysteryBoosterPlaytest.java → Mage.Sets/src/mage/sets/MysteryBoosterPlaytestCards2019.java

@@ -10,16 +10,16 @@
  * https://scryfall.com/sets/cmb1
  *
  */
-public class MysteryBoosterPlaytest extends ExpansionSet {
+public class MysteryBoosterPlaytestCards2019 extends ExpansionSet {
 
-    private static final MysteryBoosterPlaytest instance = new MysteryBoosterPlaytest();
+    private static final MysteryBoosterPlaytestCards2019 instance = new MysteryBoosterPlaytestCards2019();
 
-    public static MysteryBoosterPlaytest getInstance() {
+    public static MysteryBoosterPlaytestCards2019 getInstance() {
         return instance;
     }
 
-    private MysteryBoosterPlaytest() {
-        super("Mystery Booster Playtest", "CMB1", ExpansionSet.buildDate(2019, 11, 7), SetType.JOKE_SET);
+    private MysteryBoosterPlaytestCards2019() {
+        super("Mystery Booster Playtest Cards 2019", "CMB1", ExpansionSet.buildDate(2019, 11, 7), SetType.JOKE_SET);
         this.hasBoosters = false;
         this.hasBasicLands = false;
 

Mage.Sets/src/mage/sets/RavnicaAllegianceGuildKits.java → Mage.Sets/src/mage/sets/RNAGuildKit.java

@@ -7,16 +7,16 @@
 /**
  * @author JayDi85
  */
-public final class RavnicaAllegianceGuildKits extends ExpansionSet {
+public final class RNAGuildKit extends ExpansionSet {
 
-    private static final RavnicaAllegianceGuildKits instance = new RavnicaAllegianceGuildKits();
+    private static final RNAGuildKit instance = new RNAGuildKit();
 
-    public static RavnicaAllegianceGuildKits getInstance() {
+    public static RNAGuildKit getInstance() {
         return instance;
     }
 
-    private RavnicaAllegianceGuildKits() {
-        super("Ravnica Allegiance Guild Kits", "GK2", ExpansionSet.buildDate(2019, 2, 15), SetType.SUPPLEMENTAL);
+    private RNAGuildKit() {
+        super("RNA Guild Kit", "GK2", ExpansionSet.buildDate(2019, 2, 15), SetType.SUPPLEMENTAL);
         this.blockName = "Guild Kits";
         this.hasBasicLands = true;
 

Mage.Sets/src/mage/sets/SecretLairThirtiethAnniversaryCountdownKit.java → Mage.Sets/src/mage/sets/SecretLair30thAnniversaryCountdownKit.java

@@ -7,15 +7,15 @@
 /**
  * https://scryfall.com/sets/slc
  */
-public class SecretLairThirtiethAnniversaryCountdownKit extends ExpansionSet {
+public class SecretLair30thAnniversaryCountdownKit extends ExpansionSet {
 
-    private static final SecretLairThirtiethAnniversaryCountdownKit instance = new SecretLairThirtiethAnniversaryCountdownKit();
+    private static final SecretLair30thAnniversaryCountdownKit instance = new SecretLair30thAnniversaryCountdownKit();
 
-    public static SecretLairThirtiethAnniversaryCountdownKit getInstance() {
+    public static SecretLair30thAnniversaryCountdownKit getInstance() {
         return instance;
     }
 
-    private SecretLairThirtiethAnniversaryCountdownKit() {
+    private SecretLair30thAnniversaryCountdownKit() {
         super("Secret Lair 30th Anniversary Countdown Kit", "SLC", ExpansionSet.buildDate(2022, 11, 1), SetType.PROMOTIONAL);
         this.hasBasicLands = false;
 

Mage.Sets/src/mage/sets/GiftPack2017.java → Mage.Sets/src/mage/sets/The2017GiftPack.java

@@ -7,16 +7,16 @@
 /**
  * https://scryfall.com/sets/g17
  */
-public class GiftPack2017 extends ExpansionSet {
+public class The2017GiftPack extends ExpansionSet {
 
-    private static final GiftPack2017 instance = new GiftPack2017();
+    private static final The2017GiftPack instance = new The2017GiftPack();
 
-    public static GiftPack2017 getInstance() {
+    public static The2017GiftPack getInstance() {
         return instance;
     }
 
-    private GiftPack2017() {
-        super("Gift Pack 2017", "G17", ExpansionSet.buildDate(2017, 10, 20), SetType.PROMOTIONAL);
+    private The2017GiftPack() {
+        super("2017 Gift Pack", "G17", ExpansionSet.buildDate(2017, 10, 20), SetType.PROMOTIONAL);
         this.hasBoosters = false;
         this.hasBasicLands = true;
 

Mage.Sets/src/mage/sets/ThirtiethAnniversaryEdition.java → Mage.Sets/src/mage/sets/The30thAnniversaryEdition.java

@@ -9,15 +9,15 @@
  *
  * @author JayDi85
  */
-public class ThirtiethAnniversaryEdition extends ExpansionSet {
+public class The30thAnniversaryEdition extends ExpansionSet {
 
-    private static final ThirtiethAnniversaryEdition instance = new ThirtiethAnniversaryEdition();
+    private static final The30thAnniversaryEdition instance = new The30thAnniversaryEdition();
 
-    public static ThirtiethAnniversaryEdition getInstance() {
+    public static The30thAnniversaryEdition getInstance() {
         return instance;
     }
 
-    private ThirtiethAnniversaryEdition() {
+    private The30thAnniversaryEdition() {
         super("30th Anniversary Edition", "30A", ExpansionSet.buildDate(2022, 11, 28), SetType.PROMOTIONAL);
         this.hasBasicLands = true;
         this.numBoosterLands = 3;

Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java → Mage.Sets/src/mage/sets/TheLostCavernsOfIxalanCommander.java

@@ -8,16 +8,16 @@
 /**
  * @author Susucr
  */
-public final class LostCavernsOfIxalanCommander extends ExpansionSet {
+public final class TheLostCavernsOfIxalanCommander extends ExpansionSet {
 
-    private static final LostCavernsOfIxalanCommander instance = new LostCavernsOfIxalanCommander();
+    private static final TheLostCavernsOfIxalanCommander instance = new TheLostCavernsOfIxalanCommander();
 
-    public static LostCavernsOfIxalanCommander getInstance() {
+    public static TheLostCavernsOfIxalanCommander getInstance() {
         return instance;
     }
 
-    private LostCavernsOfIxalanCommander() {
-        super("Lost Caverns of Ixalan Commander", "LCC", ExpansionSet.buildDate(2023, 11, 17), SetType.SUPPLEMENTAL);
+    private TheLostCavernsOfIxalanCommander() {
+        super("The Lost Caverns of Ixalan Commander", "LCC", ExpansionSet.buildDate(2023, 11, 17), SetType.SUPPLEMENTAL);
         this.hasBoosters = false;
         this.hasBasicLands = false;
 

Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java

@@ -904,13 +904,14 @@ public void test_checkMissingSetData() {
             String needClassName = Arrays.stream(
                     set.getName()
                             .replaceAll("&", "And")
-                            .replaceAll("30th", "Thirtieth")
+                            .replaceAll("^(\\d+)", "The$1") // replace starting "2007 xxx" by "The2007"
                             .replace("-", " ")
                             .replaceAll("[.+-/:\"']", "")
                             .split(" ")
             ).map(CardUtil::getTextWithFirstCharUpperCase).reduce("", String::concat);
 
             if (!className.equals(needClassName)) {
+                // if set name start with a numbers then add "The" at the start
                 errorsList.add("Error: set's class name must be equal to set name: "
                         + className + " from " + set.getClass().getName() + ", caption: " + set.getName() + ", need name: " + needClassName);
             }

Utils/known-sets.txt

@@ -60,10 +60,10 @@ Dominaria United Commander|DominariaUnitedCommander|
 Dragon's Maze|DragonsMaze|
 Dragons of Tarkir|DragonsOfTarkir|
 Duel Decks: Ajani vs. Nicol Bolas|DuelDecksAjaniVsNicolBolas|
-Duel Decks: Anthology, Divine vs. Demonic|DuelDecksAnthologyDivineVsDemonic|
-Duel Decks: Anthology, Elves vs. Goblins|DuelDecksAnthologyElvesVsGoblins|
-Duel Decks: Anthology, Garruk vs. Liliana|DuelDecksAnthologyGarrukVsLiliana|
-Duel Decks: Anthology, Jace vs. Chandra|DuelDecksAnthologyJaceVsChandra|
+Duel Decks Anthology: Divine vs. Demonic|DuelDecksAnthologyDivineVsDemonic|
+Duel Decks Anthology: Elves vs. Goblins|DuelDecksAnthologyElvesVsGoblins|
+Duel Decks Anthology: Garruk vs. Liliana|DuelDecksAnthologyGarrukVsLiliana|
+Duel Decks Anthology: Jace vs. Chandra|DuelDecksAnthologyJaceVsChandra|
 Duel Decks: Blessed vs. Cursed|DuelDecksBlessedVsCursed|
 Duel Decks: Divine vs. Demonic|DuelDecksDivineVsDemonic|
 Duel Decks: Elspeth vs. Kiora|DuelDecksElspethVsKiora|
@@ -118,13 +118,13 @@ Game Night|GameNight|
 Game Night 2019|GameNight2019|
 Game Night: Free-for-All|GameNightFreeforAll|
 Gatecrash|Gatecrash|
-Global Series: Jiang Yanggu & Mu Yanling|GlobalSeriesJiangYangguAndMuYanling|
+Global Series Jiang Yanggu & Mu Yanling|GlobalSeriesJiangYangguAndMuYanling|
 Grand Prix|GrandPrixPromos|
 Guildpact|Guildpact|
 Guilds of Ravnica|GuildsOfRavnica|
 Guru|Guru|
 Happy Holidays|HappyHolidays|
-HASCON Promo 2017|HASCONPromo2017|
+HasCon 2017|HASCONPromo2017|
 Heroes of the Realm|HeroesOfTheRealm|
 Homelands|Homelands|
 Hour of Devastation|HourOfDevastation|
@@ -160,7 +160,7 @@ The Lord of the Rings: Tales of Middle-earth|TheLordOfTheRingsTalesOfMiddleEarth
 Tales of Middle-earth Commander|TalesOfMiddleEarthCommander|
 Lorwyn|Lorwyn|
 The Lost Caverns of Ixalan|TheLostCavernsOfIxalan|
-Lost Caverns of Ixalan Commander|LostCavernsOfIxalanCommander|
+The Lost Caverns of Ixalan Commander|LostCavernsOfIxalanCommander|
 Magic 2010|Magic2010|
 Magic 2011|Magic2011|
 Magic 2012|Magic2012|