impr: size option for TextComponents (#2159)

kami-blue · Mar 25, 2021 · 76c1740 · 76c1740
1 parent 19238e2
commit 76c1740
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/kotlin/org/kamiblue/client/util/EntityUtils.kt b/src/main/kotlin/org/kamiblue/client/util/EntityUtils.kt
@@ -20,12 +20,11 @@ import org.kamiblue.client.util.items.id
 import org.kamiblue.client.util.math.VectorUtils.toBlockPos
 import org.kamiblue.commons.extension.ceilToInt
 import org.kamiblue.commons.extension.floorToInt
-import kotlin.math.floor
 
 object EntityUtils {
     private val mc = Minecraft.getMinecraft()
 
-    val Entity.flooredPosition get() = BlockPos(floor(posX).toInt(), floor(posY).toInt(), floor(posZ).toInt())
+    val Entity.flooredPosition get() = BlockPos(posX.floorToInt(), posY.floorToInt(), posZ.floorToInt())
     val Entity.prevPosVector get() = Vec3d(this.prevPosX, this.prevPosY, this.prevPosZ)
 
     val Entity.isPassive

diff --git a/src/main/kotlin/org/kamiblue/client/util/graphics/font/TextComponent.kt b/src/main/kotlin/org/kamiblue/client/util/graphics/font/TextComponent.kt
@@ -39,8 +39,8 @@ class TextComponent(val separator: String = " ") {
     /**
      * Adds new text element to [currentLine], and goes to the next line
      */
-    fun addLine(text: String, color: ColorHolder = ColorHolder(255, 255, 255), style: Style = Style.REGULAR) {
-        add(text, color, style)
+    fun addLine(text: String, color: ColorHolder = ColorHolder(255, 255, 255), style: Style = Style.REGULAR, scale: Float = 1f) {
+        add(text, color, style, scale)
         currentLine++
     }
 
@@ -55,8 +55,8 @@ class TextComponent(val separator: String = " ") {
     /**
      * Adds new text element to [currentLine]
      */
-    fun add(text: String, color: ColorHolder = ColorHolder(255, 255, 255), style: Style = Style.REGULAR) {
-        add(TextElement(text, color, style))
+    fun add(text: String, color: ColorHolder = ColorHolder(255, 255, 255), style: Style = Style.REGULAR, scale: Float = 1f) {
+        add(TextElement(text, color, style, scale))
     }
 
     /**
@@ -145,7 +145,7 @@ class TextComponent(val separator: String = " ") {
             for (textElement in textElementList) {
                 val color = textElement.color.clone()
                 color.a = (color.a * alpha).toInt()
-                FontRenderAdapter.drawString(textElement.text, drawShadow = drawShadow, color = color, customFont = customFont)
+                FontRenderAdapter.drawString(textElement.text, drawShadow = drawShadow, color = color, customFont = customFont, scale = textElement.scale)
                 val adjustedSeparator = if (separator == " " && customFont) "  " else " "
                 glTranslatef(FontRenderAdapter.getStringWidth(textElement.text + adjustedSeparator, customFont = customFont), 0f, 0f)
             }
@@ -165,7 +165,7 @@ class TextComponent(val separator: String = " ") {
 
     }
 
-    class TextElement(textIn: String, val color: ColorHolder = ColorHolder(255, 255, 255), val style: Style = Style.REGULAR) {
+    class TextElement(textIn: String, val color: ColorHolder = ColorHolder(255, 255, 255), val style: Style = Style.REGULAR, val scale: Float = 1f) {
         val text = "${style.code}$textIn"
 
         override fun toString(): String {