Skip to content

Commit

Permalink
feat: ColorValue - Separate hue slider value
Browse files Browse the repository at this point in the history 
Improve text look when color picker is not active
Config system support
Opacity slider
  • Loading branch information
@opZywl
opZywl committed Jan 11, 2025
1 parent 4ae6d92 commit 016fcbe
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 51 deletions.
111 changes: 63 additions & 48 deletions src/main/java/net/ccbluex/liquidbounce/config/Value.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ import net.ccbluex.liquidbounce.ui.font.GameFontRenderer
import net.ccbluex.liquidbounce.utils.client.ClientUtils.LOGGER
import net.ccbluex.liquidbounce.utils.kotlin.RandomUtils.nextFloat
import net.ccbluex.liquidbounce.utils.kotlin.RandomUtils.nextInt
import net.ccbluex.liquidbounce.utils.render.ColorUtils
import net.minecraft.client.gui.FontRenderer
import org.lwjgl.input.Mouse
import java.awt.Color
import javax.vecmath.Vector2f
import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty

Expand All @@ -41,7 +44,7 @@ sealed class Value<T>(
return set(new)
}

fun set(newValue: T, saveImmediately: Boolean = true): Boolean {
open fun set(newValue: T, saveImmediately: Boolean = true): Boolean {
if (newValue == value || hidden || excluded)
return false

Expand Down Expand Up @@ -122,6 +125,8 @@ sealed class Value<T>(
set(value)
}

open fun getString() = "$value"

fun shouldRender() = isSupported() && !hidden

fun reset() = set(default)
Expand Down Expand Up @@ -425,71 +430,81 @@ class ColorValue(
var rainbow: Boolean = false,
var showPicker: Boolean = false
) : Value<Color>(name, defaultColor) {
var hueSliderColor = value

var hue = 0f
var saturation = 1f
var brightness = 1f
var alpha = 1f
// Sliders
var hueSliderY = 0F
var opacitySliderY = 0F

init {
changeValue(defaultColor)
}
// Slider positions in the 0-1 range
var colorPickerPos = Vector2f(0f, 0f)

fun getColor(): Color {
val base = Color.getHSBColor(hue, saturation, brightness)
val finalAlpha = (alpha * 255).toInt().coerceIn(0, 255)
return Color(base.red, base.green, base.blue, finalAlpha)
}
var lastChosenSlider: SliderType? = null
get() {
if (!Mouse.isButtonDown(0)) field = null
return field
}

fun setColor(color: Color) {
set(color)
init {
changeValue(defaultColor)
}

override fun onInit(value: Color) {
val r = value.red
val g = value.green
val b = value.blue
val a = value.alpha
val hsb = Color.RGBtoHSB(r, g, b, null)
hue = hsb[0]
saturation = hsb[1]
brightness = hsb[2]
alpha = a / 255f
fun selectedColor() = if (rainbow) {
ColorUtils.rainbow(alpha = opacitySliderY)
} else {
get()
}

override fun onChange(oldValue: Color, newValue: Color): Color {
val r = newValue.red
val g = newValue.green
val b = newValue.blue
val a = newValue.alpha
val hsb = Color.RGBtoHSB(r, g, b, null)
hue = hsb[0]
saturation = hsb[1]
brightness = hsb[2]
alpha = a / 255f
return newValue
}
fun setColor(color: Color) = set(color)

override fun toJsonF(): JsonElement? {
override fun toJsonF(): JsonElement {
val argbHex = "#%08X".format(value.rgb)
return JsonPrimitive(argbHex)

return JsonPrimitive("hex: $argbHex, rainbow: $rainbow")
}

override fun fromJsonF(element: JsonElement): Color? {
if (element.isJsonPrimitive) {
val raw = element.asString.removePrefix("#")
val argb = raw.toLongOrNull(16)?.toInt()
if (argb != null) return Color(argb, true)
val raw = element.asString

val regex = """hex:\s*#([A-Fa-f0-9]{6,8}),\s*rainbow:\s*(true|false)""".toRegex()
val matchResult = regex.find(raw)

if (matchResult != null) {
val hexString = matchResult.groupValues[1]
val rainbowString = matchResult.groupValues[2].toBoolean()

val argb = hexString.toLongOrNull(16)?.toInt()
if (argb != null) {
return Color(argb, true).also { rainbow = rainbowString }
}
}
}
return null
}
}

val customBgColorValue = ColorValue(
"CustomBG",
Color(32, 32, 64),
false
)
// Any value set that is not coming from the ClickGUI styles should have the hue slider color changed too
override fun set(newValue: Color, saveImmediately: Boolean) = super.set(newValue, saveImmediately).also {
if (it && saveImmediately) {
hueSliderColor = newValue
}
}

override fun getString() = "Color[hex=${"#%06X".format(value.rgb)},rainbow=${rainbow}]"

fun readColorFromConfig(str: String): List<String>? {
val regex = """Color\[hex=#([0-9A-Fa-f]{6,8}),\s*rainbow=(true|false)]""".toRegex()
val matchResult = regex.find(str)

return matchResult?.let { listOf(it.groupValues[1], it.groupValues[2]) }
}

enum class SliderType {
COLOR,
HUE,
OPACITY
}
}

fun int(
name: String,
Expand Down
9 changes: 8 additions & 1 deletion ...a/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/fdpdropdown/SideGui/SideGui.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.fdpdropdown.SideGui

import net.ccbluex.liquidbounce.FDPClient.fileManager
import net.ccbluex.liquidbounce.config.ColorValue
import net.ccbluex.liquidbounce.config.SettingsUtils.applyScript
import net.ccbluex.liquidbounce.config.customBgColorValue
import net.ccbluex.liquidbounce.features.module.modules.client.ClickGUIModule.generateColor
import net.ccbluex.liquidbounce.features.module.modules.client.HUDModule.guiColor
import net.ccbluex.liquidbounce.handler.api.ClientApi
Expand Down Expand Up @@ -368,6 +368,13 @@ class SideGui : GuiPanel() {
}

private fun getBgPreviewColor(mode: String, alpha: Int): Int {

val customBgColorValue = ColorValue(
"CustomBG",
Color(32, 32, 64),
false
)

return when (mode.lowercase()) {
"none" -> Color(0, 0, 0, 0).rgb
"dark" -> Color(21, 21, 21, alpha).rgb
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ object RenderUtils : MinecraftInstance {
glDisable(GL_LINE_SMOOTH)
}

fun drawBorderedRect(x: Int, y: Int, x2: Int, y2: Int, width: Int, borderColor: Int, rectColor: Int) {
fun drawBorderedRect(x: Int, y: Int, x2: Int, y2: Int, width: Number, borderColor: Int, rectColor: Int) {
drawRect(x, y, x2, y2, rectColor)
drawBorder(x, y, x2, y2, width, borderColor)
}
Expand Down Expand Up @@ -1150,7 +1150,8 @@ object RenderUtils : MinecraftInstance {
glDisable(GL_LINE_SMOOTH)
}

fun drawBorder(x: Int, y: Int, x2: Int, y2: Int, width: Int, color: Int) {
fun drawBorder(x: Int, y: Int, x2: Int, y2: Int, width: Number, color: Int) {
glPushMatrix()
glEnable(GL_BLEND)
glDisable(GL_TEXTURE_2D)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
Expand All @@ -1166,6 +1167,7 @@ object RenderUtils : MinecraftInstance {
glEnable(GL_TEXTURE_2D)
glDisable(GL_BLEND)
glDisable(GL_LINE_SMOOTH)
glPopMatrix()
}

fun drawRoundedBorder(x: Float, y: Float, x2: Float, y2: Float, width: Float, color: Int, radius: Float) {
Expand Down

0 comments on commit 016fcbe

Please sign in to comment.