From 35fc84103731269533dccb0362a6932f0480fb6b Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 1 Dec 2023 19:22:49 +0700 Subject: [PATCH] fixes --- src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt | 6 +++--- src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt | 1 - .../ru/dbotthepony/kstarbound/client/StarboundClient.kt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt index 2788eeb3..c4fb8528 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt @@ -130,7 +130,7 @@ object Registries { AssetPathStack(listedFile.computeDirectory()) { val elem = elementAdapter.read(listedFile.jsonReader()) val read = adapter.fromJsonTree(elem) - val keys = keyProvider(read); + val keys = keyProvider(read) KOptional.of { try { @@ -139,12 +139,12 @@ object Registries { else registry.add(keys.first, read, elem, listedFile) } catch (err: Throwable) { - LOGGER.error("Loading ${registry.name} definition file $listedFile", err); + LOGGER.error("Loading ${registry.name} definition file $listedFile", err) } } } } catch (err: Throwable) { - LOGGER.error("Loading ${registry.name} definition file $listedFile", err); + LOGGER.error("Loading ${registry.name} definition file $listedFile", err) KOptional.empty() } finally { it.elements.incrementAndGet() diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index 6cc44558..028004b1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -458,7 +458,6 @@ object Starbound : ISBFileLocator { initializing = false initialized = true - checkMailbox() log.line("Finished loading in ${System.currentTimeMillis() - time}ms") } diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt index cecebb45..bf2a0145 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt @@ -994,7 +994,7 @@ class StarboundClient : Closeable { fontShaderPrograms.forEachValid { it.viewMatrix = viewportMatrixScreen } if (System.nanoTime() - loadingLog.lastActivity <= 4_000_000_000L) { - //renderLoadingText() + renderLoadingText() } stack.clear(Matrix3f.identity())