From e570b71d4043b238eafe2d313bbb0164e67047e7 Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Sat, 7 Oct 2023 21:34:10 +0200
Subject: [PATCH] wawla: fallback name

---
 .../gui/rendering/gui/hud/elements/wawla/WawlaElement.kt     | 5 +++--
 .../gui/hud/elements/wawla/block/BlockWawlaElement.kt        | 3 ++-
 .../gui/hud/elements/wawla/entity/EntityWawlaElement.kt      | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt
index 1b4131e68..d5cedf2c5 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/WawlaElement.kt
@@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.wawla
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.minosoft.data.registries.identified.Identified
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
+import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
@@ -52,8 +53,8 @@ abstract class WawlaElement(protected val wawla: WawlaHUDElement) : Element(wawl
         this.size = size
     }
 
-    protected fun createNameElement(translationKey: ResourceLocation?): TextElement {
-        val name = wawla.context.connection.language.forceTranslate(translationKey)
+    protected fun createNameElement(translationKey: ResourceLocation?, fallback: ChatComponent): TextElement {
+        val name = wawla.context.connection.language.translate(translationKey) ?: fallback
         name.setFallbackColor(ChatColors.WHITE)
         return TextElement(guiRenderer, name, background = null, properties = TextRenderProperties(scale = 1.25f))
     }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/BlockWawlaElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/BlockWawlaElement.kt
index 473285b29..0e75803c6 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/BlockWawlaElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/block/BlockWawlaElement.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.camera.target.targets.BlockTarget
 import de.bixilon.minosoft.data.registries.blocks.wawla.BlockWawlaProvider
 import de.bixilon.minosoft.data.registries.identified.Namespaces
 import de.bixilon.minosoft.data.text.BaseComponent
+import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.ChatComponentUtil.removeTrailingNewlines
 import de.bixilon.minosoft.data.text.TextComponent
 import de.bixilon.minosoft.data.text.formatting.color.ChatColors
@@ -40,7 +41,7 @@ class BlockWawlaElement(wawla: WawlaHUDElement, val target: BlockTarget) : Wawla
     }
 
     private fun createName(): TextElement {
-        return createNameElement(target.state.block.translationKey)
+        return createNameElement(target.state.block.translationKey, ChatComponent.of(target.state.block.identifier))
     }
 
     private fun createMod(): TextElement? {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/entity/EntityWawlaElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/entity/EntityWawlaElement.kt
index 659dac198..9117657c0 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/entity/EntityWawlaElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/wawla/entity/EntityWawlaElement.kt
@@ -23,6 +23,7 @@ import de.bixilon.minosoft.data.entities.wawla.EntityWawlaProvider
 import de.bixilon.minosoft.data.registries.effects.attributes.MinecraftAttributes
 import de.bixilon.minosoft.data.registries.identified.Namespaces
 import de.bixilon.minosoft.data.text.BaseComponent
+import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.ChatComponentUtil.removeTrailingNewlines
 import de.bixilon.minosoft.data.text.TextComponent
 import de.bixilon.minosoft.data.text.formatting.color.ChatColors
@@ -54,7 +55,7 @@ class EntityWawlaElement(wawla: WawlaHUDElement, private val target: EntityTarge
                 return TextElement(guiRenderer, name, background = null, properties = TextRenderProperties(scale = 1.2f))
             }
         }
-        return createNameElement(target.entity.type.translationKey)
+        return createNameElement(target.entity.type.translationKey, ChatComponent.of(target.entity.type.identifier))
     }
 
     private fun createMod(): TextElement? {