Skip to content

Commit 03e6933

Browse files
LunarClientBotLunarClientBot
committed
Sync LunarClient Mods & Options
1 parent 9dc9aec commit 03e6933

Some content is hidden

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

76 files changed

+2462
-657
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
@@ -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;
@@ -60,9 +61,11 @@
6061
import com.lunarclient.apollo.mods.impl.ModKeystrokes;
6162
import com.lunarclient.apollo.mods.impl.ModKillSounds;
6263
import com.lunarclient.apollo.mods.impl.ModLighting;
64+
import com.lunarclient.apollo.mods.impl.ModMarkers;
6365
import com.lunarclient.apollo.mods.impl.ModMemory;
6466
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
6567
import com.lunarclient.apollo.mods.impl.ModMinimap;
68+
import com.lunarclient.apollo.mods.impl.ModMobSize;
6669
import com.lunarclient.apollo.mods.impl.ModMomentum;
6770
import com.lunarclient.apollo.mods.impl.ModMotionBlur;
6871
import com.lunarclient.apollo.mods.impl.ModMumbleLink;
@@ -81,6 +84,7 @@
8184
import com.lunarclient.apollo.mods.impl.ModRadio;
8285
import com.lunarclient.apollo.mods.impl.ModReachDisplay;
8386
import com.lunarclient.apollo.mods.impl.ModReplaymod;
87+
import com.lunarclient.apollo.mods.impl.ModRewind;
8488
import com.lunarclient.apollo.mods.impl.ModSaturation;
8589
import com.lunarclient.apollo.mods.impl.ModSba;
8690
import com.lunarclient.apollo.mods.impl.ModScoreboard;
@@ -187,6 +191,7 @@ public final class Mods {
187191
ModBossbar.class,
188192
ModFreelook.class,
189193
ModPvpInfo.class,
194+
ModMarkers.class,
190195
ModSnaplook.class,
191196
ModTeamView.class,
192197
ModPackDisplay.class,
@@ -202,8 +207,11 @@ public final class Mods {
202207
ModHurtCam.class,
203208
ModTierTagger.class,
204209
ModDamageTint.class,
210+
ModMobSize.class,
205211
ModSkyblock.class,
206212
ModHorseStats.class,
213+
ModRewind.class,
214+
ModAudioSubtitles.class,
207215
ModKillSounds.class,
208216
ModInventoryMod.class,
209217
ModRadio.class

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class ModArmorstatus {
5252
*/
5353
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5454
.node("armorstatus", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
55+
.min(0.25F).max(5.0F)
5656
.notifyClient()
5757
.build();
5858

@@ -107,11 +107,12 @@ public final class ModArmorstatus {
107107
.build();
108108

109109
/**
110-
* No documentation available.
110+
* Adds a shadow to text.
111111
*
112112
* @since 1.0.0
113113
*/
114114
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
115+
.comment("Adds a shadow to text")
115116
.node("armorstatus", "text-shadow").type(TypeToken.get(Boolean.class))
116117
.notifyClient()
117118
.build();

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

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
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, if enabled.
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.25F).max(5.0F)
56+
.notifyClient()
57+
.build();
58+
59+
/**
60+
* Adds a shadow to text.
61+
*
62+
* @since %release_version%
63+
*/
64+
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
65+
.comment("Adds a shadow to text")
66+
.node("audio-subtitles", "text-shadow").type(TypeToken.get(Boolean.class))
67+
.notifyClient()
68+
.build();
69+
70+
/**
71+
* No documentation available.
72+
*
73+
* @since %release_version%
74+
*/
75+
public static final SimpleOption<Boolean> BACKGROUND = SimpleOption.<Boolean>builder()
76+
.node("audio-subtitles", "background").type(TypeToken.get(Boolean.class))
77+
.notifyClient()
78+
.build();
79+
80+
/**
81+
* No documentation available.
82+
*
83+
* @since %release_version%
84+
*/
85+
public static final SimpleOption<Boolean> BORDER = SimpleOption.<Boolean>builder()
86+
.node("audio-subtitles", "border").type(TypeToken.get(Boolean.class))
87+
.notifyClient()
88+
.build();
89+
90+
/**
91+
* No documentation available.
92+
*
93+
* @since %release_version%
94+
*/
95+
public static final NumberOption<Float> BORDER_THICKNESS = NumberOption.<Float>number()
96+
.node("audio-subtitles", "border-thickness").type(TypeToken.get(Float.class))
97+
.min(0.5F).max(3.0F)
98+
.notifyClient()
99+
.build();
100+
101+
/**
102+
* No documentation available.
103+
*
104+
* @since %release_version%
105+
*/
106+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
107+
.node("audio-subtitles", "border-color").type(TypeToken.get(Color.class))
108+
.notifyClient()
109+
.build();
110+
111+
/**
112+
* No documentation available.
113+
*
114+
* @since %release_version%
115+
*/
116+
public static final SimpleOption<Color> BACKGROUND_COLOR = SimpleOption.<Color>builder()
117+
.node("audio-subtitles", "background-color").type(TypeToken.get(Color.class))
118+
.notifyClient()
119+
.build();
120+
121+
/**
122+
* No documentation available.
123+
*
124+
* @since %release_version%
125+
*/
126+
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
127+
.node("audio-subtitles", "text-color").type(TypeToken.get(Color.class))
128+
.notifyClient()
129+
.build();
130+
131+
private ModAudioSubtitles() {
132+
}
133+
134+
}

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class ModClock {
5252
*/
5353
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5454
.node("clock", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
55+
.min(0.25F).max(5.0F)
5656
.notifyClient()
5757
.build();
5858

@@ -61,7 +61,28 @@ public final class ModClock {
6161
*
6262
* @since 1.0.0
6363
*/
64+
public static final SimpleOption<Boolean> MILITARY_TIME = SimpleOption.<Boolean>builder()
65+
.node("clock", "military-time").type(TypeToken.get(Boolean.class))
66+
.notifyClient()
67+
.build();
68+
69+
/**
70+
* No documentation available.
71+
*
72+
* @since 1.1.3
73+
*/
74+
public static final SimpleOption<Boolean> SHOW_AM_PM = SimpleOption.<Boolean>builder()
75+
.node("clock", "show-am-pm").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
79+
/**
80+
* Adds a shadow to text.
81+
*
82+
* @since 1.0.0
83+
*/
6484
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
85+
.comment("Adds a shadow to text")
6586
.node("clock", "text-shadow").type(TypeToken.get(Boolean.class))
6687
.notifyClient()
6788
.build();
@@ -191,26 +212,6 @@ public final class ModClock {
191212
.notifyClient()
192213
.build();
193214

194-
/**
195-
* No documentation available.
196-
*
197-
* @since 1.0.0
198-
*/
199-
public static final SimpleOption<Boolean> MILITARY_TIME = SimpleOption.<Boolean>builder()
200-
.node("clock", "military-time").type(TypeToken.get(Boolean.class))
201-
.notifyClient()
202-
.build();
203-
204-
/**
205-
* No documentation available.
206-
*
207-
* @since 1.1.3
208-
*/
209-
public static final SimpleOption<Boolean> SHOW_AM_PM = SimpleOption.<Boolean>builder()
210-
.node("clock", "show-am-pm").type(TypeToken.get(Boolean.class))
211-
.notifyClient()
212-
.build();
213-
214215
private ModClock() {
215216
}
216217

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,17 @@ public final class ModCombo {
5252
*/
5353
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5454
.node("combo", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
55+
.min(0.25F).max(5.0F)
5656
.notifyClient()
5757
.build();
5858

5959
/**
60-
* No documentation available.
60+
* Adds a shadow to text.
6161
*
6262
* @since 1.0.0
6363
*/
6464
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
65+
.comment("Adds a shadow to text")
6566
.node("combo", "text-shadow").type(TypeToken.get(Boolean.class))
6667
.notifyClient()
6768
.build();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public final class ModCooldowns {
5151
*/
5252
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5353
.node("cooldowns", "scale").type(TypeToken.get(Float.class))
54-
.min(0.5F).max(1.5F)
54+
.min(0.25F).max(5.0F)
5555
.notifyClient()
5656
.build();
5757

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,17 @@ public final class ModCoordinates {
5252
*/
5353
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5454
.node("coordinates", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
55+
.min(0.25F).max(5.0F)
5656
.notifyClient()
5757
.build();
5858

5959
/**
60-
* No documentation available.
60+
* Adds a shadow to text.
6161
*
6262
* @since 1.0.0
6363
*/
6464
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
65+
.comment("Adds a shadow to text")
6566
.node("coordinates", "text-shadow").type(TypeToken.get(Boolean.class))
6667
.notifyClient()
6768
.build();

0 commit comments

Comments
 (0)