Skip to content

Commit 6beb195

Browse files
Sync LunarClient Mods & Options (#206)
* Sync LunarClient Mods & Options * Update version tags to 1.1.8 --------- Co-authored-by: LunarClient Bot <[email protected]>
1 parent f9fd775 commit 6beb195

File tree

18 files changed

+288
-16
lines changed

18 files changed

+288
-16
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
@@ -26,6 +26,7 @@
2626
import com.lunarclient.apollo.mods.impl.Mod2dItems;
2727
import com.lunarclient.apollo.mods.impl.Mod3dSkins;
2828
import com.lunarclient.apollo.mods.impl.ModArmorstatus;
29+
import com.lunarclient.apollo.mods.impl.ModAutoTextActions;
2930
import com.lunarclient.apollo.mods.impl.ModAutoTextHotkey;
3031
import com.lunarclient.apollo.mods.impl.ModBlockOutline;
3132
import com.lunarclient.apollo.mods.impl.ModBossbar;
@@ -175,6 +176,7 @@ public final class Mods {
175176
ModFov.class,
176177
ModFog.class,
177178
ModAutoTextHotkey.class,
179+
ModAutoTextActions.class,
178180
ModMumbleLink.class,
179181
Mod2dItems.class,
180182
ModBossbar.class,
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
* This file is part of Apollo, licensed under the MIT License.
3+
*
4+
* Copyright (c) 2023 Moonsworth
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*/
24+
package com.lunarclient.apollo.mods.impl;
25+
26+
import com.lunarclient.apollo.option.SimpleOption;
27+
import io.leangen.geantyref.TypeToken;
28+
29+
/**
30+
* Allows you to set up certain actions to be triggered on received chat messages.
31+
*
32+
* @since 1.1.8
33+
*/
34+
public final class ModAutoTextActions {
35+
36+
/**
37+
* No documentation available.
38+
*
39+
* @since 1.1.8
40+
*/
41+
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
42+
.node("auto-text-actions", "enabled").type(TypeToken.get(Boolean.class))
43+
.notifyClient()
44+
.build();
45+
46+
private ModAutoTextActions() {
47+
}
48+
49+
}

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,48 @@ public final class ModChat {
6666
.notifyClient()
6767
.build();
6868

69+
/**
70+
* Choose whether or not you want to stack multiple of the same messages in chat within a timeframe.
71+
*
72+
* @since 1.1.8
73+
*/
74+
public static final SimpleOption<Boolean> STACK_MESSAGES_TIME_BASED = SimpleOption.<Boolean>builder()
75+
.comment("Choose whether or not you want to stack multiple of the same messages in chat within a timeframe")
76+
.node("chat", "stack-messages-time-based").type(TypeToken.get(Boolean.class))
77+
.notifyClient()
78+
.build();
79+
80+
/**
81+
* No documentation available.
82+
*
83+
* @since 1.1.8
84+
*/
85+
public static final NumberOption<Integer> TIME_BASED_STACK_MESSAGES_TIMEFRAME = NumberOption.<Integer>number()
86+
.node("chat", "time-based-stack-messages-timeframe").type(TypeToken.get(Integer.class))
87+
.min(1).max(60)
88+
.notifyClient()
89+
.build();
90+
91+
/**
92+
* No documentation available.
93+
*
94+
* @since 1.1.8
95+
*/
96+
public static final SimpleOption<Boolean> CHAT_STACK_IGNORE_BLANK = SimpleOption.<Boolean>builder()
97+
.node("chat", "chat-stack-ignore-blank").type(TypeToken.get(Boolean.class))
98+
.notifyClient()
99+
.build();
100+
101+
/**
102+
* No documentation available.
103+
*
104+
* @since 1.1.8
105+
*/
106+
public static final SimpleOption<Boolean> CHAT_STACK_IGNORE_BREAK = SimpleOption.<Boolean>builder()
107+
.node("chat", "chat-stack-ignore-break").type(TypeToken.get(Boolean.class))
108+
.notifyClient()
109+
.build();
110+
69111
/**
70112
* Moves the chat up 12 pixels so it doesn't block health bar.
71113
*

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,26 @@ public final class ModCps {
221221
.notifyClient()
222222
.build();
223223

224+
/**
225+
* No documentation available.
226+
*
227+
* @since 1.1.8
228+
*/
229+
public static final SimpleOption<Boolean> REVERSE_TEXT = SimpleOption.<Boolean>builder()
230+
.node("cps", "reverse-text").type(TypeToken.get(Boolean.class))
231+
.notifyClient()
232+
.build();
233+
234+
/**
235+
* No documentation available.
236+
*
237+
* @since 1.1.8
238+
*/
239+
public static final SimpleOption<Boolean> IGNORE_CANCELLED_CLICKS = SimpleOption.<Boolean>builder()
240+
.node("cps", "ignore-cancelled-clicks").type(TypeToken.get(Boolean.class))
241+
.notifyClient()
242+
.build();
243+
224244
private ModCps() {
225245
}
226246

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@ public final class ModHypixelMod {
174174
.notifyClient()
175175
.build();
176176

177+
/**
178+
* No documentation available.
179+
*
180+
* @since 1.1.8
181+
*/
182+
public static final SimpleOption<Boolean> USE_BEDWARS_LEVELS_FORMAT = SimpleOption.<Boolean>builder()
183+
.node("hypixel-mod", "use-bedwars-levels-format").type(TypeToken.get(Boolean.class))
184+
.notifyClient()
185+
.build();
186+
177187
/**
178188
* No documentation available.
179189
*

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ public final class ModMotionBlur {
4949
*
5050
* @since 1.0.0
5151
*/
52-
public static final SimpleOption<Boolean> OLD_BLUR = SimpleOption.<Boolean>builder()
53-
.node("motion-blur", "old-blur").type(TypeToken.get(Boolean.class))
52+
public static final NumberOption<Integer> VALUE = NumberOption.<Integer>number()
53+
.node("motion-blur", "value").type(TypeToken.get(Integer.class))
54+
.min(1).max(10)
5455
.notifyClient()
5556
.build();
5657

@@ -59,9 +60,9 @@ public final class ModMotionBlur {
5960
*
6061
* @since 1.0.0
6162
*/
62-
public static final NumberOption<Integer> VALUE = NumberOption.<Integer>number()
63-
.node("motion-blur", "value").type(TypeToken.get(Integer.class))
64-
.min(1).max(10)
63+
@Deprecated
64+
public static final SimpleOption<Boolean> OLD_BLUR = SimpleOption.<Boolean>builder()
65+
.node("motion-blur", "old-blur").type(TypeToken.get(Boolean.class))
6566
.notifyClient()
6667
.build();
6768

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

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

46+
/**
47+
* Provides better visual feedback when attacking while keeping vanilla behavior.
48+
*
49+
* @since 1.1.8
50+
*/
51+
public static final SimpleOption<Boolean> ALWAYS_SWING = SimpleOption.<Boolean>builder()
52+
.comment("Provides better visual feedback when attacking while keeping vanilla behavior")
53+
.node("one-seven-visuals", "always-swing").type(TypeToken.get(Boolean.class))
54+
.notifyClient()
55+
.build();
56+
4657
private ModOneSevenVisuals() {
4758
}
4859

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,26 @@ public final class ModSkyblock {
170170
.notifyClient()
171171
.build();
172172

173+
/**
174+
* No documentation available.
175+
*
176+
* @since 1.1.8
177+
*/
178+
public static final SimpleOption<Boolean> HIGHLIGHT_END_NODES = SimpleOption.<Boolean>builder()
179+
.node("skyblock", "highlight-end-nodes").type(TypeToken.get(Boolean.class))
180+
.notifyClient()
181+
.build();
182+
183+
/**
184+
* No documentation available.
185+
*
186+
* @since 1.1.8
187+
*/
188+
public static final SimpleOption<Boolean> HIGHLIGHT_GLOWING_MUSHROOMS = SimpleOption.<Boolean>builder()
189+
.node("skyblock", "highlight-glowing-mushrooms").type(TypeToken.get(Boolean.class))
190+
.notifyClient()
191+
.build();
192+
173193
/**
174194
* Makes Giant HP more visible by showing their HP at their feet.
175195
*

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public final class ModTimeChanger {
5151
*/
5252
public static final NumberOption<Integer> TIME_CHANGER_TIME = NumberOption.<Integer>number()
5353
.node("time-changer", "time-changer-time").type(TypeToken.get(Integer.class))
54-
.min(-18000).max(-6000)
54+
.min(0).max(24000)
5555
.notifyClient()
5656
.build();
5757

@@ -76,6 +76,27 @@ public final class ModTimeChanger {
7676
.notifyClient()
7777
.build();
7878

79+
/**
80+
* No documentation available.
81+
*
82+
* @since 1.1.8
83+
*/
84+
public static final SimpleOption<Boolean> TIME_PASSAGE = SimpleOption.<Boolean>builder()
85+
.node("time-changer", "time-passage").type(TypeToken.get(Boolean.class))
86+
.notifyClient()
87+
.build();
88+
89+
/**
90+
* No documentation available.
91+
*
92+
* @since 1.1.8
93+
*/
94+
public static final NumberOption<Integer> SPEED = NumberOption.<Integer>number()
95+
.node("time-changer", "speed").type(TypeToken.get(Integer.class))
96+
.min(0).max(20)
97+
.notifyClient()
98+
.build();
99+
79100
private ModTimeChanger() {
80101
}
81102

docs/developers/mods/_meta.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"2ditems": "2dItems",
33
"3dskins": "3dSkins",
44
"armorstatus": "Armorstatus",
5+
"autotextactions": "AutoTextActions",
56
"autotexthotkey": "AutoTextHotkey",
67
"blockoutline": "BlockOutline",
78
"bossbar": "Bossbar",

0 commit comments

Comments
 (0)