Skip to content

Commit f23b306

Browse files
opZywlopZywl
committed
feat: Add remaining setting components to Neverlose UI;
add range, text, and font setting renderers to the NL ClickGUI register all missing value types so modules expose every setting support dragging range sliders and editing text/font values within the interface
1 parent 0e538fb commit f23b306

File tree

10 files changed

+742
-119
lines changed

10 files changed

+742
-119
lines changed

‎src/main/java/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/nlclickgui/NlModule.kt‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Rende
1010
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.RenderUtil.interpolateColorC
1111
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.RenderUtil.isHovering
1212
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.RenderUtil.resetColor
13-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.BoolSetting
14-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.ColorSetting
15-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.Numbersetting
16-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.StringsSetting
13+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.BoolSetting
1714
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.animations.Animation
1815
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.animations.Direction
1916
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.animations.impl.DecelerateAnimation
2017
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.round.RoundedUtil.Companion.drawRound
18+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.ColorSetting
19+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.FontSetting
20+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.Numbersetting
21+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.RangeSetting
22+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.StringsSetting
23+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.TextSetting
2124
import net.ccbluex.liquidbounce.ui.font.Fonts
2225
import java.awt.Color
2326
import java.util.function.Consumer
@@ -57,12 +60,21 @@ class NlModule(var NlSub: NlSub, var module: Module, var lef: Boolean) {
5760
if (setting is FloatValue || setting is IntValue) {
5861
this.downwards.add(Numbersetting(setting, this))
5962
}
63+
if (setting is FloatRangeValue || setting is IntRangeValue) {
64+
this.downwards.add(RangeSetting(setting, this))
65+
}
6066
if (setting is ListValue) {
6167
this.downwards.add(StringsSetting(setting, this))
6268
}
6369
if (setting is ColorValue) {
6470
this.downwards.add(ColorSetting(setting, this))
6571
}
72+
if (setting is TextValue) {
73+
this.downwards.add(TextSetting(setting, this))
74+
}
75+
if (setting is FontValue) {
76+
this.downwards.add(FontSetting(setting, this))
77+
}
6678
}
6779
}
6880

@@ -115,7 +127,7 @@ class NlModule(var NlSub: NlSub, var module: Module, var lef: Boolean) {
115127
module.name,
116128
x + 100 + posx,
117129
y + posy + 55 + scrollY,
118-
if (getInstance().light) Color(95, 95, 95).getRGB() else -1
130+
if (getInstance().light) Color(95, 95, 95).rgb else -1
119131
)
120132

