Skip to content

Commit 309e32c

Browse files
LunarClientBotLunarClientBot
committed
Sync LunarClient Mods & Options
1 parent 6ce0729 commit 309e32c

30 files changed

+1162
-116
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@
5353
import com.lunarclient.apollo.mods.impl.ModHurtCam;
5454
import com.lunarclient.apollo.mods.impl.ModHypixelBedwars;
5555
import com.lunarclient.apollo.mods.impl.ModHypixelMod;
56+
import com.lunarclient.apollo.mods.impl.ModInventoryMod;
5657
import com.lunarclient.apollo.mods.impl.ModItemCounter;
5758
import com.lunarclient.apollo.mods.impl.ModItemPhysics;
5859
import com.lunarclient.apollo.mods.impl.ModItemTracker;
5960
import com.lunarclient.apollo.mods.impl.ModKeystrokes;
61+
import com.lunarclient.apollo.mods.impl.ModKillSounds;
6062
import com.lunarclient.apollo.mods.impl.ModLighting;
6163
import com.lunarclient.apollo.mods.impl.ModMemory;
6264
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
@@ -93,6 +95,7 @@
9395
import com.lunarclient.apollo.mods.impl.ModStopwatch;
9496
import com.lunarclient.apollo.mods.impl.ModTab;
9597
import com.lunarclient.apollo.mods.impl.ModTeamView;
98+
import com.lunarclient.apollo.mods.impl.ModTierTagger;
9699
import com.lunarclient.apollo.mods.impl.ModTimeChanger;
97100
import com.lunarclient.apollo.mods.impl.ModTitles;
98101
import com.lunarclient.apollo.mods.impl.ModTntCountdown;
@@ -195,9 +198,12 @@ public final class Mods {
195198
ModWaila.class,
196199
ModNeu.class,
197200
ModHurtCam.class,
201+
ModTierTagger.class,
198202
ModDamageTint.class,
199203
ModSkyblock.class,
200204
ModHorseStats.class,
205+
ModKillSounds.class,
206+
ModInventoryMod.class,
201207
ModRadio.class
202208
);
203209

