Replace tabs with spaces

.gitattributes

@@ -15996,6 +15996,7 @@ forge-m-base/src/forge/player/LobbyPlayerHuman.java -text
 forge-m-base/src/forge/player/PlayerControllerHuman.java -text
 forge-m-base/src/forge/screens/FScreen.java -text
 forge-m-base/src/forge/screens/LaunchScreen.java -text
+forge-m-base/src/forge/screens/SplashScreen.java -text
 forge-m-base/src/forge/screens/constructed/ConstructedScreen.java -text
 forge-m-base/src/forge/screens/draft/DraftScreen.java -text
 forge-m-base/src/forge/screens/guantlet/GuantletScreen.java -text
@@ -16008,6 +16009,7 @@ forge-m-base/src/forge/toolbox/FButton.java -text
 forge-m-base/src/forge/toolbox/FContainer.java -text
 forge-m-base/src/forge/toolbox/FDisplayObject.java -text
 forge-m-base/src/forge/toolbox/FLabel.java -text
+forge-m-base/src/forge/toolbox/FProgressBar.java -text
 forge-m-base/src/forge/utils/Utils.java -text
 forge-m-desktop/.classpath -text
 forge-m-desktop/.project -text

forge-m-base/src/forge/Forge.java

@@ -23,6 +23,9 @@ import forge.assets.FSkin;
 import forge.assets.FSkinColor;
 import forge.assets.FSkinFont;
 import forge.assets.FImage;
+import forge.gui.toolbox.FProgressBar;
+import forge.gui.workshop.CardScriptInfo;
+import forge.properties.NewConstants;
 import forge.screens.FScreen;
 import forge.screens.home.HomeScreen;
 import forge.toolbox.FDisplayObject;
@@ -51,6 +54,28 @@ public class Forge implements ApplicationListener {
         Gdx.graphics.setContinuousRendering(false); //save power consumption by disabling continuous rendering
         Gdx.input.setInputProcessor(new FGestureDetector());
 
+        CardStorageReader.ProgressObserver progressBarBridge = new CardStorageReader.ProgressObserver() {
+            FProgressBar bar = view.getSplash().getProgressBar();
+            @Override
+            public void setOperationName(final String name, final boolean usePercents) {
+                FThreads.invokeInEdtLater(new Runnable() { @Override public void run() {
+                    bar.setDescription(name);
+                    bar.setPercentMode(usePercents);
+                } });
+            }
+
+            @Override
+            public void report(int current, int total) {
+                if ( total != bar.getMaximum())
+                    bar.setMaximum(total);
+                bar.setValueThreadSafe(current);
+            }
+        };
+
+        // Loads all cards (using progress bar).
+        final CardStorageReader reader = new CardStorageReader(NewConstants.CARD_DATA_DIR, progressBarBridge, CardScriptInfo.readerObserver);
+        magicDb = new StaticData(reader, "res/editions", "res/blockdata");
+
         FSkin.loadLight("journeyman", true);
         FSkin.loadFull(true);
         openScreen(new HomeScreen());

forge-m-base/src/forge/screens/SplashScreen.java

@@ -0,0 +1,27 @@
+package forge.screens;
+
+import forge.screens.FScreen;
+import forge.toolbox.FProgressBar;
+
+public abstract class SplashScreen extends FScreen {
+    private static SplashScreen splashScreen;
+
+    public static FProgressBar getProgressBar(String desc) {
+        return splashScreen.progressBar;
+    }
+
+    private FProgressBar progressBar = new FProgressBar();
+
+    public SplashScreen() {
+        super(false, null, false);
+        if (splashScreen != null) {
+            throw new RuntimeException("Cannot initialize SplashScreen more than once");
+        }
+        splashScreen = this;
+        add(progressBar);
+    }
+
+    @Override
+    protected final void doLayout(float startY, float width, float height) {
+    }
+}

forge-m-base/src/forge/toolbox/FProgressBar.java

@@ -0,0 +1,104 @@
+package forge.toolbox;
+
+import java.util.Date;
+
+import forge.Forge.Graphics;
+
+public class FProgressBar extends FDisplayObject {
+    private long startMillis = 0;
+    private int tempVal = 0, etaSecs = 0, maximum = 0, value = 0;
+    private String desc = "";
+    private String tempMsg, message;
+    private boolean showETA = true;
+    private boolean showCount = true;
+    
+    private boolean percentMode = false;
+
+    /** */
+    public FProgressBar() {
+        super();
+        this.reset();
+    }
+
+    /**
+     * Sets description on bar.
+     * 
+     * @param s0   A description to prepend before statistics.
+     */
+    public void setDescription(final String s0) {
+        this.desc = s0;
+    }
+
+    private final Runnable barIncrementor = new Runnable() {
+        @Override
+        public void run() {
+            value = tempVal;
+            message = tempMsg;
+        }
+    };
+
+    /** Increments bar, thread safe. Calculations executed on separate thread. */
+    public void setValueThreadSafe(int value) {
+        //GuiUtils.checkEDT("FProgressBar$increment", false);
+        tempVal = value;
+
+        // String.format leads to StringBuilder anyway. Direct calls will be faster
+        StringBuilder sb = new StringBuilder(desc);
+        if (showCount) {
+            sb.append(" ");
+            if (percentMode)
+                sb.append(100 * tempVal / maximum).append("%");
+            else
+                sb.append(tempVal).append(" of ").append(maximum);
+        }
+
+        if (showETA) {
+            calculateETA(tempVal);
+            sb.append(", ETA").append(String.format("%02d:%02d:%02d", etaSecs / 3600, (etaSecs % 3600) / 60, etaSecs % 60 + 1));
+        }
+        tempMsg = sb.toString();
+
+        // When calculations finished; EDT can be used.
+        //SwingUtilities.invokeLater(barIncrementor);
+        barIncrementor.run();
+    }
+
+    /** Resets the various values required for this class. Must be called from EDT. */
+    public void reset() {
+        //FThreads.assertExecutedByEdt(true);
+        this.startMillis = new Date().getTime();
+        this.setShowETA(true);
+        this.setShowCount(true);
+    }
+
+    /** @param b0   Boolean, show the ETA statistic or not */
+    public void setShowETA(boolean b0) {
+        this.showETA = b0;
+    }
+
+    /** @param b0   Boolean, show the ETA statistic or not */
+    public void setShowCount(boolean b0) {
+        this.showCount = b0;
+    }
+
+    /** */
+    private void calculateETA(int v0) {
+        float tempMillis = new Date().getTime();
+        float timePerUnit = (tempMillis - startMillis) / v0;
+        etaSecs = (int) ((this.maximum - v0) * timePerUnit) / 1000;
+    }
+
+    public boolean isPercentMode() {
+        return percentMode;
+    }
+
+    public void setPercentMode(boolean value) {
+        this.percentMode = value;
+    }
+
+    @Override
+    public void draw(Graphics g) {
+        // TODO Auto-generated method stub
+        
+    }
+}