Skip to content

Commit 4ace0d2

Browse files
LunarClientBotItsNature
LunarClientBot
authored and
ItsNature
committed
Sync LunarClient Mods & Options
1 parent d6cc813 commit 4ace0d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1773
-145
lines changed

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

Lines changed: 8 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,10 +95,12 @@
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;
99102
import com.lunarclient.apollo.mods.impl.ModToggleSneak;
103+
import com.lunarclient.apollo.mods.impl.ModTotemCounter;
100104
import com.lunarclient.apollo.mods.impl.ModUhcOverlay;
101105
import com.lunarclient.apollo.mods.impl.ModWaila;
102106
import com.lunarclient.apollo.mods.impl.ModWaypoints;
@@ -178,6 +182,7 @@ public final class Mods {
178182
ModAutoTextHotkey.class,
179183
ModAutoTextActions.class,
180184
ModMumbleLink.class,
185+
ModTotemCounter.class,
181186
Mod2dItems.class,
182187
ModBossbar.class,
183188
ModFreelook.class,
@@ -195,9 +200,12 @@ public final class Mods {
195200
ModWaila.class,
196201
ModNeu.class,
197202
ModHurtCam.class,
203+
ModTierTagger.class,
198204
ModDamageTint.class,
199205
ModSkyblock.class,
200206
ModHorseStats.class,
207+
ModKillSounds.class,
208+
ModInventoryMod.class,
201209
ModRadio.class
202210
);
203211

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

Lines changed: 21 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
*
@@ -148,6 +158,17 @@ public final class Mod3dSkins {
148158
.notifyClient()
149159
.build();
150160

161+
/**
162+
* No documentation available.
163+
*
164+
* @since %release_version%
165+
*/
166+
public static final NumberOption<Float> FIRST_PERSON_VOXEL_SIZE = NumberOption.<Float>number()
167+
.node("3d-skins", "first-person-voxel-size").type(TypeToken.get(Float.class))
168+
.min(1.001F).max(1.3F)
169+
.notifyClient()
170+
.build();
171+
151172
/**
152173
* No documentation available.
153174
*

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

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

69+
/**
70+
* No documentation available.
71+
*
72+
* @since %release_version%
73+
*/
74+
public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
75+
.node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
6979
/**
7080
* No documentation available.
7181
*

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

Lines changed: 83 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,26 @@ public final class ModChat {
5555
.notifyClient()
5656
.build();
5757

58+
/**
59+
* No documentation available.
60+
*
61+
* @since %release_version%
62+
*/
63+
public static final SimpleOption<Boolean> MODERN_CHAT_LENGTH_HYPIXEL = SimpleOption.<Boolean>builder()
64+
.node("chat", "modern-chat-length-hypixel").type(TypeToken.get(Boolean.class))
65+
.notifyClient()
66+
.build();
67+
68+
/**
69+
* No documentation available.
70+
*
71+
* @since %release_version%
72+
*/
73+
public static final SimpleOption<Boolean> LONG_CHAT_SINGLEPLAYER = SimpleOption.<Boolean>builder()
74+
.node("chat", "long-chat-singleplayer").type(TypeToken.get(Boolean.class))
75+
.notifyClient()
76+
.build();
77+
5878
/**
5979
* Choose whether or not you want to stack multiple of the same messages in chat.
6080
*
@@ -183,12 +203,12 @@ public final class ModChat {
183203
.build();
184204

185205
/**
186-
* Displays a preview of an image when hovering over it.
206+
* Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.
187207
*
188208
* @since 1.1.3
189209
*/
190210
public static final SimpleOption<Boolean> HOVER_IMAGE_PREVIEW = SimpleOption.<Boolean>builder()
191-
.comment("Displays a preview of an image when hovering over it.")
211+
.comment("Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.")
192212
.node("chat", "hover-image-preview").type(TypeToken.get(Boolean.class))
193213
.notifyClient()
194214
.build();
@@ -217,6 +237,17 @@ public final class ModChat {
217237
.notifyClient()
218238
.build();
219239

240+
/**
241+
* When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%.
242+
*
243+
* @since %release_version%
244+
*/
245+
public static final SimpleOption<Boolean> FULLSCREEN_IMAGE = SimpleOption.<Boolean>builder()
246+
.comment("When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%")
247+
.node("chat", "fullscreen-image").type(TypeToken.get(Boolean.class))
248+
.notifyClient()
249+
.build();
250+
220251
/**
221252
* No documentation available.
222253
*
@@ -238,6 +269,56 @@ public final class ModChat {
238269
.notifyClient()
239270
.build();
240271

272+
/**
273+
* No documentation available.
274+
*
275+
* @since %release_version%
276+
*/
277+
public static final SimpleOption<Boolean> CHAT_NAME_BOLD = SimpleOption.<Boolean>builder()
278+
.node("chat", "chat-name-bold").type(TypeToken.get(Boolean.class))
279+
.notifyClient()
280+
.build();
281+
282+
/**
283+
* No documentation available.
284+
*
285+
* @since %release_version%
286+
*/
287+
public static final SimpleOption<Boolean> CHAT_NAME_ITALIC = SimpleOption.<Boolean>builder()
288+
.node("chat", "chat-name-italic").type(TypeToken.get(Boolean.class))
289+
.notifyClient()
290+
.build();
291+
292+
/**
293+
* No documentation available.
294+
*
295+
* @since %release_version%
296+
*/
297+
public static final SimpleOption<Boolean> CHAT_NAME_UNDERLINE = SimpleOption.<Boolean>builder()
298+
.node("chat", "chat-name-underline").type(TypeToken.get(Boolean.class))
299+
.notifyClient()
300+
.build();
301+
302+
/**
303+
* No documentation available.
304+
*
305+
* @since %release_version%
306+
*/
307+
public static final SimpleOption<Boolean> CHAT_NAME_STRIKETHROUGH = SimpleOption.<Boolean>builder()
308+
.node("chat", "chat-name-strikethrough").type(TypeToken.get(Boolean.class))
309+
.notifyClient()
310+
.build();
311+
312+
/**
313+
* No documentation available.
314+
*
315+
* @since %release_version%
316+
*/
317+
public static final SimpleOption<Boolean> CHAT_NAME_OBFUSCATED = SimpleOption.<Boolean>builder()
318+
.node("chat", "chat-name-obfuscated").type(TypeToken.get(Boolean.class))
319+
.notifyClient()
320+
.build();
321+
241322
/**
242323
* No documentation available.
243324
*

‎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+
}

0 commit comments

Comments
 (0)