Skip to content

Commit 4224a00

Browse files
LunarClientBotLunarClientBot
committed
Sync LunarClient Mods & Options
1 parent 6ce0729 commit 4224a00

Some content is hidden

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

49 files changed

+2773
-145
lines changed

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

Lines changed: 12 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.ModAudioSubtitles;
2930
import com.lunarclient.apollo.mods.impl.ModAutoTextActions;
3031
import com.lunarclient.apollo.mods.impl.ModAutoTextHotkey;
3132
import com.lunarclient.apollo.mods.impl.ModBlockOutline;
@@ -53,14 +54,17 @@
5354
import com.lunarclient.apollo.mods.impl.ModHurtCam;
5455
import com.lunarclient.apollo.mods.impl.ModHypixelBedwars;
5556
import com.lunarclient.apollo.mods.impl.ModHypixelMod;
57+
import com.lunarclient.apollo.mods.impl.ModInventoryMod;
5658
import com.lunarclient.apollo.mods.impl.ModItemCounter;
5759
import com.lunarclient.apollo.mods.impl.ModItemPhysics;
5860
import com.lunarclient.apollo.mods.impl.ModItemTracker;
5961
import com.lunarclient.apollo.mods.impl.ModKeystrokes;
62+
import com.lunarclient.apollo.mods.impl.ModKillSounds;
6063
import com.lunarclient.apollo.mods.impl.ModLighting;
6164
import com.lunarclient.apollo.mods.impl.ModMemory;
6265
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
6366
import com.lunarclient.apollo.mods.impl.ModMinimap;
67+
import com.lunarclient.apollo.mods.impl.ModMobSize;
6468
import com.lunarclient.apollo.mods.impl.ModMomentum;
6569
import com.lunarclient.apollo.mods.impl.ModMotionBlur;
6670
import com.lunarclient.apollo.mods.impl.ModMumbleLink;
@@ -93,10 +97,12 @@
9397
import com.lunarclient.apollo.mods.impl.ModStopwatch;
9498
import com.lunarclient.apollo.mods.impl.ModTab;
9599
import com.lunarclient.apollo.mods.impl.ModTeamView;
100+
import com.lunarclient.apollo.mods.impl.ModTierTagger;
96101
import com.lunarclient.apollo.mods.impl.ModTimeChanger;
97102
import com.lunarclient.apollo.mods.impl.ModTitles;
98103
import com.lunarclient.apollo.mods.impl.ModTntCountdown;
99104
import com.lunarclient.apollo.mods.impl.ModToggleSneak;
105+
import com.lunarclient.apollo.mods.impl.ModTotemCounter;
100106
import com.lunarclient.apollo.mods.impl.ModUhcOverlay;
101107
import com.lunarclient.apollo.mods.impl.ModWaila;
102108
import com.lunarclient.apollo.mods.impl.ModWaypoints;
@@ -178,6 +184,7 @@ public final class Mods {
178184
ModAutoTextHotkey.class,
179185
ModAutoTextActions.class,
180186
ModMumbleLink.class,
187+
ModTotemCounter.class,
181188
Mod2dItems.class,
182189
ModBossbar.class,
183190
ModFreelook.class,
@@ -195,9 +202,14 @@ public final class Mods {
195202
ModWaila.class,
196203
ModNeu.class,
197204
ModHurtCam.class,
205+
ModTierTagger.class,
198206
ModDamageTint.class,
207+
ModMobSize.class,
199208
ModSkyblock.class,
200209
ModHorseStats.class,
210+
ModAudioSubtitles.class,
211+
ModKillSounds.class,
212+
ModInventoryMod.class,
201213
ModRadio.class
202214
);
203215

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

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
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+
import java.awt.Color;
30+
31+
/**
32+
* Allows you to customize Minecraft's audio subtitles.
33+
*
34+
* @since %release_version%
35+
*/
36+
public final class ModAudioSubtitles {
37+
38+
/**
39+
* No documentation available.
40+
*
41+
* @since %release_version%
42+
*/
43+
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
44+
.node("audio-subtitles", "enabled").type(TypeToken.get(Boolean.class))
45+
.notifyClient()
46+
.build();
47+
48+
/**
49+
* No documentation available.
50+
*
51+
* @since %release_version%
52+
*/
53+
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
54+
.node("audio-subtitles", "scale").type(TypeToken.get(Float.class))
55+
.min(0.5F).max(1.5F)
56+
.notifyClient()
57+
.build();
58+
59+
/**
60+
* No documentation available.
61+
*
62+
* @since %release_version%
63+
*/
64+
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
65+
.node("audio-subtitles", "text-shadow").type(TypeToken.get(Boolean.class))
66+
.notifyClient()
67+
.build();
68+
69+
/**
70+
* No documentation available.
71+
*
72+
* @since %release_version%
73+
*/
74+
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
75+
.node("audio-subtitles", "background").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
79+
/**
80+
* No documentation available.
81+
*
82+
* @since %release_version%
83+
*/
84+
public static final SimpleOption<Boolean> BORDER = SimpleOption.<Boolean>builder()
85+
.node("audio-subtitles", "border").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 NumberOption<Float> BORDER_THICKNESS = NumberOption.<Float>number()
95+
.node("audio-subtitles", "border-thickness").type(TypeToken.get(Float.class))
96+
.min(0.5F).max(3.0F)
97+
.notifyClient()
98+
.build();
99+
100+
/**
101+
* No documentation available.
102+
*
103+
* @since %release_version%
104+
*/
105+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
106+
.node("audio-subtitles", "border-color").type(TypeToken.get(Color.class))
107+
.notifyClient()
108+
.build();
109+
110+
/**
111+
* No documentation available.
112+
*
113+
* @since %release_version%
114+
*/
115+
public static final SimpleOption<Color> BACKGROUND_COLOR = SimpleOption.<Color>builder()
116+
.node("audio-subtitles", "background-color").type(TypeToken.get(Color.class))
117+
.notifyClient()
118+
.build();
119+
120+
/**
121+
* No documentation available.
122+
*
123+
* @since %release_version%
124+
*/
125+
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
126+
.node("audio-subtitles", "text-color").type(TypeToken.get(Color.class))
127+
.notifyClient()
128+
.build();
129+
130+
private ModAudioSubtitles() {
131+
}
132+
133+
}

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

0 commit comments

Comments
 (0)