Skip to content

Commit b45a44f

Browse files
Sync LunarClient Mods & Options
1 parent d155e01 commit b45a44f

File tree

12 files changed

+672
-117
lines changed

12 files changed

+672
-117
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import com.lunarclient.apollo.mods.impl.ModPotionEffects;
7676
import com.lunarclient.apollo.mods.impl.ModPvpInfo;
7777
import com.lunarclient.apollo.mods.impl.ModQuickplay;
78+
import com.lunarclient.apollo.mods.impl.ModRadio;
7879
import com.lunarclient.apollo.mods.impl.ModReachDisplay;
7980
import com.lunarclient.apollo.mods.impl.ModReplaymod;
8081
import com.lunarclient.apollo.mods.impl.ModSaturation;
@@ -194,7 +195,8 @@ public final class Mods {
194195
ModHurtCam.class,
195196
ModDamageTint.class,
196197
ModSkyblock.class,
197-
ModHorseStats.class
198+
ModHorseStats.class,
199+
ModRadio.class
198200
);
199201

200202
private Mods() {

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

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

@@ -71,8 +71,8 @@ public final class ModCoordinates {
7171
*
7272
* @since 1.0.0
7373
*/
74-
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
75-
.node("coordinates", "text-shadow").type(TypeToken.get(Boolean.class))
74+
public static final SimpleOption<Boolean> SHOW_WHILE_TYPING = SimpleOption.<Boolean>builder()
75+
.node("coordinates", "show-while-typing").type(TypeToken.get(Boolean.class))
7676
.notifyClient()
7777
.build();
7878

@@ -81,8 +81,8 @@ public final class ModCoordinates {
8181
*
8282
* @since 1.0.0
8383
*/
84-
public static final SimpleOption<Boolean> SHOW_WHILE_TYPING = SimpleOption.<Boolean>builder()
85-
.node("coordinates", "show-while-typing").type(TypeToken.get(Boolean.class))
84+
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
85+
.node("coordinates", "background").type(TypeToken.get(Boolean.class))
8686
.notifyClient()
8787
.build();
8888

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,12 @@ public final class ModDayCounter {
192192
.build();
193193

194194
/**
195-
* No documentation available.
195+
* If enabled, this will show the day of the world. If disabled, it will display your playtime in that world.
196196
*
197197
* @since 1.0.0
198198
*/
199199
public static final SimpleOption<Boolean> USE_WORLD_TYPE = SimpleOption.<Boolean>builder()
200+
.comment("If enabled, this will show the day of the world. If disabled, it will display your playtime in that world.")
200201
.node("day-counter", "use-world-type").type(TypeToken.get(Boolean.class))
201202
.notifyClient()
202203
.build();

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

Lines changed: 69 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,20 @@ public final class ModPotionEffects {
170170
/**
171171
* No documentation available.
172172
*
173-
* @since 1.0.0
173+
* @since 1.1.1
174174
*/
175-
public static final SimpleOption<Boolean> EXCLUDE_SPEED = SimpleOption.<Boolean>builder()
176-
.node("potion-effects", "exclude-speed").type(TypeToken.get(Boolean.class))
175+
public static final SimpleOption<Boolean> EXCLUDE_ABSORPTION = SimpleOption.<Boolean>builder()
176+
.node("potion-effects", "exclude-absorption").type(TypeToken.get(Boolean.class))
177177
.notifyClient()
178178
.build();
179179

180180
/**
181181
* No documentation available.
182182
*
183-
* @since 1.0.0
183+
* @since 1.1.1
184184
*/
185-
public static final SimpleOption<Boolean> EXCLUDE_SLOWNESS = SimpleOption.<Boolean>builder()
186-
.node("potion-effects", "exclude-slowness").type(TypeToken.get(Boolean.class))
185+
public static final SimpleOption<Boolean> EXCLUDE_BLINDNESS = SimpleOption.<Boolean>builder()
186+
.node("potion-effects", "exclude-blindness").type(TypeToken.get(Boolean.class))
187187
.notifyClient()
188188
.build();
189189

@@ -192,8 +192,8 @@ public final class ModPotionEffects {
192192
*
193193
* @since 1.0.0
194194
*/
195-
public static final SimpleOption<Boolean> EXCLUDE_JUMP_BOOST = SimpleOption.<Boolean>builder()
196-
.node("potion-effects", "exclude-jump-boost").type(TypeToken.get(Boolean.class))
195+
public static final SimpleOption<Boolean> EXCLUDE_FIRE_RES = SimpleOption.<Boolean>builder()
196+
.node("potion-effects", "exclude-fire-res").type(TypeToken.get(Boolean.class))
197197
.notifyClient()
198198
.build();
199199

@@ -202,48 +202,48 @@ public final class ModPotionEffects {
202202
*
203203
* @since 1.0.0
204204
*/
205-
public static final SimpleOption<Boolean> EXCLUDE_REGEN = SimpleOption.<Boolean>builder()
206-
.node("potion-effects", "exclude-regen").type(TypeToken.get(Boolean.class))
205+
public static final SimpleOption<Boolean> EXCLUDE_HASTE = SimpleOption.<Boolean>builder()
206+
.node("potion-effects", "exclude-haste").type(TypeToken.get(Boolean.class))
207207
.notifyClient()
208208
.build();
209209

210210
/**
211211
* No documentation available.
212212
*
213-
* @since 1.0.0
213+
* @since 1.1.1
214214
*/
215-
public static final SimpleOption<Boolean> EXCLUDE_FIRE_RES = SimpleOption.<Boolean>builder()
216-
.node("potion-effects", "exclude-fire-res").type(TypeToken.get(Boolean.class))
215+
public static final SimpleOption<Boolean> EXCLUDE_HEALTH_BOOST = SimpleOption.<Boolean>builder()
216+
.node("potion-effects", "exclude-health-boost").type(TypeToken.get(Boolean.class))
217217
.notifyClient()
218218
.build();
219219

220220
/**
221221
* No documentation available.
222222
*
223-
* @since 1.0.0
223+
* @since 1.1.1
224224
*/
225-
public static final SimpleOption<Boolean> EXCLUDE_WATER_BREATHING = SimpleOption.<Boolean>builder()
226-
.node("potion-effects", "exclude-water-breathing").type(TypeToken.get(Boolean.class))
225+
public static final SimpleOption<Boolean> EXCLUDE_HUNGER = SimpleOption.<Boolean>builder()
226+
.node("potion-effects", "exclude-hunger").type(TypeToken.get(Boolean.class))
227227
.notifyClient()
228228
.build();
229229

230230
/**
231231
* No documentation available.
232232
*
233-
* @since 1.0.0
233+
* @since 1.1.1
234234
*/
235-
public static final SimpleOption<Boolean> EXCLUDE_NIGHT_VISION = SimpleOption.<Boolean>builder()
236-
.node("potion-effects", "exclude-night-vision").type(TypeToken.get(Boolean.class))
235+
public static final SimpleOption<Boolean> EXCLUDE_INSTANT_DAMAGE = SimpleOption.<Boolean>builder()
236+
.node("potion-effects", "exclude-instant-damage").type(TypeToken.get(Boolean.class))
237237
.notifyClient()
238238
.build();
239239

240240
/**
241241
* No documentation available.
242242
*
243-
* @since 1.0.0
243+
* @since 1.1.1
244244
*/
245-
public static final SimpleOption<Boolean> EXCLUDE_WEAKNESS = SimpleOption.<Boolean>builder()
246-
.node("potion-effects", "exclude-weakness").type(TypeToken.get(Boolean.class))
245+
public static final SimpleOption<Boolean> EXCLUDE_INSTANT_HEALTH = SimpleOption.<Boolean>builder()
246+
.node("potion-effects", "exclude-instant-health").type(TypeToken.get(Boolean.class))
247247
.notifyClient()
248248
.build();
249249

@@ -252,8 +252,8 @@ public final class ModPotionEffects {
252252
*
253253
* @since 1.0.0
254254
*/
255-
public static final SimpleOption<Boolean> EXCLUDE_POISON = SimpleOption.<Boolean>builder()
256-
.node("potion-effects", "exclude-poison").type(TypeToken.get(Boolean.class))
255+
public static final SimpleOption<Boolean> EXCLUDE_INVIS = SimpleOption.<Boolean>builder()
256+
.node("potion-effects", "exclude-invis").type(TypeToken.get(Boolean.class))
257257
.notifyClient()
258258
.build();
259259

@@ -262,18 +262,28 @@ public final class ModPotionEffects {
262262
*
263263
* @since 1.0.0
264264
*/
265-
public static final SimpleOption<Boolean> EXCLUDE_STRENGTH = SimpleOption.<Boolean>builder()
266-
.node("potion-effects", "exclude-strength").type(TypeToken.get(Boolean.class))
265+
public static final SimpleOption<Boolean> EXCLUDE_JUMP_BOOST = SimpleOption.<Boolean>builder()
266+
.node("potion-effects", "exclude-jump-boost").type(TypeToken.get(Boolean.class))
267267
.notifyClient()
268268
.build();
269269

270270
/**
271271
* No documentation available.
272272
*
273-
* @since 1.0.0
273+
* @since 1.1.1
274274
*/
275-
public static final SimpleOption<Boolean> EXCLUDE_HASTE = SimpleOption.<Boolean>builder()
276-
.node("potion-effects", "exclude-haste").type(TypeToken.get(Boolean.class))
275+
public static final SimpleOption<Boolean> EXCLUDE_MINING_FATIGUE = SimpleOption.<Boolean>builder()
276+
.node("potion-effects", "exclude-mining-fatigue").type(TypeToken.get(Boolean.class))
277+
.notifyClient()
278+
.build();
279+
280+
/**
281+
* No documentation available.
282+
*
283+
* @since 1.1.1
284+
*/
285+
public static final SimpleOption<Boolean> EXCLUDE_NAUSEA = SimpleOption.<Boolean>builder()
286+
.node("potion-effects", "exclude-nausea").type(TypeToken.get(Boolean.class))
277287
.notifyClient()
278288
.build();
279289

@@ -282,38 +292,38 @@ public final class ModPotionEffects {
282292
*
283293
* @since 1.0.0
284294
*/
285-
public static final SimpleOption<Boolean> EXCLUDE_INVIS = SimpleOption.<Boolean>builder()
286-
.node("potion-effects", "exclude-invis").type(TypeToken.get(Boolean.class))
295+
public static final SimpleOption<Boolean> EXCLUDE_NIGHT_VISION = SimpleOption.<Boolean>builder()
296+
.node("potion-effects", "exclude-night-vision").type(TypeToken.get(Boolean.class))
287297
.notifyClient()
288298
.build();
289299

290300
/**
291301
* No documentation available.
292302
*
293-
* @since 1.1.1
303+
* @since 1.0.0
294304
*/
295-
public static final SimpleOption<Boolean> EXCLUDE_MINING_FATIGUE = SimpleOption.<Boolean>builder()
296-
.node("potion-effects", "exclude-mining-fatigue").type(TypeToken.get(Boolean.class))
305+
public static final SimpleOption<Boolean> EXCLUDE_POISON = SimpleOption.<Boolean>builder()
306+
.node("potion-effects", "exclude-poison").type(TypeToken.get(Boolean.class))
297307
.notifyClient()
298308
.build();
299309

300310
/**
301311
* No documentation available.
302312
*
303-
* @since 1.1.1
313+
* @since 1.0.0
304314
*/
305-
public static final SimpleOption<Boolean> EXCLUDE_INSTANT_HEALTH = SimpleOption.<Boolean>builder()
306-
.node("potion-effects", "exclude-instant-health").type(TypeToken.get(Boolean.class))
315+
public static final SimpleOption<Boolean> EXCLUDE_REGEN = SimpleOption.<Boolean>builder()
316+
.node("potion-effects", "exclude-regen").type(TypeToken.get(Boolean.class))
307317
.notifyClient()
308318
.build();
309319

310320
/**
311321
* No documentation available.
312322
*
313-
* @since 1.1.1
323+
* @since %release_version%
314324
*/
315-
public static final SimpleOption<Boolean> EXCLUDE_INSTANT_DAMAGE = SimpleOption.<Boolean>builder()
316-
.node("potion-effects", "exclude-instant-damage").type(TypeToken.get(Boolean.class))
325+
public static final SimpleOption<Boolean> EXCLUDE_RESISTANCE = SimpleOption.<Boolean>builder()
326+
.node("potion-effects", "exclude-resistance").type(TypeToken.get(Boolean.class))
317327
.notifyClient()
318328
.build();
319329

@@ -322,58 +332,58 @@ public final class ModPotionEffects {
322332
*
323333
* @since 1.1.1
324334
*/
325-
public static final SimpleOption<Boolean> EXCLUDE_NAUSEA = SimpleOption.<Boolean>builder()
326-
.node("potion-effects", "exclude-nausea").type(TypeToken.get(Boolean.class))
335+
public static final SimpleOption<Boolean> EXCLUDE_SATURATION = SimpleOption.<Boolean>builder()
336+
.node("potion-effects", "exclude-saturation").type(TypeToken.get(Boolean.class))
327337
.notifyClient()
328338
.build();
329339

330340
/**
331341
* No documentation available.
332342
*
333-
* @since 1.1.1
343+
* @since 1.0.0
334344
*/
335-
public static final SimpleOption<Boolean> EXCLUDE_BLINDNESS = SimpleOption.<Boolean>builder()
336-
.node("potion-effects", "exclude-blindness").type(TypeToken.get(Boolean.class))
345+
public static final SimpleOption<Boolean> EXCLUDE_SLOWNESS = SimpleOption.<Boolean>builder()
346+
.node("potion-effects", "exclude-slowness").type(TypeToken.get(Boolean.class))
337347
.notifyClient()
338348
.build();
339349

340350
/**
341351
* No documentation available.
342352
*
343-
* @since 1.1.1
353+
* @since 1.0.0
344354
*/
345-
public static final SimpleOption<Boolean> EXCLUDE_HUNGER = SimpleOption.<Boolean>builder()
346-
.node("potion-effects", "exclude-hunger").type(TypeToken.get(Boolean.class))
355+
public static final SimpleOption<Boolean> EXCLUDE_SPEED = SimpleOption.<Boolean>builder()
356+
.node("potion-effects", "exclude-speed").type(TypeToken.get(Boolean.class))
347357
.notifyClient()
348358
.build();
349359

350360
/**
351361
* No documentation available.
352362
*
353-
* @since 1.1.1
363+
* @since 1.0.0
354364
*/
355-
public static final SimpleOption<Boolean> EXCLUDE_WITHER = SimpleOption.<Boolean>builder()
356-
.node("potion-effects", "exclude-wither").type(TypeToken.get(Boolean.class))
365+
public static final SimpleOption<Boolean> EXCLUDE_STRENGTH = SimpleOption.<Boolean>builder()
366+
.node("potion-effects", "exclude-strength").type(TypeToken.get(Boolean.class))
357367
.notifyClient()
358368
.build();
359369

360370
/**
361371
* No documentation available.
362372
*
363-
* @since 1.1.1
373+
* @since 1.0.0
364374
*/
365-
public static final SimpleOption<Boolean> EXCLUDE_HEALTH_BOOST = SimpleOption.<Boolean>builder()
366-
.node("potion-effects", "exclude-health-boost").type(TypeToken.get(Boolean.class))
375+
public static final SimpleOption<Boolean> EXCLUDE_WATER_BREATHING = SimpleOption.<Boolean>builder()
376+
.node("potion-effects", "exclude-water-breathing").type(TypeToken.get(Boolean.class))
367377
.notifyClient()
368378
.build();
369379

370380
/**
371381
* No documentation available.
372382
*
373-
* @since 1.1.1
383+
* @since 1.0.0
374384
*/
375-
public static final SimpleOption<Boolean> EXCLUDE_ABSORPTION = SimpleOption.<Boolean>builder()
376-
.node("potion-effects", "exclude-absorption").type(TypeToken.get(Boolean.class))
385+
public static final SimpleOption<Boolean> EXCLUDE_WEAKNESS = SimpleOption.<Boolean>builder()
386+
.node("potion-effects", "exclude-weakness").type(TypeToken.get(Boolean.class))
377387
.notifyClient()
378388
.build();
379389

@@ -382,8 +392,8 @@ public final class ModPotionEffects {
382392
*
383393
* @since 1.1.1
384394
*/
385-
public static final SimpleOption<Boolean> EXCLUDE_SATURATION = SimpleOption.<Boolean>builder()
386-
.node("potion-effects", "exclude-saturation").type(TypeToken.get(Boolean.class))
395+
public static final SimpleOption<Boolean> EXCLUDE_WITHER = SimpleOption.<Boolean>builder()
396+
.node("potion-effects", "exclude-wither").type(TypeToken.get(Boolean.class))
387397
.notifyClient()
388398
.build();
389399

0 commit comments

Comments
 (0)