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

debug hud improvements, text background fixes

Browse Source
This commit is contained in:
Bixilon 2021-09-11 15:36:06 +02:00
parent 39758cf057
commit b53fd1a16d
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
7 changed files with 113 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt
View File

@ -19,4 +19,8 @@ object StaticConfiguration {
const val DEBUG_SLOW_LOADING = false // if true, many Thread.sleep will be executed and the start will be delayed (by a lot)
const val SHOW_LOG_MESSAGES_IN_CHAT = true // prints all console messages in the chat box
const val REPLACE_SYSTEM_OUT_STREAMS = true
@Deprecated(message = "Just for hud development purposes")
const val HUD_ONLY = false
}

27
src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.gui.rendering
import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.block.WorldRenderer
@ -117,18 +118,20 @@ class RenderWindow(
}
})
// order dependent (from back to front)
registerRenderer(SkyRenderer)
registerRenderer(WorldRenderer)
registerRenderer(BlockOutlineRenderer)
if (Minosoft.config.config.game.graphics.particles.enabled) {
registerRenderer(ParticleRenderer)
}
if (Minosoft.config.config.game.entities.hitBox.enabled) {
registerRenderer(EntityHitBoxRenderer)
}
if (Minosoft.config.config.game.world.chunkBorders.enabled) {
registerRenderer(ChunkBorderRenderer)
if (!StaticConfiguration.HUD_ONLY) {
// order dependent (from back to front)
registerRenderer(SkyRenderer)
registerRenderer(WorldRenderer)
registerRenderer(BlockOutlineRenderer)
if (Minosoft.config.config.game.graphics.particles.enabled) {
registerRenderer(ParticleRenderer)
}
if (Minosoft.config.config.game.entities.hitBox.enabled) {
registerRenderer(EntityHitBoxRenderer)
}
if (Minosoft.config.config.game.world.chunkBorders.enabled) {
registerRenderer(ChunkBorderRenderer)
}
}
registerRenderer(HUDRenderer)
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/TextComponentRenderer.kt
View File

@ -43,7 +43,7 @@ object TextComponentRenderer : ChatComponentRenderer<TextComponent> {
}
fun applyOffset() {
if (consumer == null) {
if (consumer == null && offset.x == initialOffset.x + Font.CHAR_MARGIN) {
// preparing phase
renderInfo.lines += TextLineInfo()
} else {

2
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/layout/RowLayout.kt
View File

@ -32,7 +32,7 @@ import java.lang.Integer.max
/**
* A layout, that works from top to bottom, containing other elements, that get wrapped below each other
*/
class RowLayout(
open class RowLayout(
hudRenderer: HUDRenderer,
override var childAlignment: ElementAlignments = ElementAlignments.LEFT,
spacing: Int = 0,

1
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt
View File

@ -107,7 +107,6 @@ open class TextElement(
ChatComponentRenderer.render(initialOffset, Vec2i(initialOffset), Vec2i.EMPTY, z + 1, this, fontAlignment, renderWindow, consumer, renderInfo, textComponent)
renderInfo.currentLineNumber = 0
prepared = true
if (background) {
for ((line, info) in renderInfo.lines.withIndex()) {

95
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/hud/DebugHUD.kt
View File

@ -13,8 +13,13 @@
package de.bixilon.minosoft.gui.rendering.gui.hud.hud
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.other.game.event.handlers.GameMoveChangeGameEventHandler
import de.bixilon.minosoft.data.text.BaseComponent
import de.bixilon.minosoft.data.text.ChatColors
import de.bixilon.minosoft.data.text.TextComponent
import de.bixilon.minosoft.data.world.Chunk
import de.bixilon.minosoft.gui.rendering.RenderWindow
import de.bixilon.minosoft.gui.rendering.block.WorldRenderer
import de.bixilon.minosoft.gui.rendering.gui.elements.Element
@ -29,11 +34,11 @@ import de.bixilon.minosoft.gui.rendering.gui.hud.HUDRenderer
import de.bixilon.minosoft.gui.rendering.modding.events.ResizeWindowEvent
import de.bixilon.minosoft.gui.rendering.particle.ParticleRenderer
import de.bixilon.minosoft.modding.event.events.DifficultyChangeEvent
import de.bixilon.minosoft.modding.event.events.GameEventChangeEvent
import de.bixilon.minosoft.modding.event.invoker.CallbackEventInvoker
import de.bixilon.minosoft.modding.loading.ModLoader
import de.bixilon.minosoft.terminal.RunConfiguration
import de.bixilon.minosoft.util.GitInfo
import de.bixilon.minosoft.util.KUtil.decide
import de.bixilon.minosoft.util.KUtil.format
import de.bixilon.minosoft.util.MMath.round10
import de.bixilon.minosoft.util.SystemInformation
@ -77,10 +82,37 @@ class DebugHUD(val hudRenderer: HUDRenderer) : HUD<GridLayout> {
layout += LineSpacerElement(hudRenderer)
layout += TextElement(hudRenderer, BaseComponent("Account ", connection.account.username))
layout += TextElement(hudRenderer, BaseComponent("Address ", connection.address))
layout += TextElement(hudRenderer, BaseComponent("Network version ", connection.version))
layout += TextElement(hudRenderer, BaseComponent("Server brand ", connection.serverInfo.brand))
layout += LineSpacerElement(hudRenderer)
connection.player.apply {
// ToDo: Only update when the position changes
layout += AutoTextElement(hudRenderer, 1) { with(position) { "XYZ ${x.format()} / ${y.format()} / ${z.format()}" } }
layout += AutoTextElement(hudRenderer, 1) { with(positionInfo.blockPosition) { "Block $x $y $z" } }
layout += AutoTextElement(hudRenderer, 1) { with(positionInfo) { "Chunk $inChunkSectionPosition in (${chunkPosition.x} $sectionHeight ${chunkPosition.y})" } }
layout += AutoTextElement(hudRenderer, 1) {
val text = BaseComponent("Facing ")
Directions.byDirection(hudRenderer.renderWindow.inputHandler.camera.cameraFront).apply {
text += this
text += " "
text += vector
}
hudRenderer.renderWindow.connection.player.rotation.apply {
text += " yaw="
text += headYaw.round10
text += ", pitch="
text += pitch.round10
}
text
}
}
layout += LineSpacerElement(hudRenderer)
@ -88,14 +120,24 @@ class DebugHUD(val hudRenderer: HUDRenderer) : HUD<GridLayout> {
val chunk = connection.world[connection.player.positionInfo.chunkPosition]
if (chunk == null) {
layout += TextElement(hudRenderer, "Waiting for chunk...") // ToDo
layout += DebugWorldInfo(hudRenderer)
}
layout += LineSpacerElement(hudRenderer)
layout += TextElement(hudRenderer, "Difficulty ${connection.world.difficulty.format()}, ${connection.world.difficultyLocked.decide("locked", "unlocked")}").apply {
layout += TextElement(hudRenderer, BaseComponent("Gamemode ", connection.player.gamemode)).apply {
connection.registerEvent(CallbackEventInvoker.of<GameEventChangeEvent> {
if (it.event.resourceLocation != GameMoveChangeGameEventHandler.RESOURCE_LOCATION) {
return@of
}
// ToDo: Improve game mode change event
text = BaseComponent("Gamemode ", Gamemodes[it.data.toInt()])
})
}
layout += TextElement(hudRenderer, BaseComponent("Difficulty ", connection.world.difficulty, ", locked=", connection.world.difficultyLocked)).apply {
connection.registerEvent(CallbackEventInvoker.of<DifficultyChangeEvent> {
text = "Difficulty ${it.difficulty.format()}, ${it.locked.decide("locked", "unlocked")}"
text = BaseComponent("Difficulty ", it.difficulty, ", locked=", it.locked)
})
}
@ -147,4 +189,49 @@ class DebugHUD(val hudRenderer: HUDRenderer) : HUD<GridLayout> {
}
return layout
}
private class DebugWorldInfo(hudRenderer: HUDRenderer) : RowLayout(hudRenderer) {
private var lastChunk: Chunk? = null
private val world = hudRenderer.connection.world
private val entity = hudRenderer.connection.player
init {
showWait()
}
private fun showWait() {
clear()
this += TextElement(hudRenderer, "Waiting for chunk...")
}
private fun updateInformation() {
entity.positionInfo.apply {
val chunk = world[chunkPosition]
if ((chunk == null && lastChunk == null) || (chunk != null && lastChunk != null)) {
// No update, elements will update themselves
return
}
if (chunk == null) {
lastChunk = null
showWait()
return
}
clear()
this@DebugWorldInfo += AutoTextElement(hudRenderer, 1) { BaseComponent("Dimension ", connection.world.dimension?.resourceLocation) }
this@DebugWorldInfo += AutoTextElement(hudRenderer, 1) { BaseComponent("Biome ", connection.world.getBiome(blockPosition)) }
this@DebugWorldInfo += AutoTextElement(hudRenderer, 1) { with(connection.world.worldLightAccessor) { BaseComponent("Light block=", getBlockLight(blockPosition), ", sky=", getSkyLight(blockPosition)) } }
lastChunk = chunk
}
}
override fun tick() {
// ToDo: Make event driven
updateInformation()
super.tick()
}
}
}

1
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -257,6 +257,7 @@ object KUtil {
is Double -> "§d%.4f".format(this)
is Number -> TextComponent(this).color(ChatColors.LIGHT_PURPLE)
is ResourceLocation -> TextComponent(this.toString()).color(ChatColors.GOLD)
is ResourceLocationAble -> resourceLocation.format()
is Vec4t<*> -> "(${this.x.format()} ${this.y.format()} ${this.z.format()} ${this.w.format()})"
is Vec3t<*> -> "(${this.x.format()} ${this.y.format()} ${this.z.format()})"
is Vec2t<*> -> "(${this.x.format()} ${this.y.format()})"