diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-04-30 19:12:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-30 19:12:23 +0200 |
| commit | ab49f89977c19cc8eba7911c073a9d74ede1eadf (patch) | |
| tree | a7bcd2ef05478a92c2e29be350d5f0624b504dcd /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 249e02778ce9543afc515ee4c7b5a57e154ac61d (diff) | |
| download | skyhanni-ab49f89977c19cc8eba7911c073a9d74ede1eadf.tar.gz skyhanni-ab49f89977c19cc8eba7911c073a9d74ede1eadf.tar.bz2 skyhanni-ab49f89977c19cc8eba7911c073a9d74ede1eadf.zip | |
Improvement: Better Alignment + Outline Improvement in Custom Scoreboard (#1566)
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 18 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index b89850608..3de627f50 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -47,17 +47,20 @@ object RenderUtils { LEFT("Left"), CENTER("Center"), RIGHT("Right"), + DONT_ALIGN("Don't Align"), ; - override fun toString(): String { - return value - } + override fun toString() = value } - enum class VerticalAlignment { - TOP, - CENTER, - BOTTOM, + enum class VerticalAlignment(private val value: String) { + TOP("Top"), + CENTER("Center"), + BOTTOM("Bottom"), + DONT_ALIGN("Don't Align"), + ; + + override fun toString() = value } private val beaconBeam = ResourceLocation("textures/entity/beacon_beam.png") @@ -497,6 +500,7 @@ object RenderUtils { HorizontalAlignment.LEFT -> offsetX.toFloat() HorizontalAlignment.CENTER -> offsetX + width / 2f - strLen / 2f HorizontalAlignment.RIGHT -> offsetX + width - strLen.toFloat() + else -> offsetX.toFloat() } GL11.glTranslatef(x2, 0f, 0f) renderer.drawStringWithShadow(display, 0f, 0f, 0) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt index 4af54b09f..e1f93574e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt @@ -35,12 +35,14 @@ internal object RenderableUtils { HorizontalAlignment.LEFT -> 0 HorizontalAlignment.CENTER -> (xSpace - renderable.width) / 2 HorizontalAlignment.RIGHT -> xSpace - renderable.width + else -> 0 } private fun calculateAlignmentYOffset(renderable: Renderable, ySpace: Int) = when (renderable.verticalAlign) { VerticalAlignment.TOP -> 0 VerticalAlignment.CENTER -> (ySpace - renderable.height) / 2 VerticalAlignment.BOTTOM -> ySpace - renderable.height + else -> 0 } fun Renderable.renderXYAligned(posX: Int, posY: Int, xSpace: Int, ySpace: Int) { |
