Skip to content

Commit 6715cab

Browse files
Sync LunarClient Mods & Options
1 parent 6ce0729 commit 6715cab

File tree

14 files changed

+430
-45
lines changed

14 files changed

+430
-45
lines changed

api/src/main/java/com/lunarclient/apollo/mods/impl/ModAutoTextHotkey.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@ public final class ModAutoTextHotkey {
4343
.notifyClient()
4444
.build();
4545

46+
/**
47+
* Displays a notification when an input is blocked by the server.
48+
*
49+
* @since %release_version%
50+
*/
51+
public static final SimpleOption<Boolean> NOTIFY_ON_BLOCKED_INPUT = SimpleOption.<Boolean>builder()
52+
.comment("Displays a notification when an input is blocked by the server")
53+
.node("auto-text-hotkey", "notify-on-blocked-input").type(TypeToken.get(Boolean.class))
54+
.notifyClient()
55+
.build();
56+
4657
private ModAutoTextHotkey() {
4758
}
4859

api/src/main/java/com/lunarclient/apollo/mods/impl/ModDirectionHud.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public final class ModDirectionHud {
124124
*
125125
* @since 1.0.0
126126
*/
127-
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
128-
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
127+
public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
128+
.node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
129129
.notifyClient()
130130
.build();
131131

@@ -134,8 +134,8 @@ public final class ModDirectionHud {
134134
*
135135
* @since 1.0.0
136136
*/
137-
public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
138-
.node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
137+
public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
138+
.node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
139139
.notifyClient()
140140
.build();
141141

@@ -144,8 +144,19 @@ public final class ModDirectionHud {
144144
*
145145
* @since 1.0.0
146146
*/
147-
public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
148-
.node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
147+
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
148+
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
149+
.notifyClient()
150+
.build();
151+
152+
/**
153+
* Choose whether to show the Direction HUD when TAB is open.
154+
*
155+
* @since %release_version%
156+
*/
157+
public static final SimpleOption<Boolean> SHOW_WITH_TAB = SimpleOption.<Boolean>builder()
158+
.comment("Choose whether to show the Direction HUD when TAB is open.")
159+
.node("direction-hud", "show-with-tab").type(TypeToken.get(Boolean.class))
149160
.notifyClient()
150161
.build();
151162

api/src/main/java/com/lunarclient/apollo/mods/impl/ModPing.java

Lines changed: 83 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,71 @@ public final class ModPing {
5353
public static final NumberOption<Integer> UPDATE_INTERVAL_SEC = NumberOption.<Integer>number()
5454
.comment("Faster updates may impact performance")
5555
.node("ping", "update-interval-sec").type(TypeToken.get(Integer.class))
56-
.min(1).max(30)
56+
.min(1).max(120)
57+
.notifyClient()
58+
.build();
59+
60+
/**
61+
* How many updates to average together (one update happens per the 'update interval' setting).
62+
*
63+
* @since %release_version%
64+
*/
65+
public static final NumberOption<Integer> AVERAGE_SAMPLES = NumberOption.<Integer>number()
66+
.comment("How many updates to average together (one update happens per the 'update interval' setting)")
67+
.node("ping", "average-samples").type(TypeToken.get(Integer.class))
68+
.min(2).max(20)
5769
.notifyClient()
5870
.build();
5971

6072
/**
6173
* No documentation available.
6274
*
63-
* @since 1.1.1
75+
* @since %release_version%
6476
*/
65-
public static final SimpleOption<Boolean> ENABLE_PING_NAMETAG = SimpleOption.<Boolean>builder()
66-
.node("ping", "enable-ping-nametag").type(TypeToken.get(Boolean.class))
77+
public static final SimpleOption<Boolean> PING_SPIKE_DETECTION = SimpleOption.<Boolean>builder()
78+
.node("ping", "ping-spike-detection").type(TypeToken.get(Boolean.class))
6779
.notifyClient()
6880
.build();
6981

7082
/**
7183
* No documentation available.
7284
*
73-
* @since 1.1.1
85+
* @since %release_version%
7486
*/
75-
public static final SimpleOption<Boolean> PING_ABOVE = SimpleOption.<Boolean>builder()
76-
.node("ping", "ping-above").type(TypeToken.get(Boolean.class))
87+
public static final NumberOption<Integer> MEDIUM_SPIKE_THRESHOLD = NumberOption.<Integer>number()
88+
.node("ping", "medium-spike-threshold").type(TypeToken.get(Integer.class))
89+
.min(1).max(200)
90+
.notifyClient()
91+
.build();
92+
93+
/**
94+
* No documentation available.
95+
*
96+
* @since %release_version%
97+
*/
98+
public static final SimpleOption<Color> MEDIUM_SPIKE_COLOR = SimpleOption.<Color>builder()
99+
.node("ping", "medium-spike-color").type(TypeToken.get(Color.class))
100+
.notifyClient()
101+
.build();
102+
103+
/**
104+
* No documentation available.
105+
*
106+
* @since %release_version%
107+
*/
108+
public static final NumberOption<Integer> LARGE_SPIKE_THRESHOLD = NumberOption.<Integer>number()
109+
.node("ping", "large-spike-threshold").type(TypeToken.get(Integer.class))
110+
.min(1).max(200)
111+
.notifyClient()
112+
.build();
113+
114+
/**
115+
* No documentation available.
116+
*
117+
* @since %release_version%
118+
*/
119+
public static final SimpleOption<Color> LARGE_SPIKE_COLOR = SimpleOption.<Color>builder()
120+
.node("ping", "large-spike-color").type(TypeToken.get(Color.class))
77121
.notifyClient()
78122
.build();
79123

@@ -87,6 +131,16 @@ public final class ModPing {
87131
.notifyClient()
88132
.build();
89133

134+
/**
135+
* No documentation available.
136+
*
137+
* @since %release_version%
138+
*/
139+
public static final SimpleOption<Boolean> SHOW_PING_PREFIX = SimpleOption.<Boolean>builder()
140+
.node("ping", "show-ping-prefix").type(TypeToken.get(Boolean.class))
141+
.notifyClient()
142+
.build();
143+
90144
/**
91145
* No documentation available.
92146
*
@@ -157,6 +211,28 @@ public final class ModPing {
157211
.notifyClient()
158212
.build();
159213

214+
/**
215+
* No documentation available.
216+
*
217+
* @since 1.1.1
218+
*/
219+
@Deprecated
220+
public static final SimpleOption<Boolean> ENABLE_PING_NAMETAG = SimpleOption.<Boolean>builder()
221+
.node("ping", "enable-ping-nametag").type(TypeToken.get(Boolean.class))
222+
.notifyClient()
223+
.build();
224+
225+
/**
226+
* No documentation available.
227+
*
228+
* @since 1.1.1
229+
*/
230+
@Deprecated
231+
public static final SimpleOption<Boolean> PING_ABOVE = SimpleOption.<Boolean>builder()
232+
.node("ping", "ping-above").type(TypeToken.get(Boolean.class))
233+
.notifyClient()
234+
.build();
235+
160236
/**
161237
* No documentation available.
162238
*

api/src/main/java/com/lunarclient/apollo/mods/impl/ModPotionEffects.java

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,87 @@ public final class ModPotionEffects {
9696
.notifyClient()
9797
.build();
9898

99+
/**
100+
* No documentation available.
101+
*
102+
* @since %release_version%
103+
*/
104+
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
105+
.node("potion-effects", "background").type(TypeToken.get(Boolean.class))
106+
.notifyClient()
107+
.build();
108+
109+
/**
110+
* No documentation available.
111+
*
112+
* @since %release_version%
113+
*/
114+
public static final SimpleOption<Boolean> MINIMAL_MODE = SimpleOption.<Boolean>builder()
115+
.node("potion-effects", "minimal-mode").type(TypeToken.get(Boolean.class))
116+
.notifyClient()
117+
.build();
118+
119+
/**
120+
* No documentation available.
121+
*
122+
* @since %release_version%
123+
*/
124+
public static final SimpleOption<Boolean> MINIMAL_MODE_HORIZONTAL = SimpleOption.<Boolean>builder()
125+
.node("potion-effects", "minimal-mode-horizontal").type(TypeToken.get(Boolean.class))
126+
.notifyClient()
127+
.build();
128+
129+
/**
130+
* No documentation available.
131+
*
132+
* @since %release_version%
133+
*/
134+
public static final SimpleOption<Boolean> BORDER = SimpleOption.<Boolean>builder()
135+
.node("potion-effects", "border").type(TypeToken.get(Boolean.class))
136+
.notifyClient()
137+
.build();
138+
139+
/**
140+
* No documentation available.
141+
*
142+
* @since %release_version%
143+
*/
144+
public static final NumberOption<Float> BORDER_THICKNESS = NumberOption.<Float>number()
145+
.node("potion-effects", "border-thickness").type(TypeToken.get(Float.class))
146+
.min(0.5F).max(3.0F)
147+
.notifyClient()
148+
.build();
149+
150+
/**
151+
* No documentation available.
152+
*
153+
* @since %release_version%
154+
*/
155+
public static final SimpleOption<Boolean> FORMATTED_DURATIONS = SimpleOption.<Boolean>builder()
156+
.node("potion-effects", "formatted-durations").type(TypeToken.get(Boolean.class))
157+
.notifyClient()
158+
.build();
159+
160+
/**
161+
* No documentation available.
162+
*
163+
* @since %release_version%
164+
*/
165+
public static final SimpleOption<Boolean> UPPERCASE_POTION_NAMES = SimpleOption.<Boolean>builder()
166+
.node("potion-effects", "uppercase-potion-names").type(TypeToken.get(Boolean.class))
167+
.notifyClient()
168+
.build();
169+
170+
/**
171+
* No documentation available.
172+
*
173+
* @since %release_version%
174+
*/
175+
public static final SimpleOption<Boolean> REVERSED_TEXT = SimpleOption.<Boolean>builder()
176+
.node("potion-effects", "reversed-text").type(TypeToken.get(Boolean.class))
177+
.notifyClient()
178+
.build();
179+
99180
/**
100181
* No documentation available.
101182
*
@@ -127,6 +208,26 @@ public final class ModPotionEffects {
127208
.notifyClient()
128209
.build();
129210

211+
/**
212+
* No documentation available.
213+
*
214+
* @since %release_version%
215+
*/
216+
public static final SimpleOption<Color> BACKGROUND_COLOR = SimpleOption.<Color>builder()
217+
.node("potion-effects", "background-color").type(TypeToken.get(Color.class))
218+
.notifyClient()
219+
.build();
220+
221+
/**
222+
* No documentation available.
223+
*
224+
* @since %release_version%
225+
*/
226+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
227+
.node("potion-effects", "border-color").type(TypeToken.get(Color.class))
228+
.notifyClient()
229+
.build();
230+
130231
/**
131232
* No documentation available.
132233
*

api/src/main/java/com/lunarclient/apollo/mods/impl/ModRadio.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public final class ModRadio {
5050
*
5151
* @since 1.1.7
5252
*/
53-
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
54-
.node("radio", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
53+
public static final NumberOption<Integer> VOLUME = NumberOption.<Integer>number()
54+
.node("radio", "volume").type(TypeToken.get(Integer.class))
55+
.min(0).max(100)
5656
.notifyClient()
5757
.build();
5858

@@ -61,9 +61,8 @@ public final class ModRadio {
6161
*
6262
* @since 1.1.7
6363
*/
64-
public static final NumberOption<Integer> VOLUME = NumberOption.<Integer>number()
65-
.node("radio", "volume").type(TypeToken.get(Integer.class))
66-
.min(0).max(100)
64+
public static final SimpleOption<Boolean> MUTE_RADIO = SimpleOption.<Boolean>builder()
65+
.node("radio", "mute-radio").type(TypeToken.get(Boolean.class))
6766
.notifyClient()
6867
.build();
6968

@@ -72,8 +71,9 @@ public final class ModRadio {
7271
*
7372
* @since 1.1.7
7473
*/
75-
public static final SimpleOption<Boolean> MUTE_RADIO = SimpleOption.<Boolean>builder()
76-
.node("radio", "mute-radio").type(TypeToken.get(Boolean.class))
74+
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
75+
.node("radio", "scale").type(TypeToken.get(Float.class))
76+
.min(0.5F).max(1.5F)
7777
.notifyClient()
7878
.build();
7979

api/src/main/java/com/lunarclient/apollo/mods/impl/ModSkyblock.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,28 @@ public final class ModSkyblock {
285285
.notifyClient()
286286
.build();
287287

288+
/**
289+
* Hides players and fishing rods near your bobber while you are fishing.
290+
*
291+
* @since %release_version%
292+
*/
293+
public static final SimpleOption<Boolean> SKYBLOCK_FISHING_HIDE_PLAYERS = SimpleOption.<Boolean>builder()
294+
.comment("Hides players and fishing rods near your bobber while you are fishing.")
295+
.node("skyblock", "skyblock-fishing-hide-players").type(TypeToken.get(Boolean.class))
296+
.notifyClient()
297+
.build();
298+
299+
/**
300+
* Shows which hotspot the Hotspot Radar item is pointing to.
301+
*
302+
* @since %release_version%
303+
*/
304+
public static final SimpleOption<Boolean> SKYBLOCK_FISHING_HOTSPOT_LOCATOR = SimpleOption.<Boolean>builder()
305+
.comment("Shows which hotspot the Hotspot Radar item is pointing to.")
306+
.node("skyblock", "skyblock-fishing-hotspot-locator").type(TypeToken.get(Boolean.class))
307+
.notifyClient()
308+
.build();
309+
288310
/**
289311
* Provides a chat message on boss kill that tells you how long it took to kill!.
290312
*

api/src/main/java/com/lunarclient/apollo/mods/impl/ModWaypoints.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,28 @@ public final class ModWaypoints {
5454
.notifyClient()
5555
.build();
5656

57+
/**
58+
* No documentation available.
59+
*
60+
* @since %release_version%
61+
*/
62+
public static final SimpleOption<Boolean> LIMIT_DEATH_WAYPOINTS = SimpleOption.<Boolean>builder()
63+
.node("waypoints", "limit-death-waypoints").type(TypeToken.get(Boolean.class))
64+
.notifyClient()
65+
.build();
66+
67+
/**
68+
* Maximum amount of Death Waypoints you will see at one time.
69+
*
70+
* @since %release_version%
71+
*/
72+
public static final NumberOption<Integer> MAX_DEATH_WAYPOINTS = NumberOption.<Integer>number()
73+
.comment("Maximum amount of Death Waypoints you will see at one time")
74+
.node("waypoints", "max-death-waypoints").type(TypeToken.get(Integer.class))
75+
.min(1).max(20)
76+
.notifyClient()
77+
.build();
78+
5779
/**
5880
* No documentation available.
5981
*

0 commit comments

Comments
 (0)