clean up core classes

forge-core/src/main/java/forge/StaticData.java

@@ -102,9 +102,4 @@ public class StaticData {
         return variantCards;
     }
 
-    public List<PaperCard> getAllCards() {
-        List<PaperCard> cards = new ArrayList<PaperCard>(commonCards.getAllCards());
-        cards.addAll(variantCards.getAllCards());
-        return cards;
-    }
 }

forge-core/src/main/java/forge/card/CardDb.java

@@ -321,6 +321,11 @@ public final class CardDb implements ICardDatabase {
         return Lists.newArrayList(Iterables.filter(this.roAllCards, predicate));
     }
 
+    @Override
+    public Iterator<PaperCard> iterator() {
+        return this.roAllCards.iterator();
+    }
+
     public Predicate<? super PaperCard> wasPrintedInSets(List<String> setCodes) {
         return new PredicateExistsInSets(setCodes);
     }

forge-core/src/main/java/forge/card/ICardDatabase.java

@@ -8,7 +8,7 @@ import com.google.common.base.Predicate;
 
 import forge.item.PaperCard;
 
-public interface ICardDatabase {
+public interface ICardDatabase extends Iterable<PaperCard> {
     PaperCard tryGetCard(String cardName);
     PaperCard tryGetCard(String cardName, boolean fromLastSet);
     PaperCard tryGetCard(String cardName, String edition);

forge-core/src/main/java/forge/card/mana/ManaCost.java

@@ -100,20 +100,18 @@ public final class ManaCost implements Comparable<ManaCost> {
             return "{" + this.genericCost + "}";
         }
 
-        final StringBuilder xb = new StringBuilder();
         final StringBuilder sb = new StringBuilder();
         if (this.genericCost > 0) {
             sb.append("{" + this.genericCost + "}");
         }
         for (final ManaCostShard s : this.shards) {
             if (s == ManaCostShard.X) {
-                xb.append(s.toString());
-            }
-            else {
+                sb.insert(0, s.toString());
+            } else {
                 sb.append(s.toString());
             }
         }
-        return xb.toString() + sb.toString();
+        return sb.toString();
     }
 
     /**