diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt index 54da335b4..028fc137e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHungerElement.kt @@ -133,7 +133,7 @@ class HotbarHungerElement(guiRenderer: GUIRenderer) : Element(guiRenderer), Poll return true } - private class HungerAtlas(val atlas: Atlas?) { + private class HungerAtlas(atlas: Atlas?) { private val container = arrayOf(atlas["container"], atlas["container_hunger"]) private val saturation = arrayOf(atlas["container_saturation_half"], atlas["container_saturation_full"]) private val hunger = arrayOf(arrayOf(atlas["full"], atlas["half"]), arrayOf(atlas["full_hunger"], atlas["half_hunger"])) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt index 9d6af2962..9169ef08a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt @@ -36,7 +36,7 @@ class ItemLoader(private val loader: ModelLoader) { val version = loader.context.connection.version fun loadItem(name: ResourceLocation): ItemModel? { - val file = name.itemModel() + val file = name.model() cache[file]?.let { return it } val data = assets.getOrNull(file)?.readJsonObject() if (data == null) { @@ -52,7 +52,7 @@ class ItemLoader(private val loader: ModelLoader) { } private fun loadItem(item: Item): ItemModel? { - val file = (if (item is CustomModel) item.getModelName(version) else item.identifier) ?: return null + val file = (if (item is CustomModel) item.getModelName(version) else item.identifier.itemModel()) ?: return null return loadItem(file) }