New GUI color theme

Author: Luna5ama

src/main/kotlin/dev/luna5ama/trollhack/gui/hudgui/AbstractHudElement.kt

@@ -82,7 +82,7 @@ abstract class AbstractHudElement(
 
     open fun renderFrame() {
         RenderUtils2D.drawRectFilled(renderWidth, renderHeight, GuiSetting.backGround)
-        RenderUtils2D.drawRectOutline(renderWidth, renderHeight, 1.0f, GuiSetting.outline)
+        RenderUtils2D.drawRectOutline(renderWidth, renderHeight, 1.0f, GuiSetting.primary)
     }
 
     init {

src/main/kotlin/dev/luna5ama/trollhack/gui/hudgui/elements/player/InventoryViewer.kt

@@ -31,7 +31,7 @@ internal object InventoryViewer : HudElement(
             RenderUtils2D.drawRectFilled(0.0f, 0.0f, 162.0f, 54.0f, color = GuiSetting.backGround)
         }
         if (border) {
-            RenderUtils2D.drawRectOutline(0.0f, 0.0f, 162.0f, 54.0f, lineWidth = 2.0f, color = GuiSetting.text)
+            RenderUtils2D.drawRectOutline(0.0f, 0.0f, 162.0f, 54.0f, lineWidth = 2.0f, color = GuiSetting.primary)
         }
     }
 

src/main/kotlin/dev/luna5ama/trollhack/gui/rgui/component/Slider.kt

@@ -113,11 +113,6 @@ open class Slider(
         )
         RenderUtils2D.drawRectFilled(0.0f, 0.0f, renderWidth, renderHeight, overlayColor)
 
-        // Slider frame
-        if (GuiSetting.outline.a > 0) {
-            RenderUtils2D.drawRectOutline(0.0f, 0.0f, renderWidth, renderHeight, 1.25f, GuiSetting.outline)
-        }
-
         // Slider name
         val displayText = inputField.takeIf { listening } ?: name
         val prev = if (prevState == MouseState.NONE) 0.0f else 1.0f

src/main/kotlin/dev/luna5ama/trollhack/gui/rgui/windows/ColorPicker.kt

@@ -218,16 +218,6 @@ object ColorPicker : TitledWindow("Color Picker", 0.0f, 0.0f, 200.0f, 200.0f, Se
 
         RenderUtils2D.releaseGl()
 
-        // Outline
-        RenderUtils2D.drawRectOutline(
-            fieldPos.first.x,
-            fieldPos.first.y,
-            fieldPos.second.x,
-            fieldPos.second.y,
-            1.5f,
-            GuiSetting.outline
-        )
-
         // Circle pointer
         val interpolatedSaturation = MathUtils.lerp(prevSaturation, saturation, RenderUtils3D.partialTicks)
         val interpolatedBrightness = MathUtils.lerp(prevBrightness, brightness, RenderUtils3D.partialTicks)
@@ -274,16 +264,6 @@ object ColorPicker : TitledWindow("Color Picker", 0.0f, 0.0f, 200.0f, 200.0f, Se
         RenderUtils2D.draw(GL_TRIANGLE_STRIP)
         RenderUtils2D.releaseGl()
 
-        // Outline
-        RenderUtils2D.drawRectOutline(
-            huePos.first.x,
-            huePos.first.y,
-            huePos.second.x,
-            huePos.second.y,
-            1.5f,
-            GuiSetting.outline
-        )
-
         // Arrow pointer
         val interpolatedHue = prevHue + (hue - prevHue) * mc.renderPartialTicks
         val pointerPosY = huePos.first.y + fieldHeight * interpolatedHue
@@ -315,14 +295,6 @@ object ColorPicker : TitledWindow("Color Picker", 0.0f, 0.0f, 200.0f, 200.0f, Se
             prevColorPos.second.y,
             prevColor
         )
-        RenderUtils2D.drawRectOutline(
-            prevColorPos.first.x,
-            prevColorPos.first.y,
-            prevColorPos.second.x,
-            prevColorPos.second.y,
-            1.5f,
-            GuiSetting.outline
-        )
 
         // Current color
         val currentColor = ColorRGB(r.value, g.value, b.value)
@@ -333,14 +305,6 @@ object ColorPicker : TitledWindow("Color Picker", 0.0f, 0.0f, 200.0f, 200.0f, Se
             currentColorPos.second.y,
             currentColor
         )
-        RenderUtils2D.drawRectOutline(
-            currentColorPos.first.x,
-            currentColorPos.first.y,
-            currentColorPos.second.x,
-            currentColorPos.second.y,
-            1.5f,
-            GuiSetting.outline
-        )
 
         // Previous hex
 

src/main/kotlin/dev/luna5ama/trollhack/module/modules/client/GuiSetting.kt

@@ -26,18 +26,16 @@ internal object GuiSetting : Module(
     val darkness by setting("Darkness", 0.25f, 0.0f..1.0f, 0.05f)
     val fadeInTime by setting("Fade In Time", 0.4f, 0.0f..1.0f, 0.05f)
     val fadeOutTime by setting("Fade Out Time", 0.4f, 0.0f..1.0f, 0.05f)
-    private val primarySetting by setting("Primary Color", ColorRGB(255, 160, 240, 220))
-    private val outlineSetting by setting("Outline Color", ColorRGB(240, 250, 255, 48))
-    private val backgroundSetting by setting("Background Color", ColorRGB(36, 40, 48, 160))
+    private val primarySetting by setting("Primary Color", ColorRGB(255, 140, 180, 220))
+    private val backgroundSetting by setting("Background Color", ColorRGB(40, 32, 36, 160))
     private val textSetting by setting("Text Color", ColorRGB(255, 250, 253, 255))
-    private val aHover by setting("Hover Alpha", 32, 0..255, 1)
+    private val aHover by setting("Hover Alpha", 24, 0..255, 1)
 
     val primary get() = primarySetting
     val idle get() = if (primary.lightness < 0.9f) ColorRGB(255, 255, 255, 0) else ColorRGB(0, 0, 0, 0)
     val hover get() = idle.alpha(aHover)
     val click get() = idle.alpha(aHover * 2)
     val backGround get() = backgroundSetting
-    val outline get() = outlineSetting
     val text get() = textSetting
 
     private var prevScale = scaleSetting.value / 100.0f

src/main/kotlin/dev/luna5ama/trollhack/module/modules/render/MapPreview.kt

@@ -87,7 +87,7 @@ internal object MapPreview : Module(
 
         // Draw the background
         drawRectFilled(x1, y1, x2, y2, GuiSetting.backGround)
-        drawRectOutline(x1, y1, x2, y2, 1.5f, GuiSetting.outline)
+        drawRectOutline(x1, y1, x2, y2, 1.5f, GuiSetting.primary)
 
         // Draw the name
         mc.fontRenderer.drawStringWithShadow(stack.displayName, 2f, -15f, Color.WHITE.rgb)