wawla: fallback name

This commit is contained in:
Moritz Zwerger 2023-10-07 21:34:10 +02:00
parent c8238f02d3
commit e570b71d40
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 7 additions and 4 deletions

View File

@ -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))
}

View File

@ -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? {

View File

@ -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? {