Skip to content

Commit

Permalink
feat: new color themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@opZywl
opZywl committed Jan 2, 2025
1 parent a1387d7 commit f472a88
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package net.ccbluex.liquidbounce

import com.formdev.flatlaf.themes.FlatMacLightLaf
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import net.ccbluex.liquidbounce.event.ClientShutdownEvent
import net.ccbluex.liquidbounce.event.EventManager
import net.ccbluex.liquidbounce.event.StartupEvent
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/ccbluex/liquidbounce/ui/font/fontmanager/api/FontType.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ package net.ccbluex.liquidbounce.ui.font.fontmanager.api
enum class FontType(val fileName: String) {
SF("sf.ttf"),
SFBOLD("sfbold.ttf"),
SFTHIN("SFREGULAR.ttf"),
Check("check.ttf"),
ICONFONT("stylesicons.ttf"),
NursultanMedium("Nursultan.ttf"),
InterMedium("Inter_Medium.ttf"),
InterBold("Inter_Bold.ttf");
InterBold("Inter_Bold.ttf"),
InterRegular("Inter_Regular.ttf");
}
5 changes: 5 additions & 0 deletions src/main/java/net/ccbluex/liquidbounce/ui/font/fontmanager/impl/Fonts.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,9 @@ object Fonts {
val InterBold26: FontRenderer = fontFamily.ofSize(26)
val InterBold30: FontRenderer = fontFamily.ofSize(30)
}

