Improvement: Apply border radius to scoreboard texture (#2228)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

2 files changed, 23 insertions, 14 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
index 3d4e6daad..ebbb7fa30 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
 import at.hannibal2.skyhanni.data.GuiEditManager.getDummySize
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.RenderUtils
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
@@ -49,12 +48,13 @@ class RenderBackground {
                 val textureLocation = ResourceLocation("skyhanni", "scoreboard.png")
                 Minecraft.getMinecraft().textureManager.bindTexture(textureLocation)
 
-                Utils.drawTexturedRect(
-                    (x - border).toFloat(),
-                    (y - border).toFloat(),
-                    (elementWidth + border * 3).toFloat(),
-                    (elementHeight + border * 2).toFloat(),
-                    GL11.GL_NEAREST
+                RenderUtils.drawRoundTexturedRect(
+                    x - border,
+                    y - border,
+                    elementWidth + border * 3,
+                    elementHeight + border * 2,
+                    GL11.GL_NEAREST,
+                    backgroundConfig.roundedCornerSmoothness,
                 )
             } else {
                 RenderUtils.drawRoundRect(
@@ -63,7 +63,7 @@ class RenderBackground {
                     elementWidth + border * 3,
                     elementHeight + border * 2,
                     backgroundConfig.color.toChromaColor().rgb,
-                    backgroundConfig.roundedCornerSmoothness
+                    backgroundConfig.roundedCornerSmoothness,
                 )
             }
             if (outlineConfig.enabled) {
@@ -76,7 +76,7 @@ class RenderBackground {
                     outlineConfig.colorBottom.toChromaColor().rgb,
                     outlineConfig.thickness,
                     backgroundConfig.roundedCornerSmoothness,
-                    outlineConfig.blur
+                    outlineConfig.blur,
                 )
             }
         }
@@ -133,7 +133,7 @@ class RenderBackground {
             newX,
             newY,
             position.getScale(),
-            position.isCenter
+            position.isCenter,
         )
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleShader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedShader.kt
index 9ce2d0ce7..ab4b1165c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleShader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedShader.kt
@@ -4,10 +4,7 @@ import at.hannibal2.skyhanni.utils.shader.Shader
 import at.hannibal2.skyhanni.utils.shader.Uniform
 import net.minecraft.client.Minecraft
 
-object RoundedRectangleShader : Shader("rounded_rect", "rounded_rect") {
-
-    val INSTANCE: RoundedRectangleShader
-        get() = this
+abstract class RoundedShader(vertex: String, fragment: String) : Shader(vertex, fragment) {
 
     var scaleFactor: Float = 0f
     var radius: Float = 0f
@@ -26,3 +23,15 @@ object RoundedRectangleShader : Shader("rounded_rect", "rounded_rect") {
         registerUniform(Uniform.UniformType.VEC2, "centerPos") { centerPos }
     }
 }
+
+object RoundedRectangleShader : RoundedShader("rounded_rect", "rounded_rect") {
+
+    val INSTANCE: RoundedRectangleShader
+        get() = this
+}
+
+object RoundedTextureShader : RoundedShader("rounded_texture", "rounded_texture") {
+
+    val INSTANCE: RoundedTextureShader
+        get() = this
+}