fixes
This commit is contained in:
parent
cc1c0124ae
commit
35fc841037
@ -130,7 +130,7 @@ object Registries {
|
|||||||
AssetPathStack(listedFile.computeDirectory()) {
|
AssetPathStack(listedFile.computeDirectory()) {
|
||||||
val elem = elementAdapter.read(listedFile.jsonReader())
|
val elem = elementAdapter.read(listedFile.jsonReader())
|
||||||
val read = adapter.fromJsonTree(elem)
|
val read = adapter.fromJsonTree(elem)
|
||||||
val keys = keyProvider(read);
|
val keys = keyProvider(read)
|
||||||
|
|
||||||
KOptional.of {
|
KOptional.of {
|
||||||
try {
|
try {
|
||||||
@ -139,12 +139,12 @@ object Registries {
|
|||||||
else
|
else
|
||||||
registry.add(keys.first, read, elem, listedFile)
|
registry.add(keys.first, read, elem, listedFile)
|
||||||
} catch (err: Throwable) {
|
} catch (err: Throwable) {
|
||||||
LOGGER.error("Loading ${registry.name} definition file $listedFile", err);
|
LOGGER.error("Loading ${registry.name} definition file $listedFile", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err: Throwable) {
|
} catch (err: Throwable) {
|
||||||
LOGGER.error("Loading ${registry.name} definition file $listedFile", err);
|
LOGGER.error("Loading ${registry.name} definition file $listedFile", err)
|
||||||
KOptional.empty()
|
KOptional.empty()
|
||||||
} finally {
|
} finally {
|
||||||
it.elements.incrementAndGet()
|
it.elements.incrementAndGet()
|
||||||
|
@ -458,7 +458,6 @@ object Starbound : ISBFileLocator {
|
|||||||
|
|
||||||
initializing = false
|
initializing = false
|
||||||
initialized = true
|
initialized = true
|
||||||
checkMailbox()
|
|
||||||
log.line("Finished loading in ${System.currentTimeMillis() - time}ms")
|
log.line("Finished loading in ${System.currentTimeMillis() - time}ms")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -994,7 +994,7 @@ class StarboundClient : Closeable {
|
|||||||
fontShaderPrograms.forEachValid { it.viewMatrix = viewportMatrixScreen }
|
fontShaderPrograms.forEachValid { it.viewMatrix = viewportMatrixScreen }
|
||||||
|
|
||||||
if (System.nanoTime() - loadingLog.lastActivity <= 4_000_000_000L) {
|
if (System.nanoTime() - loadingLog.lastActivity <= 4_000_000_000L) {
|
||||||
//renderLoadingText()
|
renderLoadingText()
|
||||||
}
|
}
|
||||||
|
|
||||||
stack.clear(Matrix3f.identity())
|
stack.clear(Matrix3f.identity())
|
||||||
|
Loading…
Reference in New Issue
Block a user