From 22a99999ea0efed2fdc2bf080353d676753821c8 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Wed, 21 Oct 2020 22:37:19 +0200
Subject: [PATCH] remove System.out references in rendering, optimisations

---
 src/main/java/de/bixilon/minosoft/Minosoft.java           | 3 +++
 .../de/bixilon/minosoft/render/texture/TextureLoader.java | 8 ++++----
 .../bixilon/minosoft/util/mojang/api/MojangAccount.java   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java
index 45c5578c2..06089ee89 100644
--- a/src/main/java/de/bixilon/minosoft/Minosoft.java
+++ b/src/main/java/de/bixilon/minosoft/Minosoft.java
@@ -100,6 +100,9 @@ public final class Minosoft {
             return true;
         });
         startCallables.add(() -> {
+            // wait for assets to be loaded
+            assetsLatch.waitUntilZero();
+
             GameWindow.prepare();
             countDownStartLatch();
             return true;
diff --git a/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java b/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
index e0156fde2..424b1e75e 100644
--- a/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
+++ b/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
@@ -1,6 +1,6 @@
 /*
  * Codename Minosoft
- * Copyright (C) 2020 Lukas Eisenhauer
+ * Copyright (C) 2020 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -14,6 +14,7 @@
 package de.bixilon.minosoft.render.texture;
 
 import de.bixilon.minosoft.Config;
+import de.bixilon.minosoft.logging.Log;
 import de.bixilon.minosoft.render.blockModels.Face.RenderConstants;
 import de.matthiasmann.twl.utils.PNGDecoder;
 
@@ -83,8 +84,7 @@ public class TextureLoader {
                 }
                 modTextureMap.put(textureName, image);
             } catch (IOException e) {
-                System.out.println(textureName);
-                System.out.println(path);
+                Log.fatal(String.format("An error occurred while loading texture %s: %s", textureName, e.getLocalizedMessage()));
                 e.printStackTrace();
                 System.exit(6);
             }
@@ -148,7 +148,7 @@ public class TextureLoader {
         // returns the start and end u-coordinate of a specific texture to access it
         HashMap<String, Integer> modMap = textureCoordinates.get(mod);
         if (modMap == null) {
-            System.out.println("no mod " + mod + " loaded");
+            Log.fatal(String.format("Could not load texture for mod %s", mod));
             System.exit(9);
         }
         Integer pos = modMap.get(textureName);
diff --git a/src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java b/src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java
index 06db1cb06..bef43eaf9 100644
--- a/src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java
+++ b/src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java
@@ -74,7 +74,7 @@ public class MojangAccount {
             lastRefreshStatus = RefreshStates.FAILED;
             return lastRefreshStatus;
         }
-        if (accessToken.equals("")) {
+        if (accessToken.isBlank()) {
             lastRefreshStatus = RefreshStates.ERROR;
             return lastRefreshStatus;
         }