Skip to content

Commit 0489e69

Browse files
LunarClientBotLunarClientBot
committed
Sync LunarClient Mods & Options
1 parent 6ce0729 commit 0489e69

20 files changed

+761
-96
lines changed

‎api/src/main/java/com/lunarclient/apollo/mods/Mods.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
import com.lunarclient.apollo.mods.impl.ModStopwatch;
9494
import com.lunarclient.apollo.mods.impl.ModTab;
9595
import com.lunarclient.apollo.mods.impl.ModTeamView;
96+
import com.lunarclient.apollo.mods.impl.ModTierTagger;
9697
import com.lunarclient.apollo.mods.impl.ModTimeChanger;
9798
import com.lunarclient.apollo.mods.impl.ModTitles;
9899
import com.lunarclient.apollo.mods.impl.ModTntCountdown;
@@ -195,6 +196,7 @@ public final class Mods {
195196
ModWaila.class,
196197
ModNeu.class,
197198
ModHurtCam.class,
199+
ModTierTagger.class,
198200
ModDamageTint.class,
199201
ModSkyblock.class,
200202
ModHorseStats.class,

‎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/ModPackDisplay.java‎

Lines changed: 107 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public final class ModPackDisplay {
6161
*
6262
* @since 1.0.0
6363
*/
64-
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
65-
.node("pack-display", "text-shadow").type(TypeToken.get(Boolean.class))
64+
public static final SimpleOption<Boolean> PACK_ICON = SimpleOption.<Boolean>builder()
65+
.node("pack-display", "pack-icon").type(TypeToken.get(Boolean.class))
6666
.notifyClient()
6767
.build();
6868

@@ -71,18 +71,28 @@ public final class ModPackDisplay {
7171
*
7272
* @since 1.0.0
7373
*/
74-
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
75-
.node("pack-display", "brackets").type(TypeToken.get(Boolean.class))
74+
public static final SimpleOption<Boolean> PACK_DESCRIPTION = SimpleOption.<Boolean>builder()
75+
.node("pack-display", "pack-description").type(TypeToken.get(Boolean.class))
7676
.notifyClient()
7777
.build();
7878

7979
/**
8080
* No documentation available.
8181
*
82-
* @since 1.1.6
82+
* @since %release_version%
8383
*/
84-
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
85-
.node("pack-display", "bracket-color").type(TypeToken.get(Color.class))
84+
public static final SimpleOption<Boolean> PACK_EXTENSION = SimpleOption.<Boolean>builder()
85+
.node("pack-display", "pack-extension").type(TypeToken.get(Boolean.class))
86+
.notifyClient()
87+
.build();
88+
89+
/**
90+
* No documentation available.
91+
*
92+
* @since %release_version%
93+
*/
94+
public static final SimpleOption<Boolean> MOVE_TITLE_DOWN = SimpleOption.<Boolean>builder()
95+
.node("pack-display", "move-title-down").type(TypeToken.get(Boolean.class))
8696
.notifyClient()
8797
.build();
8898

@@ -91,30 +101,28 @@ public final class ModPackDisplay {
91101
*
92102
* @since 1.0.0
93103
*/
94-
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
95-
.node("pack-display", "background").type(TypeToken.get(Boolean.class))
104+
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
105+
.node("pack-display", "text-shadow").type(TypeToken.get(Boolean.class))
96106
.notifyClient()
97107
.build();
98108

99109
/**
100-
* If this is disabled the background will change size with the text.
110+
* No documentation available.
101111
*
102112
* @since 1.0.0
103113
*/
104-
public static final SimpleOption<Boolean> STATIC_BACKGROUND_WIDTH = SimpleOption.<Boolean>builder()
105-
.comment("If this is disabled the background will change size with the text.")
106-
.node("pack-display", "static-background-width").type(TypeToken.get(Boolean.class))
114+
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
115+
.node("pack-display", "brackets").type(TypeToken.get(Boolean.class))
107116
.notifyClient()
108117
.build();
109118

110119
/**
111-
* If this is disabled the background will change size with the text.
120+
* No documentation available.
112121
*
113122
* @since 1.1.6
114123
*/
115-
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
116-
.comment("If this is disabled the background will change size with the text.")
117-
.node("pack-display", "static-background-height").type(TypeToken.get(Boolean.class))
124+
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
125+
.node("pack-display", "bracket-color").type(TypeToken.get(Color.class))
118126
.notifyClient()
119127
.build();
120128

@@ -123,9 +131,8 @@ public final class ModPackDisplay {
123131
*
124132
* @since 1.0.0
125133
*/
126-
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
127-
.node("pack-display", "background-width").type(TypeToken.get(Integer.class))
128-
.min(60).max(300)
134+
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
135+
.node("pack-display", "background").type(TypeToken.get(Boolean.class))
129136
.notifyClient()
130137
.build();
131138

@@ -194,10 +201,84 @@ public final class ModPackDisplay {
194201
/**
195202
* No documentation available.
196203
*
204+
* @since %release_version%
205+
*/
206+
public static final SimpleOption<Color> DESCRIPTION_REPLACEMENT_COLOR = SimpleOption.<Color>builder()
207+
.node("pack-display", "description-replacement-color").type(TypeToken.get(Color.class))
208+
.notifyClient()
209+
.build();
210+
211+
/**
212+
* No documentation available.
213+
*
214+
* @since %release_version%
215+
*/
216+
public static final SimpleOption<Boolean> KEEP_BOLD = SimpleOption.<Boolean>builder()
217+
.node("pack-display", "keep-bold").type(TypeToken.get(Boolean.class))
218+
.notifyClient()
219+
.build();
220+
221+
/**
222+
* No documentation available.
223+
*
224+
* @since %release_version%
225+
*/
226+
public static final SimpleOption<Boolean> KEEP_ITALIC = SimpleOption.<Boolean>builder()
227+
.node("pack-display", "keep-italic").type(TypeToken.get(Boolean.class))
228+
.notifyClient()
229+
.build();
230+
231+
/**
232+
* No documentation available.
233+
*
234+
* @since %release_version%
235+
*/
236+
public static final SimpleOption<Boolean> KEEP_UNDERLINE = SimpleOption.<Boolean>builder()
237+
.node("pack-display", "keep-underline").type(TypeToken.get(Boolean.class))
238+
.notifyClient()
239+
.build();
240+
241+
/**
242+
* No documentation available.
243+
*
244+
* @since %release_version%
245+
*/
246+
public static final SimpleOption<Boolean> KEEP_STRIKETHROUGH = SimpleOption.<Boolean>builder()
247+
.node("pack-display", "keep-strikethrough").type(TypeToken.get(Boolean.class))
248+
.notifyClient()
249+
.build();
250+
251+
/**
252+
* No documentation available.
253+
*
254+
* @since %release_version%
255+
*/
256+
public static final SimpleOption<Boolean> KEEP_OBFUSCATED = SimpleOption.<Boolean>builder()
257+
.node("pack-display", "keep-obfuscated").type(TypeToken.get(Boolean.class))
258+
.notifyClient()
259+
.build();
260+
261+
/**
262+
* If this is disabled the background will change size with the text.
263+
*
197264
* @since 1.0.0
198265
*/
199-
public static final SimpleOption<Boolean> PACK_ICON = SimpleOption.<Boolean>builder()
200-
.node("pack-display", "pack-icon").type(TypeToken.get(Boolean.class))
266+
@Deprecated
267+
public static final SimpleOption<Boolean> STATIC_BACKGROUND_WIDTH = SimpleOption.<Boolean>builder()
268+
.comment("If this is disabled the background will change size with the text.")
269+
.node("pack-display", "static-background-width").type(TypeToken.get(Boolean.class))
270+
.notifyClient()
271+
.build();
272+
273+
/**
274+
* If this is disabled the background will change size with the text.
275+
*
276+
* @since 1.1.6
277+
*/
278+
@Deprecated
279+
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
280+
.comment("If this is disabled the background will change size with the text.")
281+
.node("pack-display", "static-background-height").type(TypeToken.get(Boolean.class))
201282
.notifyClient()
202283
.build();
203284

@@ -206,8 +287,10 @@ public final class ModPackDisplay {
206287
*
207288
* @since 1.0.0
208289
*/
209-
public static final SimpleOption<Boolean> PACK_DESCRIPTION = SimpleOption.<Boolean>builder()
210-
.node("pack-display", "pack-description").type(TypeToken.get(Boolean.class))
290+
@Deprecated
291+
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
292+
.node("pack-display", "background-width").type(TypeToken.get(Integer.class))
293+
.min(60).max(300)
211294
.notifyClient()
212295
.build();
213296

‎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
*

0 commit comments

Comments
 (0)