‎api/src/main/java/com/lunarclient/apollo/mods/impl/Mod3dSkins.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ public final class Mod3dSkins {
5555
.notifyClient()
5656
.build();
5757

58+
/**
59+
* No documentation available.
60+
*
61+
* @since %release_version%
62+
*/
63+
public static final SimpleOption<Boolean> SHOW_OTHERS = SimpleOption.<Boolean>builder()
64+
.node("3d-skins", "show-others").type(TypeToken.get(Boolean.class))
65+
.notifyClient()
66+
.build();
67+
5868
/**
5969
* No documentation available.
6070
*

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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.NumberOption;
27+
import com.lunarclient.apollo.option.SimpleOption;
28+
import io.leangen.geantyref.TypeToken;
29+
30+
/**
31+
* A collection of quality of life tweaks for the inventory.
32+
*
33+
* @since %release_version%
34+
*/
35+
public final class ModInventoryMod {
36+
37+
/**
38+
* No documentation available.
39+
*
40+
* @since %release_version%
41+
*/
42+
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
43+
.node("inventory-mod", "enabled").type(TypeToken.get(Boolean.class))
44+
.notifyClient()
45+
.build();
46+
47+
/**
48+
* Useful for navigating inventory menus on servers.
49+
*
50+
* @since %release_version%
51+
*/
52+
public static final SimpleOption<Boolean> DONT_RESET_CURSOR = SimpleOption.<Boolean>builder()
53+
.comment("Useful for navigating inventory menus on servers.")
54+
.node("inventory-mod", "dont-reset-cursor").type(TypeToken.get(Boolean.class))
55+
.notifyClient()
56+
.build();
57+
58+
/**
59+
* No documentation available.
60+
*
61+
* @since %release_version%
62+
*/
63+
public static final NumberOption<Float> RESET_CURSOR_TIMEOUT = NumberOption.<Float>number()
64+
.node("inventory-mod", "reset-cursor-timeout").type(TypeToken.get(Float.class))
65+
.min(0.1F).max(5.0F)
66+
.notifyClient()
67+
.build();
68+
69+
private ModInventoryMod() {
70+
}
71+
72+
}

‎api/src/main/java/com/lunarclient/apollo/mods/impl/ModKeystrokes.java‎

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public final class ModKeystrokes {
9191
*
9292
* @since 1.0.0
9393
*/
94-
public static final SimpleOption<Boolean> KEY_STROKES_MOVEMENT = SimpleOption.<Boolean>builder()
95-
.node("keystrokes", "key-strokes-movement").type(TypeToken.get(Boolean.class))
94+
public static final SimpleOption<Boolean> USE_ARROWS = SimpleOption.<Boolean>builder()
95+
.node("keystrokes", "use-arrows").type(TypeToken.get(Boolean.class))
9696
.notifyClient()
9797
.build();
9898

@@ -101,8 +101,8 @@ public final class ModKeystrokes {
101101
*
102102
* @since 1.0.0
103103
*/
104-
public static final SimpleOption<Boolean> KEY_STROKES_SPACEBAR = SimpleOption.<Boolean>builder()
105-
.node("keystrokes", "key-strokes-spacebar").type(TypeToken.get(Boolean.class))
104+
public static final SimpleOption<Boolean> KEY_STROKES_MOVEMENT = SimpleOption.<Boolean>builder()
105+
.node("keystrokes", "key-strokes-movement").type(TypeToken.get(Boolean.class))
106106
.notifyClient()
107107
.build();
108108

@@ -111,8 +111,8 @@ public final class ModKeystrokes {
111111
*
112112
* @since 1.0.0
113113
*/
114-
public static final SimpleOption<Boolean> USE_ARROWS = SimpleOption.<Boolean>builder()
115-
.node("keystrokes", "use-arrows").type(TypeToken.get(Boolean.class))
114+
public static final SimpleOption<Boolean> KEY_STROKES_SPACEBAR = SimpleOption.<Boolean>builder()
115+
.node("keystrokes", "key-strokes-spacebar").type(TypeToken.get(Boolean.class))
116116
.notifyClient()
117117
.build();
118118

@@ -146,6 +146,67 @@ public final class ModKeystrokes {
146146
.notifyClient()
147147
.build();
148148

149+
/**
150+
* No documentation available.
151+
*
152+
* @since %release_version%
153+
*/
154+
public static final SimpleOption<Boolean> ANIMATE = SimpleOption.<Boolean>builder()
155+
.node("keystrokes", "animate").type(TypeToken.get(Boolean.class))
156+
.notifyClient()
157+
.build();
158+
159+
/**
160+
* No documentation available.
161+
*
162+
* @since %release_version%
163+
*/
164+
public static final NumberOption<Float> DURATION = NumberOption.<Float>number()
165+
.node("keystrokes", "duration").type(TypeToken.get(Float.class))
166+
.min(0.1F).max(1.0F)
167+
.notifyClient()
168+
.build();
169+
170+
/**
171+
* No documentation available.
172+
*
173+
* @since %release_version%
174+
*/
175+
public static final SimpleOption<Boolean> ANIMATE_COLOR = SimpleOption.<Boolean>builder()
176+
.node("keystrokes", "animate-color").type(TypeToken.get(Boolean.class))
177+
.notifyClient()
178+
.build();
179+
180+
/**
181+
* No documentation available.
182+
*
183+
* @since %release_version%
184+
*/
185+
public static final SimpleOption<Color> ANIMATION_START_COLOR = SimpleOption.<Color>builder()
186+
.node("keystrokes", "animation-start-color").type(TypeToken.get(Color.class))
187+
.notifyClient()
188+
.build();
189+
190+
/**
191+
* No documentation available.
192+
*
193+
* @since %release_version%
194+
*/
195+
public static final SimpleOption<Color> ANIMATION_CENTER_COLOR = SimpleOption.<Color>builder()
196+
.node("keystrokes", "animation-center-color").type(TypeToken.get(Color.class))
197+
.notifyClient()
198+
.build();
199+
200+
/**
201+
* No documentation available.
202+
*
203+
* @since %release_version%
204+
*/
205+
public static final SimpleOption<Color> ANIMATION_END_COLOR = SimpleOption.<Color>builder()
206+
.node("keystrokes", "animation-end-color").type(TypeToken.get(Color.class))
207+
.notifyClient()
208+
.build();
209+
149210
/**
150211
* No documentation available.
151212
*
@@ -229,6 +290,17 @@ public final class ModKeystrokes {
229290
.notifyClient()
230291
.build();
231292

293+
/**
294+
* No documentation available.
295+
*
296+
* @since %release_version%
297+
*/
298+
public static final NumberOption<Float> SPACEBAR_THICKNESS = NumberOption.<Float>number()
299+
.node("keystrokes", "spacebar-thickness").type(TypeToken.get(Float.class))
300+
.min(1.0F).max(4.25F)
301+
.notifyClient()
302+
.build();
303+
232304
private ModKeystrokes() {
233305
}
234306

‎api/src/main/java/com/lunarclient/apollo/mods/impl/ModKillSounds.java‎

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 change kill sounds for players.
31+
*
32+
* @since %release_version%
33+
*/
34+
public final class ModKillSounds {
35+
36+
/**
37+
* No documentation available.
38+
*
39+
* @since %release_version%
40+
*/
41+
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
42+
.node("kill-sounds", "enabled").type(TypeToken.get(Boolean.class))
43+
.notifyClient()
44+
.build();
45+
46+
private ModKillSounds() {
47+
}
48+
49+
}

0 commit comments

Comments
 (0)