2.1-SNAPSHOT

tcgone · Sep 20, 2023 · 5be89dc · 5be89dc
1 parent 08e80eb
commit 5be89dc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/data/pom.xml b/data/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.tcgone.carddb</groupId>
         <artifactId>carddb</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
     <artifactId>data</artifactId>
     <name>carddb-data</name>

diff --git a/data/src/main/java/tcgone/carddb/data/Importer.java b/data/src/main/java/tcgone/carddb/data/Importer.java
@@ -56,7 +56,7 @@ public class Importer {
   protected Map<String, Card> idToCard;
   protected Map<String, Card> seoNameToCard;
   protected Map<String, Card> pioIdToCard;
-  protected Map<String, Card> cardInfoStringToCard;
+  protected Map<String, Card> cardEnumIdToCard;
   protected Map<String, Collection<Card>> variantsMap;
 
   protected List<Format> allFormats;
@@ -205,7 +205,7 @@ protected void processCards() throws IOException, ImportException {
     idToCard = new THashMap<>();
     pioIdToCard = new THashMap<>();
     seoNameToCard = new THashMap<>();
-    cardInfoStringToCard = new THashMap<>();
+    cardEnumIdToCard = new THashMap<>();
     variantsMap = new THashMap<>();
 
     allExpansions = new ArrayList<>();
@@ -431,7 +431,7 @@ protected void processCards() throws IOException, ImportException {
 
         pioIdToCard.put(card.pioId, card);
         seoNameToCard.put(card.seoName, card);
-        cardInfoStringToCard.put(card.enumId + ":" + expansion.enumId, card);
+        cardEnumIdToCard.put(card.enumId + ":" + expansion.enumId, card);
         allCards.add(card);
 
       } // end expansion

diff --git a/data/src/main/resources/decks/111-overgrowth.yaml b/data/src/main/resources/decks/111-overgrowth.yaml
diff --git a/model/pom.xml b/model/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.tcgone.carddb</groupId>
         <artifactId>carddb</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
     <artifactId>model</artifactId>
     <name>carddb-model</name>

diff --git a/model/src/main/java/tcgone/carddb/model/Rarity.java b/model/src/main/java/tcgone/carddb/model/Rarity.java
@@ -8,14 +8,15 @@
  * @author [email protected]
  */
 public enum Rarity {
-  SHINING,
-  SECRET,
-  PROMO,
-  ULTRA_RARE,
-  RARE_HOLO,
-  RARE,
+  COMMON,
   UNCOMMON,
-  COMMON;
+  RARE,
+  RARE_HOLO,
+  ULTRA_RARE,
+  PROMO,
+  SECRET,
+  SHINING,
+  ;
 
   private final String label;
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>carddb</artifactId>
     <groupId>net.tcgone.carddb</groupId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.tcgone.carddb</groupId>
         <artifactId>carddb</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
     <artifactId>tools</artifactId>
     <name>carddb-tools</name>