From 274bd74d397da5b43b900d0f766ce7825e079061 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 13 Apr 2023 05:23:39 +0200
Subject: code cleanup

---
 .../skyhanni/utils/renderables/Renderable.kt       | 104 +++++++++------------
 1 file changed, 45 insertions(+), 59 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils/renderables')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 415cc0f2e..ce531846e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -22,14 +22,12 @@ interface Renderable {
     fun render(posX: Int, posY: Int)
 
     companion object {
-        fun fromAny(any: Any?, itemScale: Double = 1.0): Renderable? {
-            return when (any) {
-                null -> placeholder(12)
-                is Renderable -> any
-                is String -> string(any)
-                is ItemStack -> itemStack(any, itemScale)
-                else -> null
-            }
+        fun fromAny(any: Any?, itemScale: Double = 1.0): Renderable? = when (any) {
+            null -> placeholder(12)
+            is Renderable -> any
+            is String -> string(any)
+            is ItemStack -> itemStack(any, itemScale)
+            else -> null
         }
 
         fun link(text: String, onClick: () -> Unit): Renderable = link(string(text), onClick)
@@ -37,80 +35,68 @@ interface Renderable {
             return clickable(hoverable(underlined(renderable), renderable), onClick)
         }
 
-        fun clickable(render: Renderable, onClick: () -> Unit, button: Int = 0): Renderable {
-            return object : Renderable {
-                override val width: Int
-                    get() = render.width
+        fun clickable(render: Renderable, onClick: () -> Unit, button: Int = 0) = object : Renderable {
+            override val width: Int
+                get() = render.width
 
-                private var wasDown = false
+            private var wasDown = false
 
-                override fun render(posX: Int, posY: Int) {
-                    val isDown = Mouse.isButtonDown(button)
-                    if (isDown > wasDown && isHovered(posX, posY)) {
-                        onClick()
-                    }
-                    wasDown = isDown
-                    render.render(posX, posY)
+            override fun render(posX: Int, posY: Int) {
+                val isDown = Mouse.isButtonDown(button)
+                if (isDown > wasDown && isHovered(posX, posY)) {
+                    onClick()
                 }
-
+                wasDown = isDown
+                render.render(posX, posY)
             }
+
         }
 
-        fun underlined(renderable: Renderable): Renderable {
-            return object : Renderable {
-                override val width: Int
-                    get() = renderable.width
+        fun underlined(renderable: Renderable) = object : Renderable {
+            override val width: Int
+                get() = renderable.width
 
-                override fun render(posX: Int, posY: Int) {
-                    Gui.drawRect(0, 10, width, 11, 0xFFFFFFFF.toInt())
-                    GlStateManager.color(1F, 1F, 1F, 1F)
-                    renderable.render(posX, posY)
-                }
+            override fun render(posX: Int, posY: Int) {
+                Gui.drawRect(0, 10, width, 11, 0xFFFFFFFF.toInt())
+                GlStateManager.color(1F, 1F, 1F, 1F)
+                renderable.render(posX, posY)
             }
         }
 
-        fun hoverable(hovered: Renderable, unhovered: Renderable): Renderable {
-            return object : Renderable {
-                override val width: Int
-                    get() = max(hovered.width, unhovered.width)
+        fun hoverable(hovered: Renderable, unhovered: Renderable) = object : Renderable {
+            override val width: Int
+                get() = max(hovered.width, unhovered.width)
 
-                override fun render(posX: Int, posY: Int) {
-                    if (isHovered(posX, posY))
-                        hovered.render(posX, posY)
-                    else
-                        unhovered.render(posX, posY)
-                }
+            override fun render(posX: Int, posY: Int) {
+                if (isHovered(posX, posY))
+                    hovered.render(posX, posY)
+                else
+                    unhovered.render(posX, posY)
             }
         }
 
-        fun itemStack(any: ItemStack, scale: Double = 1.0): Renderable {
-            return object : Renderable {
-                override val width: Int
-                    get() = 12
+        fun itemStack(any: ItemStack, scale: Double = 1.0) = object : Renderable {
+            override val width: Int
+                get() = 12
 
-                override fun render(posX: Int, posY: Int) {
-                    any.renderOnScreen(0F, 0F, scaleMultiplier = scale)
-                }
+            override fun render(posX: Int, posY: Int) {
+                any.renderOnScreen(0F, 0F, scaleMultiplier = scale)
             }
         }
 
-        fun string(string: String): Renderable {
-            return object : Renderable {
-                override val width: Int
-                    get() = Minecraft.getMinecraft().fontRendererObj.getStringWidth(string)
+        fun string(string: String) = object : Renderable {
+            override val width: Int
+                get() = Minecraft.getMinecraft().fontRendererObj.getStringWidth(string)
 
-                override fun render(posX: Int, posY: Int) {
-                    Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("§f$string", 1f, 1f, 0)
-                }
+            override fun render(posX: Int, posY: Int) {
+                Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("§f$string", 1f, 1f, 0)
             }
         }
 
-        fun placeholder(width: Int): Renderable {
-            return object : Renderable {
-                override val width: Int = width
+        fun placeholder(width: Int) = object : Renderable {
+            override val width: Int = width
 
-                override fun render(posX: Int, posY: Int) {
-                }
+            override fun render(posX: Int, posY: Int) {
             }
         }
     }
-- 
cgit