From 17f7c96a2b3d7b49bb7355220387662a3c86d2f4 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Tue, 1 Aug 2023 02:01:57 +0200 Subject: [PATCH] silently ignore font loading errors (if not default) They are not yet present in 1.14 --- .../gui/rendering/font/manager/FontManager.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/manager/FontManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/manager/FontManager.kt index a9d3205b7..99686103f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/manager/FontManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/manager/FontManager.kt @@ -52,11 +52,7 @@ class FontManager(default: FontType? = null) { fonts[name]?.let { return it } - val font = FontLoader.load(context, this, index, latch) - if (font == null) { - Log.log(LogMessageType.ASSETS, LogLevels.WARN) { "Font $index seems to be empty!" } - return null - } + val font = FontLoader.load(context, this, index, latch) ?: return null val type = font.trim() ?: return null this.fonts[name] = type @@ -68,8 +64,12 @@ class FontManager(default: FontType? = null) { fun create(context: RenderContext, latch: AbstractLatch): FontManager { val manager = FontManager() - val default = manager.load(DefaultFontIndices.DEFAULT, context, latch) ?: EmptyFont - manager::default.forceSet(default) + val default = manager.load(DefaultFontIndices.DEFAULT, context, latch) + if (default == null) { + Log.log(LogMessageType.ASSETS, LogLevels.WARN) { "Default font is empty!" } + } + + manager::default.forceSet(default ?: EmptyFont) for (index in DefaultFontIndices.ALL) { manager.load(index, context, latch)