object InterRegular {
private val fontFamily = FONT_MANAGER.fontFamily(FontType.InterRegular)
val InterRegular15: FontRenderer = fontFamily.ofSize(15)
}
}
165 changes: 162 additions & 3 deletions src/main/java/net/ccbluex/liquidbounce/utils/client/ClientThemesUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ object ClientThemesUtils {

/**
* The selected color mode (e.g., "Zywl", "Water", "Magic", etc.).
* Now a normal var with a default value "Soniga".
* Now a normal var with a default value "FDP".
*/
var ClientColorMode: String = "FDP"
set(value) {
Expand Down Expand Up @@ -148,7 +148,70 @@ object ClientThemesUtils {
if (type == "start") Color(80, 255, 255, alpha) else Color(80, 190, 255, alpha)
"peony" ->
if (type == "start") Color(255, 120, 255, alpha) else Color(255, 190, 255, alpha)

"vergren" ->
if (type == "start") Color(170, 255, 169, alpha) else Color(17, 255, 189, alpha)
"eveningsunshine" ->
if (type == "start") Color(185, 43, 39, alpha) else Color(21, 101, 192, alpha)
"lightorange" ->
if (type == "start") Color(255, 183, 94, alpha) else Color(237, 143, 3, alpha)
"reef" ->
if (type == "start") Color(0, 210, 255, alpha) else Color(58, 123, 213, alpha)
"amin" ->
if (type == "start") Color(142, 45, 226, alpha) else Color(74, 0, 224, alpha)
"magics" ->
if (type == "start") Color(89, 193, 115, alpha) else Color(93, 38, 193, alpha)
"mangopulp" ->
if (type == "start") Color(240, 152, 25, alpha) else Color(237, 222, 93, alpha)
"moonpurple" ->
if (type == "start") Color(78, 84, 200, alpha) else Color(143, 148, 251, alpha)
"aqualicious" ->
if (type == "start") Color(80, 201, 195, alpha) else Color(150, 222, 218, alpha)
"stripe" ->
if (type == "start") Color(31, 162, 255, alpha) else Color(166, 255, 203, alpha)
"shifter" ->
if (type == "start") Color(188, 78, 156, alpha) else Color(248, 7, 89, alpha)
"quepal" ->
if (type == "start") Color(17, 153, 142, alpha) else Color(56, 239, 125, alpha)
"orca" ->
if (type == "start") Color(68, 160, 141, alpha) else Color(9, 54, 55, alpha)
"sublimevivid" ->
if (type == "start") Color(252, 70, 107, alpha) else Color(63, 94, 251, alpha)
"moonasteroid" ->
if (type == "start") Color(15, 32, 39, alpha) else Color(44, 83, 100, alpha)
"summerdog" ->
if (type == "start") Color(168, 255, 120, alpha) else Color(120, 255, 214, alpha)
"pinkflavour" ->
if (type == "start") Color(128, 0, 128, alpha) else Color(255, 192, 203, alpha)
"sincityred" ->
if (type == "start") Color(237, 33, 58, alpha) else Color(147, 41, 30, alpha)
"timber" ->
if (type == "start") Color(252, 0, 255, alpha) else Color(0, 219, 222, alpha)
"pinotnoir" ->
if (type == "start") Color(75, 108, 183, alpha) else Color(24, 40, 72, alpha)
"dirtyfog" ->
if (type == "start") Color(185, 147, 214, alpha) else Color(140, 166, 219, alpha)
"piglet" ->
if (type == "start") Color(238, 156, 167, alpha) else Color(255, 221, 225, alpha)
"littleleaf" ->
if (type == "start") Color(118, 184, 82, alpha) else Color(141, 194, 111, alpha)
"nelson" ->
if (type == "start") Color(242, 112, 156, alpha) else Color(255, 148, 114, alpha)
"turquoiseflow" ->
if (type == "start") Color(19, 106, 138, alpha) else Color(38, 120, 113, alpha)
"purplin" ->
if (type == "start") Color(106, 48, 147, alpha) else Color(160, 68, 255, alpha)
"martini" ->
if (type == "start") Color(253, 252, 71, alpha) else Color(36, 254, 65, alpha)
"soundcloud" ->
if (type == "start") Color(254, 140, 0, alpha) else Color(248, 54, 0, alpha)
"inbox" ->
if (type == "start") Color(69, 127, 202, alpha) else Color(86, 145, 200, alpha)
"amethyst" ->
if (type == "start") Color(157, 80, 187, alpha) else Color(110, 72, 170, alpha)
"blush" ->
if (type == "start") Color(178, 69, 146, alpha) else Color(241, 95, 121, alpha)
"mocharose" ->
if (type == "start") Color(245, 194, 231, alpha) else Color(243, 139, 168, alpha)
"astolfo" ->
if (type == "start")
ColorUtils.skyRainbow(0, 0.6f, 1f, 20000F / ThemeFadeSpeed).setAlpha(alpha)
Expand Down Expand Up @@ -196,7 +259,39 @@ object ClientThemesUtils {
"fire" to Pair(Color(255, 45, 30), Color(255, 123, 15)),
"aqua" to Pair(Color(80,255,255), Color(80,190,255)),
"peony" to Pair(Color(255,120,255), Color(255,190,255)),
"astolfo" to Pair(
"vergren" to Pair(Color(170, 255, 169), Color(17, 255, 189)),
"eveningsunshine" to Pair(Color(185, 43, 39), Color(21, 101, 192)),
"lightorange" to Pair(Color(255, 183, 94), Color(237, 143, 3)),
"reef" to Pair(Color(0, 210, 255), Color(58, 123, 213)),
"amin" to Pair(Color(142, 45, 226), Color(74, 0, 224)),
"magics" to Pair(Color(89, 193, 115), Color(93, 38, 193)),
"mangopulp" to Pair(Color(240, 152, 25), Color(237, 222, 93)),
"moonpurple" to Pair(Color(78, 84, 200), Color(143, 148, 251)),
"aqualicious" to Pair(Color(80, 201, 195), Color(150, 222, 218)),
"stripe" to Pair(Color(31, 162, 255), Color(166, 255, 203)),
"shifter" to Pair(Color(188, 78, 156), Color(248, 7, 89)),
"quepal" to Pair(Color(17, 153, 142), Color(56, 239, 125)),
"orca" to Pair(Color(68, 160, 141), Color(9, 54, 55)),
"sublimevivid" to Pair(Color(252, 70, 107), Color(63, 94, 251)),
"moonasteroid" to Pair(Color(15, 32, 39), Color(44, 83, 100)),
"summerdog" to Pair(Color(168, 255, 120), Color(120, 255, 214)),
"pinkflavour" to Pair(Color(128, 0, 128), Color(255, 192, 203)),
"sincityred" to Pair(Color(237, 33, 58), Color(147, 41, 30)),
"timber" to Pair(Color(252, 0, 255), Color(0, 219, 222)),
"pinotnoir" to Pair(Color(75, 108, 183), Color(24, 40, 72)),
"dirtyfog" to Pair(Color(185, 147, 214), Color(140, 166, 219)),
"piglet" to Pair(Color(238, 156, 167), Color(255, 221, 225)),
"littleleaf" to Pair(Color(118, 184, 82), Color(141, 194, 111)),
"nelson" to Pair(Color(242, 112, 156), Color(255, 148, 114)),
"turquoiseflow" to Pair(Color(19, 106, 138), Color(38, 120, 113)),
"purplin" to Pair(Color(106, 48, 147), Color(160, 68, 255)),
"martini" to Pair(Color(253, 252, 71), Color(36, 254, 65)),
"soundcloud" to Pair(Color(254, 140, 0), Color(248, 54, 0)),
"inbox" to Pair(Color(69, 127, 202), Color(86, 145, 200)),
"amethyst" to Pair(Color(157, 80, 187), Color(110, 72, 170)),
"blush" to Pair(Color(178, 69, 146), Color(241, 95, 121)),
"mocharose" to Pair(Color(245, 194, 231), Color(243, 139, 168)),
"astolfo" to Pair(
ColorUtils.skyRainbow(0, 0.6F, 1F, 20000F / ThemeFadeSpeed),
ColorUtils.skyRainbow(90, 0.6F, 1F, 20000F / ThemeFadeSpeed)
),
Expand Down Expand Up @@ -239,6 +334,38 @@ object ClientThemesUtils {
"fire" -> mixColors(Color(255,45,30), Color(255,123,15), fadeSpeed, index).setAlpha(alpha)
"aqua" -> mixColors(Color(80,255,255), Color(80,190,255), fadeSpeed, index).setAlpha(alpha)
"peony" -> mixColors(Color(255,120,255), Color(255,190,255), fadeSpeed, index).setAlpha(alpha)
"vergren" -> mixColors(Color(170, 255, 169), Color(17, 255, 189), fadeSpeed, index).setAlpha(alpha)
"eveningsunshine" -> mixColors(Color(185, 43, 39), Color(21, 101, 192), fadeSpeed, index).setAlpha(alpha)
"lightorange" -> mixColors(Color(255, 183, 94), Color(237, 143, 3), fadeSpeed, index).setAlpha(alpha)
"reef" -> mixColors(Color(0, 210, 255), Color(58, 123, 213), fadeSpeed, index).setAlpha(alpha)
"amin" -> mixColors(Color(142, 45, 226), Color(74, 0, 224), fadeSpeed, index).setAlpha(alpha)
"magics" -> mixColors(Color(89, 193, 115), Color(93, 38, 193), fadeSpeed, index).setAlpha(alpha)
"mangopulp" -> mixColors(Color(240, 152, 25), Color(237, 222, 93), fadeSpeed, index).setAlpha(alpha)
"moonpurple" -> mixColors(Color(78, 84, 200), Color(143, 148, 251), fadeSpeed, index).setAlpha(alpha)
"aqualicious" -> mixColors(Color(80, 201, 195), Color(150, 222, 218), fadeSpeed, index).setAlpha(alpha)
"stripe" -> mixColors(Color(31, 162, 255), Color(166, 255, 203), fadeSpeed, index).setAlpha(alpha)
"shifter" -> mixColors(Color(188, 78, 156), Color(248, 7, 89), fadeSpeed, index).setAlpha(alpha)
"quepal" -> mixColors(Color(17, 153, 142), Color(56, 239, 125), fadeSpeed, index).setAlpha(alpha)
"orca" -> mixColors(Color(68, 160, 141), Color(9, 54, 55), fadeSpeed, index).setAlpha(alpha)
"sublimevivid" -> mixColors(Color(252, 70, 107), Color(63, 94, 251), fadeSpeed, index).setAlpha(alpha)
"moonasteroid" -> mixColors(Color(15, 32, 39), Color(44, 83, 100), fadeSpeed, index).setAlpha(alpha)
"summerdog" -> mixColors(Color(168, 255, 120), Color(120, 255, 214), fadeSpeed, index).setAlpha(alpha)
"pinkflavour" -> mixColors(Color(128, 0, 128), Color(255, 192, 203), fadeSpeed, index).setAlpha(alpha)
"sincityred" -> mixColors(Color(237, 33, 58), Color(147, 41, 30), fadeSpeed, index).setAlpha(alpha)
"timber" -> mixColors(Color(252, 0, 255), Color(0, 219, 222), fadeSpeed, index).setAlpha(alpha)
"pinotnoir" -> mixColors(Color(75, 108, 183), Color(24, 40, 72), fadeSpeed, index).setAlpha(alpha)
"dirtyfog" -> mixColors(Color(185, 147, 214), Color(140, 166, 219), fadeSpeed, index).setAlpha(alpha)
"piglet" -> mixColors(Color(238, 156, 167), Color(255, 221, 225), fadeSpeed, index).setAlpha(alpha)
"littleleaf" -> mixColors(Color(118, 184, 82), Color(141, 194, 111), fadeSpeed, index).setAlpha(alpha)
"nelson" -> mixColors(Color(242, 112, 156), Color(255, 148, 114), fadeSpeed, index).setAlpha(alpha)
"turquoiseflow" -> mixColors(Color(19, 106, 138), Color(38, 120, 113), fadeSpeed, index).setAlpha(alpha)
"purplin" -> mixColors(Color(106, 48, 147), Color(160, 68, 255), fadeSpeed, index).setAlpha(alpha)
"martini" -> mixColors(Color(253, 252, 71), Color(36, 254, 65), fadeSpeed, index).setAlpha(alpha)
"soundcloud" -> mixColors(Color(254, 140, 0), Color(248, 54, 0), fadeSpeed, index).setAlpha(alpha)
"inbox" -> mixColors(Color(69, 127, 202), Color(86, 145, 200), fadeSpeed, index).setAlpha(alpha)
"amethyst" -> mixColors(Color(157, 80, 187), Color(110, 72, 170), fadeSpeed, index).setAlpha(alpha)
"blush" -> mixColors(Color(178, 69, 146), Color(241, 95, 121), fadeSpeed, index).setAlpha(alpha)
"mocharose" -> mixColors(Color(245, 194, 231), Color(243, 139, 168), fadeSpeed, index).setAlpha(alpha)

"rainbow" -> ColorUtils.skyRainbow(0, 1F, 1f, 20000F / ThemeFadeSpeed).setAlpha(alpha)
"astolfo" -> ColorUtils.skyRainbow(0, 0.6f, 1f, 20000F / ThemeFadeSpeed).setAlpha(alpha)
Expand Down Expand Up @@ -280,6 +407,38 @@ object ClientThemesUtils {
"fire" to Pair(Color(255, 45, 30), Color(255, 123, 15)),
"aqua" to Pair(Color(80,255,255), Color(80,190,255)),
"peony" to Pair(Color(255,120,255), Color(255,190,255)),
"vergren" to Pair(Color(170, 255, 169), Color(17, 255, 189)),
"eveningsunshine" to Pair(Color(185, 43, 39), Color(21, 101, 192)),
"lightorange" to Pair(Color(255, 183, 94), Color(237, 143, 3)),
"reef" to Pair(Color(0, 210, 255), Color(58, 123, 213)),
"amin" to Pair(Color(142, 45, 226), Color(74, 0, 224)),
"magics" to Pair(Color(89, 193, 115), Color(93, 38, 193)),
"mangopulp" to Pair(Color(240, 152, 25), Color(237, 222, 93)),
"moonpurple" to Pair(Color(78, 84, 200), Color(143, 148, 251)),
"aqualicious" to Pair(Color(80, 201, 195), Color(150, 222, 218)),
"stripe" to Pair(Color(31, 162, 255), Color(166, 255, 203)),
"shifter" to Pair(Color(188, 78, 156), Color(248, 7, 89)),
"quepal" to Pair(Color(17, 153, 142), Color(56, 239, 125)),
"orca" to Pair(Color(68, 160, 141), Color(9, 54, 55)),
"sublimevivid" to Pair(Color(252, 70, 107), Color(63, 94, 251)),
"moonasteroid" to Pair(Color(15, 32, 39), Color(44, 83, 100)),
"summerdog" to Pair(Color(168, 255, 120), Color(120, 255, 214)),
"pinkflavour" to Pair(Color(128, 0, 128), Color(255, 192, 203)),
"sincityred" to Pair(Color(237, 33, 58), Color(147, 41, 30)),
"timber" to Pair(Color(252, 0, 255), Color(0, 219, 222)),
"pinotnoir" to Pair(Color(75, 108, 183), Color(24, 40, 72)),
"dirtyfog" to Pair(Color(185, 147, 214), Color(140, 166, 219)),
"piglet" to Pair(Color(238, 156, 167), Color(255, 221, 225)),
"littleleaf" to Pair(Color(118, 184, 82), Color(141, 194, 111)),
"nelson" to Pair(Color(242, 112, 156), Color(255, 148, 114)),
"turquoiseflow" to Pair(Color(19, 106, 138), Color(38, 120, 113)),
"purplin" to Pair(Color(106, 48, 147), Color(160, 68, 255)),
"martini" to Pair(Color(253, 252, 71), Color(36, 254, 65)),
"soundcloud" to Pair(Color(254, 140, 0), Color(248, 54, 0)),
"inbox" to Pair(Color(69, 127, 202), Color(86, 145, 200)),
"amethyst" to Pair(Color(157, 80, 187), Color(110, 72, 170)),
"blush" to Pair(Color(178, 69, 146), Color(241, 95, 121)),
"mocharose" to Pair(Color(245, 194, 231), Color(243, 139, 168)),
"astolfo" to Pair(
ColorUtils.skyRainbow(0, 0.6F, 1F, 20000F / ThemeFadeSpeed),
ColorUtils.skyRainbow(90, 0.6F, 1F, 20000F / ThemeFadeSpeed)
Expand Down
11 changes: 1 addition & 10 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 @@ -15,6 +15,7 @@ import net.ccbluex.liquidbounce.features.module.modules.visual.CombatVisuals.col
import net.ccbluex.liquidbounce.features.module.modules.visual.CombatVisuals.colorRedTwoValue
import net.ccbluex.liquidbounce.features.module.modules.visual.CombatVisuals.colorRedValue
import net.ccbluex.liquidbounce.features.module.modules.visual.CombatVisuals.start
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.fdpdropdown.utils.render.DrRenderUtils
import net.ccbluex.liquidbounce.ui.font.Fonts
import net.ccbluex.liquidbounce.utils.block.block
import net.ccbluex.liquidbounce.utils.block.center
Expand Down Expand Up @@ -4299,14 +4300,4 @@ object RenderUtils : MinecraftInstance {
glEnable(GL_TEXTURE_2D)
disableBlend()
}

@JvmStatic
fun rotateGLUtil(x: Float, y: Float, rotate: Float, f: Runnable) {
pushMatrix()
translate(x, y, 0f)
rotate(rotate, 0f, 0f, -1f)
translate(-x, -y, 0f)
f.run()
popMatrix()
}
}

0 comments on commit f472a88

Please sign in to comment.