summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt2
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) {