AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

skeletal loader: don't crash when model not found

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-23 21:31:53 +02:00
parent 35fd2eebb7
commit 8fd9456a64
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/SkeletalLoader.kt
View File

@ -23,6 +23,9 @@ import de.bixilon.minosoft.data.registries.identified.ResourceLocationUtil.exten
import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalModel import de.bixilon.minosoft.gui.rendering.skeletal.baked.BakedSkeletalModel
import de.bixilon.minosoft.gui.rendering.skeletal.model.SkeletalModel import de.bixilon.minosoft.gui.rendering.skeletal.model.SkeletalModel
import de.bixilon.minosoft.gui.rendering.system.base.texture.shader.ShaderTexture import de.bixilon.minosoft.gui.rendering.system.base.texture.shader.ShaderTexture
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
class SkeletalLoader(private val loader: ModelLoader) { class SkeletalLoader(private val loader: ModelLoader) {
private val registered: SynchronizedMap<ResourceLocation, RegisteredModel> = synchronizedMapOf() private val registered: SynchronizedMap<ResourceLocation, RegisteredModel> = synchronizedMapOf()
@ -32,7 +35,15 @@ class SkeletalLoader(private val loader: ModelLoader) {
val templates: MutableMap<ResourceLocation, SkeletalModel> = HashMap(this.registered.size, 0.1f) val templates: MutableMap<ResourceLocation, SkeletalModel> = HashMap(this.registered.size, 0.1f)
for ((name, registered) in this.registered) { for ((name, registered) in this.registered) {
val template = templates.getOrPut(registered.template) { loader.context.connection.assetsManager[registered.template].readJson() } var template = templates[registered.template]
if (template == null) {
template = loader.context.connection.assetsManager.getOrNull(registered.template)?.readJson()
if (template == null) {
Log.log(LogMessageType.LOADING, LogLevels.WARN) { "Can not find skeletal model ${registered.template}" }
continue
}
templates[registered.template] = template
}
template.load(loader.context, registered.override.keys) template.load(loader.context, registered.override.keys)
registered.model = template registered.model = template
@ -41,7 +52,7 @@ class SkeletalLoader(private val loader: ModelLoader) {
fun bake(latch: AbstractLatch?) { fun bake(latch: AbstractLatch?) {
for ((name, registered) in this.registered) { for ((name, registered) in this.registered) {
val baked = registered.model!!.bake(loader.context, registered.override) val baked = registered.model?.bake(loader.context, registered.override) ?: continue
this.baked[name] = baked this.baked[name] = baked
} }
} }