121133
drawRound(
@@ -152,10 +164,10 @@ class NlModule(var NlSub: NlSub, var module: Module, var lef: Boolean) {
152164

153165
if (module.values.isEmpty()) {
154166
Fonts.Nl.Nl_22.Nl_22!!.drawString(
155-
"No Settings.",
167+
"No settings.",
156168
x + 100 + posx,
157169
y + posy + scrollY + 72,
158-
if (getInstance().light) Color(95, 95, 95).getRGB() else -1
170+
if (getInstance().light) Color(95, 95, 95).rgb else -1
159171
)
160172
}
161173
}
@@ -165,7 +177,7 @@ class NlModule(var NlSub: NlSub, var module: Module, var lef: Boolean) {
165177

166178
val darkRectHover = brighter(darkRectColor, .8f)
167179

168-
val accentCircle = darker(NeverloseGui.Companion.neverlosecolor, .5f)
180+
val accentCircle = darker(NeverloseGui.neverlosecolor, .5f)
169181

170182

171183
toggleAnimation.direction = if (module.state) Direction.FORWARDS else Direction.BACKWARDS
@@ -188,7 +200,7 @@ class NlModule(var NlSub: NlSub, var module: Module, var lef: Boolean) {
188200
6.5f,
189201
6.5f,
190202
3f,
191-
if (module.state) NeverloseGui.Companion.neverlosecolor else if (getInstance().light) Color(
203+
if (module.state) NeverloseGui.neverlosecolor else if (getInstance().light) Color(
192204
255,
193205
255,
194206
255

‎src/main/java/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/nlclickgui/NlTab.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui
22

33
import net.ccbluex.liquidbounce.features.module.Category
4-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.BoolSetting
5-
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings.Numbersetting
4+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.BoolSetting
5+
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings.Numbersetting
66
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.animations.Direction
77
import net.ccbluex.liquidbounce.ui.font.Fonts
88
import java.awt.Color

‎src/main/java/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/nlclickgui/Settings/ColorSetting.kt‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/java/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/nlclickgui/Settings/BoolSetting.kt renamed to src/main/java/net/ccbluex/liquidbounce/ui/client/clickgui/style/styles/nlclickgui/settings/BoolSetting.kt

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Settings
1+
package net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.settings
22

33
import net.ccbluex.liquidbounce.config.BoolValue
44
import net.ccbluex.liquidbounce.ui.client.clickgui.style.styles.nlclickgui.Downward
@@ -18,46 +18,45 @@ class BoolSetting(s: BoolValue, moduleRender: NlModule) : Downward<BoolValue>(s,
1818
private val hoveringAnimation: Animation = DecelerateAnimation(225, 1.0, Direction.BACKWARDS)
1919

2020
override fun draw(mouseX: Int, mouseY: Int) {
21-
val mainx = NeverloseGui.getInstance().x
22-
val mainy = NeverloseGui.getInstance().y
23-
21+
val mainx = NeverloseGui.Companion.getInstance().x
22+
val mainy = NeverloseGui.Companion.getInstance().y
2423

2524
val booly = (y + getScrollY()).toInt()
2625

27-
Fonts.Nl_16.drawString(
26+
Fonts.Nl.Nl_16.Nl_16.drawString(
2827
setting.name,
29-
(mainx + 100 + x).toFloat(),
28+
(mainx + 100 + x),
3029
(mainy + booly + 57).toFloat(),
31-
if (NeverloseGui.getInstance().light) Color(95, 95, 95).rgb else -1
30+
if (NeverloseGui.Companion.getInstance().light) Color(95, 95, 95).rgb else -1
3231
)
3332

3433
val darkRectColor = Color(29, 29, 39, 255)
3534
val darkRectHover = RenderUtil.brighter(darkRectColor, .8f)
36-
val accentCircle = RenderUtil.darker(NeverloseGui.neverlosecolor, .5f)
37-
35+
val accentCircle = RenderUtil.darker(NeverloseGui.Companion.neverlosecolor, .5f)
3836

3937
toggleAnimation.direction = if (setting.get()) Direction.FORWARDS else Direction.BACKWARDS
4038

41-
39+
// CORREÇÃO: Adicionado .toFloat() na posição X
4240
hoveringAnimation.direction = if (
4341
RenderUtil.isHovering(
44-
NeverloseGui.getInstance().x + 265 - 32 + x,
45-
(NeverloseGui.getInstance().y + (y + getScrollY()).toInt() + 57).toFloat(),
42+
(NeverloseGui.Companion.getInstance().x + 265 - 32 + x).toFloat(),
43+
(NeverloseGui.Companion.getInstance().y + (y + getScrollY()).toInt() + 57).toFloat(),
4644
16f,
4745
4.5f,
48-
mouseX.toFloat().toInt(),
49-
mouseY.toFloat().toInt()
46+
mouseX,
47+
mouseY
5048
)
5149
) Direction.FORWARDS else Direction.BACKWARDS
5250

53-
54-
RoundedUtil.drawRound(
55-
mainx + 265 - 32 + x,
51+
// Fundo do Toggle
52+
// CORREÇÃO: Adicionado .toFloat() na posição X
53+
RoundedUtil.Companion.drawRound(
54+
(mainx + 265 - 32 + x).toFloat(),
5655
(mainy + booly + 57).toFloat(),
5756
16f,
5857
4.5f,
5958
2f,
60-
if (NeverloseGui.getInstance().light) {
59+
if (NeverloseGui.Companion.getInstance().light) {
6160
RenderUtil.interpolateColorC(
6261
Color(230, 230, 230),
6362
Color(0, 112, 186),
@@ -72,6 +71,7 @@ class BoolSetting(s: BoolValue, moduleRender: NlModule) : Downward<BoolValue>(s,
7271
}
7372
)
7473

74+
// Efeito de Glow
7575
RenderUtil.fakeCircleGlow(
7676
(mainx + 265 + 3 - 32 + x + 11 * toggleAnimation.getOutput()).toFloat(),
7777
(mainy + booly + 59).toFloat(),
@@ -82,15 +82,16 @@ class BoolSetting(s: BoolValue, moduleRender: NlModule) : Downward<BoolValue>(s,
8282

8383
RenderUtil.resetColor()
8484

85-
RoundedUtil.drawRound(
85+
// Bolinha do Toggle
86+
RoundedUtil.Companion.drawRound(
8687
(mainx + 265 - 32 + x + 11 * toggleAnimation.getOutput()).toFloat(),
8788
(mainy + booly + 56).toFloat(),
8889
6.5f,
8990
6.5f,
9091
3f,
9192
if (setting.get()) {
92-
NeverloseGui.neverlosecolor
93-
} else if (NeverloseGui.getInstance().light) {
93+
NeverloseGui.Companion.neverlosecolor
94+
} else if (NeverloseGui.Companion.getInstance().light) {
9495
Color(255, 255, 255)
9596
} else {
9697
Color(
@@ -104,21 +105,22 @@ class BoolSetting(s: BoolValue, moduleRender: NlModule) : Downward<BoolValue>(s,
104105

105106
override fun mouseClicked(mouseX: Int, mouseY: Int, mouseButton: Int) {
106107
if (mouseButton == 0) {
108+
// CORREÇÃO: Adicionado .toFloat() na posição X
107109
if (
108110
RenderUtil.isHovering(
109-
NeverloseGui.getInstance().x + 265 - 32 + x,
110-
(NeverloseGui.getInstance().y + (y + getScrollY()).toInt() + 57).toFloat(),
111+
(NeverloseGui.Companion.getInstance().x + 265 - 32 + x).toFloat(),
112+
(NeverloseGui.Companion.getInstance().y + (y + getScrollY()).toInt() + 57).toFloat(),
111113
16f,
112114
4.5f,
113-
mouseX.toFloat().toInt(),
114-
mouseY.toFloat().toInt()
115+
mouseX,
116+
mouseY
115117
)
116118
) {
117-
setting.set(!setting.get(), true)
119+
setting.set(!setting.get())
118120
}
119121
}
120122
}
121123

122124
override fun mouseReleased(mouseX: Int, mouseY: Int, state: Int) {
123125
}
124-
}
126+
}

0 commit comments

Comments
 (0)