Added MBS (sets, Collection Viewer, Downloader).

Mage.Client/src/main/java/mage/client/cards/CardsStorage.java

@@ -2,10 +2,7 @@ package mage.client.cards;
 
 import mage.Constants;
 import mage.cards.Card;
-import mage.cards.CardImpl;
-import mage.cards.CardsImpl;
 import mage.cards.ExpansionSet;
-import mage.sets.ScarsOfMirrodin;
 import mage.sets.Sets;
 import mage.utils.CardUtil;
 
@@ -163,15 +160,26 @@ public class CardsStorage {
 			if (allCards.size() == 0) {
 				return cards;
 			}
-            Card tmp = allCards.get(0);
+
 			Set<String> names = new HashSet<String>();
 			for (Card card : allCards) {
 				names.add(card.getExpansionSetCode() + card.getName());
 			}
+
+			readUnimplemented("SOM", "/som.txt", names, cards);
+			readUnimplemented("MBS", "/mbs.txt", names, cards);
+
+			names.clear();
+			names = null;
+		}
+		return cards;
+	}
+
+	private static void readUnimplemented(String set, String filename, Set<String> names, List<Card> cards) {
 		try {
+			Card tmp = allCards.get(0);
 			InputStream is = CardsStorage.class.getResourceAsStream(filename);
 			Scanner scanner = new Scanner(is);
-                String set = "SOM";
 			while (scanner.hasNextLine()) {
 				String line = scanner.nextLine();
 				String[] s = line.split("\\|");
@@ -192,10 +200,6 @@ public class CardsStorage {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-            names.clear();
-            names = null;
-        }
-        return cards;
 	}
 
 	public static void main(String[] argv) {
@@ -249,6 +253,7 @@ public class CardsStorage {
 	 */
 	private static class SetComparator implements Comparator<String> {
 		private static final String LATEST_SET_CODE = "SOM";
+		private static final String LATEST_SET_CODE_2 = "MBS";
 
 		@Override
 		public int compare(String set1, String set2) {
@@ -259,6 +264,13 @@ public class CardsStorage {
 			if (set2.equals(LATEST_SET_CODE)) {
 				return 1;
 			}
+
+			if (set1.equals(LATEST_SET_CODE_2)) {
+				return -1;
+			}
+			if (set2.equals(LATEST_SET_CODE_2)) {
+				return 1;
+			}
 			return set1.compareTo(set2);
 		}
 	}

Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java

@@ -295,10 +295,9 @@ public class MageBook extends JComponent {
     private HoverButton pageRight;
 
     private int currentPage = 0;
-    private String currentSet = "SOM";
+    private String currentSet = "MBS";
 
     private static CardDimensions cardDimensions = new CardDimensions(1.2d);
-    private static Font font = new Font("Arial", Font.PLAIN, 14);
     private static final Logger log = Logger.getLogger(MageBook.class);
 	private Dimension cardDimension;
 

Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java

@@ -12,9 +12,8 @@ import static org.mage.plugins.card.dl.DownloadJob.toFile;
 
 public class GathererSets implements Iterable<DownloadJob> {
     private static final File     outDir  = new File("plugins/images/sets");
-    private static final String[] symbols = {"DIS", "GPT", "RAV", "MRD",
+    private static final String[] symbols = {"DIS", "GPT", "RAV", "MRD", "10E", "HOP"};
-                                               "10E", "HOP"};
+    private static final String[] withMythics = {"ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11", "DDF", "MBS"};
-    private static final String[] withMythics = {"ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11", "DDF"};
 
     @Override
     public Iterator<DownloadJob> iterator() {

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

@@ -0,0 +1,59 @@
+/*
+* 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
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* 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 mage.Constants.SetType;
+import mage.cards.ExpansionSet;
+
+import java.util.GregorianCalendar;
+
+/**
+ *
+ * @author nantuko84
+ */
+public class MirrodinBesieged extends ExpansionSet {
+
+	private static final MirrodinBesieged fINSTANCE =  new MirrodinBesieged();
+
+	public static MirrodinBesieged getInstance() {
+		return fINSTANCE;
+	}
+
+	private MirrodinBesieged() {
+		super("Mirrodin Besieged", "MBS", "seticon_mtgmbs", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 02, 4).getTime(), SetType.EXPANSION);
+		this.blockName = "Mirrodin Besieged";
+		this.hasBoosters = true;
+		this.numBoosterLands = 1;
+		this.numBoosterCommon = 10;
+		this.numBoosterUncommon = 3;
+		this.numBoosterRare = 1;
+		this.ratioBoosterMythic = 8;
+	}
+
+}

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

@@ -69,6 +69,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
 		this.addSet(Magic2010.getInstance());
 		this.addSet(Magic2011.getInstance());
         this.addSet(Mirrodin.getInstance());
+		this.addSet(MirrodinBesieged.getInstance());
 		this.addSet(Planechase.getInstance());
         this.addSet(RavnicaCityOfGuilds.getInstance());
 		this.addSet(RiseOfTheEldrazi.getInstance());