From 651a12337f9d9cfab5302bb776c8d8ec5cf2a8b8 Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Sat, 18 Nov 2023 21:33:34 +0100
Subject: [PATCH] load models after init of renderers

+ crash fix
---
 src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt | 2 +-
 .../de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt
index f04cbeb19..b300be404 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt
@@ -77,7 +77,6 @@ object RenderLoader {
         textures.initializeSkins(connection)
         textures.loadDefaultTextures()
         font = FontManager.create(this, initLatch)
-        models.load(latch)
 
 
         framebuffer.init()
@@ -91,6 +90,7 @@ object RenderLoader {
         // Wait for init stage to complete
         initLatch.dec()
         initLatch.await()
+        models.load(latch)
 
         renderer[GUIRenderer]?.atlas?.load() // TODO: remove this
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt
index d5c175aec..d62cccffb 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt
@@ -46,7 +46,7 @@ class ArmRenderer(override val context: RenderContext) : Renderer, Drawable {
     override val framebuffer get() = context.framebuffer.gui
     val shader = context.system.createShader(minosoft("entities/player/arm")) { ArmShader(it) }
 
-    init {
+    override fun init(latch: AbstractLatch) {
         registerModels()
     }