Skip to content

Commit eb4e550

Browse files
LunarClientBotLunarClientBot
committed
Sync LunarClient Mods & Options
1 parent 0413bdb commit eb4e550

Some content is hidden

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

54 files changed

+2900
-246
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import com.lunarclient.apollo.mods.impl.ModKeystrokes;
6262
import com.lunarclient.apollo.mods.impl.ModKillSounds;
6363
import com.lunarclient.apollo.mods.impl.ModLighting;
64+
import com.lunarclient.apollo.mods.impl.ModMarkers;
6465
import com.lunarclient.apollo.mods.impl.ModMemory;
6566
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
6667
import com.lunarclient.apollo.mods.impl.ModMinimap;
@@ -90,6 +91,7 @@
9091
import com.lunarclient.apollo.mods.impl.ModScreenshot;
9192
import com.lunarclient.apollo.mods.impl.ModScrollableTooltips;
9293
import com.lunarclient.apollo.mods.impl.ModServerAddress;
94+
import com.lunarclient.apollo.mods.impl.ModShields;
9395
import com.lunarclient.apollo.mods.impl.ModShinyPots;
9496
import com.lunarclient.apollo.mods.impl.ModShulkerPreview;
9597
import com.lunarclient.apollo.mods.impl.ModSkyblock;
@@ -190,6 +192,7 @@ public final class Mods {
190192
ModBossbar.class,
191193
ModFreelook.class,
192194
ModPvpInfo.class,
195+
ModMarkers.class,
193196
ModSnaplook.class,
194197
ModTeamView.class,
195198
ModPackDisplay.class,
@@ -210,6 +213,7 @@ public final class Mods {
210213
ModHorseStats.class,
211214
ModRewind.class,
212215
ModAudioSubtitles.class,
216+
ModShields.class,
213217
ModKillSounds.class,
214218
ModInventoryMod.class,
215219
ModRadio.class

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,18 @@ public final class ModChat {
218218
.notifyClient()
219219
.build();
220220

221+
/**
222+
* Allows you to simply right click a chat message to copy it, no keybind.
223+
*
224+
* @since %release_version%
225+
*/
226+
public static final SimpleOption<Boolean> COPY_CHAT_RIGHT_CLICK = SimpleOption.<Boolean>builder()
227+
.comment("Allows you to simply right click a chat message to copy it, no keybind")
228+
.node("chat", "copy-chat-right-click").type(TypeToken.get(Boolean.class))
229+
.defaultValue(true)
230+
.notifyClient()
231+
.build();
232+
221233
/**
222234
* 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.
223235
*

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424
package com.lunarclient.apollo.mods.impl;
2525

26+
import com.lunarclient.apollo.option.NumberOption;
2627
import com.lunarclient.apollo.option.SimpleOption;
2728
import io.leangen.geantyref.TypeToken;
2829
import java.awt.Color;
@@ -45,6 +46,41 @@ public final class ModChunkBorders {
4546
.notifyClient()
4647
.build();
4748

49+
/**
50+
* No documentation available.
51+
*
52+
* @since %release_version%
53+
*/
54+
public static final SimpleOption<Boolean> GRID = SimpleOption.<Boolean>builder()
55+
.node("chunk-borders", "grid").type(TypeToken.get(Boolean.class))
56+
.defaultValue(true)
57+
.notifyClient()
58+
.build();
59+
60+
/**
61+
* No documentation available.
62+
*
63+
* @since %release_version%
64+
*/
65+
public static final NumberOption<Float> GRID_SIZE = NumberOption.<Float>number()
66+
.node("chunk-borders", "grid-size").type(TypeToken.get(Float.class))
67+
.min(1.0F).max(5.0F)
68+
.defaultValue(1.0F)
69+
.notifyClient()
70+
.build();
71+
72+
/**
73+
* No documentation available.
74+
*
75+
* @since %release_version%
76+
*/
77+
public static final NumberOption<Float> GRID_LINE_THICKNESS = NumberOption.<Float>number()
78+
.node("chunk-borders", "grid-line-thickness").type(TypeToken.get(Float.class))
79+
.min(1.0F).max(5.0F)
80+
.defaultValue(1.0F)
81+
.notifyClient()
82+
.build();
83+
4884
/**
4985
* No documentation available.
5086
*
@@ -56,6 +92,29 @@ public final class ModChunkBorders {
5692
.notifyClient()
5793
.build();
5894

95+
/**
96+
* No documentation available.
97+
*
98+
* @since %release_version%
99+
*/
100+
public static final SimpleOption<Boolean> INNER_CORNERS = SimpleOption.<Boolean>builder()
101+
.node("chunk-borders", "inner-corners").type(TypeToken.get(Boolean.class))
102+
.defaultValue(true)
103+
.notifyClient()
104+
.build();
105+
106+
/**
107+
* No documentation available.
108+
*
109+
* @since %release_version%
110+
*/
111+
public static final NumberOption<Float> INNER_CORNER_THICKNESS = NumberOption.<Float>number()
112+
.node("chunk-borders", "inner-corner-thickness").type(TypeToken.get(Float.class))
113+
.min(1.0F).max(5.0F)
114+
.defaultValue(1.0F)
115+
.notifyClient()
116+
.build();
117+
59118
/**
60119
* No documentation available.
61120
*
@@ -67,6 +126,29 @@ public final class ModChunkBorders {
67126
.notifyClient()
68127
.build();
69128

129+
/**
130+
* No documentation available.
131+
*
132+
* @since %release_version%
133+
*/
134+
public static final SimpleOption<Boolean> OUTER_CORNERS = SimpleOption.<Boolean>builder()
135+
.node("chunk-borders", "outer-corners").type(TypeToken.get(Boolean.class))
136+
.defaultValue(true)
137+
.notifyClient()
138+
.build();
139+
140+
/**
141+
* No documentation available.
142+
*
143+
* @since %release_version%
144+
*/
145+
public static final NumberOption<Float> OUTER_CORNER_THICKNESS = NumberOption.<Float>number()
146+
.node("chunk-borders", "outer-corner-thickness").type(TypeToken.get(Float.class))
147+
.min(1.0F).max(5.0F)
148+
.defaultValue(1.0F)
149+
.notifyClient()
150+
.build();
151+
70152
/**
71153
* No documentation available.
72154
*

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,17 @@ public final class ModColorSaturation {
9393
.notifyClient()
9494
.build();
9595

96+
/**
97+
* No documentation available.
98+
*
99+
* @since %release_version%
100+
*/
101+
public static final SimpleOption<Boolean> GRAYSCALE = SimpleOption.<Boolean>builder()
102+
.node("color-saturation", "grayscale").type(TypeToken.get(Boolean.class))
103+
.defaultValue(false)
104+
.notifyClient()
105+
.build();
106+
96107
private ModColorSaturation() {
97108
}
98109

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,17 @@ public final class ModCoordinates {
115115
.notifyClient()
116116
.build();
117117

118+
/**
119+
* No documentation available.
120+
*
121+
* @since %release_version%
122+
*/
123+
public static final SimpleOption<Boolean> DECIMAL_COORDINATES = SimpleOption.<Boolean>builder()
124+
.node("coordinates", "decimal-coordinates").type(TypeToken.get(Boolean.class))
125+
.defaultValue(false)
126+
.notifyClient()
127+
.build();
128+
118129
/**
119130
* No documentation available.
120131
*

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public final class ModCrosshair {
5151
*
5252
* @since 1.0.0
5353
*/
54+
@Deprecated
5455
public static final NumberOption<Integer> CROSSHAIR_THICKNESS = NumberOption.<Integer>number()
5556
.node("crosshair", "crosshair-thickness").type(TypeToken.get(Integer.class))
5657
.min(1).max(5)
@@ -63,6 +64,7 @@ public final class ModCrosshair {
6364
*
6465
* @since 1.0.0
6566
*/
67+
@Deprecated
6668
public static final NumberOption<Integer> CROSSHAIR_SIZE = NumberOption.<Integer>number()
6769
.node("crosshair", "crosshair-size").type(TypeToken.get(Integer.class))
6870
.min(0).max(8)
@@ -75,6 +77,7 @@ public final class ModCrosshair {
7577
*
7678
* @since 1.0.0
7779
*/
80+
@Deprecated
7881
public static final NumberOption<Integer> CROSSHAIR_GAP = NumberOption.<Integer>number()
7982
.node("crosshair", "crosshair-gap").type(TypeToken.get(Integer.class))
8083
.min(0).max(8)
@@ -87,6 +90,7 @@ public final class ModCrosshair {
8790
*
8891
* @since 1.0.0
8992
*/
93+
@Deprecated
9094
public static final SimpleOption<Boolean> CROSSHAIR_DOT = SimpleOption.<Boolean>builder()
9195
.node("crosshair", "crosshair-dot").type(TypeToken.get(Boolean.class))
9296
.defaultValue(true)
@@ -98,6 +102,7 @@ public final class ModCrosshair {
98102
*
99103
* @since 1.0.0
100104
*/
105+
@Deprecated
101106
public static final SimpleOption<Boolean> CROSSHAIR_OUTLINE = SimpleOption.<Boolean>builder()
102107
.node("crosshair", "crosshair-outline").type(TypeToken.get(Boolean.class))
103108
.defaultValue(false)
@@ -109,6 +114,7 @@ public final class ModCrosshair {
109114
*
110115
* @since 1.0.0
111116
*/
117+
@Deprecated
112118
public static final NumberOption<Float> OUTLINE_THICKNESS = NumberOption.<Float>number()
113119
.node("crosshair", "outline-thickness").type(TypeToken.get(Float.class))
114120
.min(0.0F).max(1.0F)
@@ -121,6 +127,7 @@ public final class ModCrosshair {
121127
*
122128
* @since 1.0.0
123129
*/
130+
@Deprecated
124131
public static final SimpleOption<Color> OUTLINE_COLOR = SimpleOption.<Color>builder()
125132
.node("crosshair", "outline-color").type(TypeToken.get(Color.class))
126133
.defaultValue(new Color(0, 0, 0, 136))
@@ -132,6 +139,7 @@ public final class ModCrosshair {
132139
*
133140
* @since 1.0.0
134141
*/
142+
@Deprecated
135143
public static final SimpleOption<Boolean> CUSTOM_SCALE = SimpleOption.<Boolean>builder()
136144
.node("crosshair", "custom-scale").type(TypeToken.get(Boolean.class))
137145
.defaultValue(false)
@@ -143,6 +151,7 @@ public final class ModCrosshair {
143151
*
144152
* @since 1.0.0
145153
*/
154+
@Deprecated
146155
public static final SimpleOption<Color> COLOR = SimpleOption.<Color>builder()
147156
.node("crosshair", "color").type(TypeToken.get(Color.class))
148157
.defaultValue(new Color(255, 255, 255))
@@ -154,6 +163,7 @@ public final class ModCrosshair {
154163
*
155164
* @since 1.0.0
156165
*/
166+
@Deprecated
157167
public static final SimpleOption<Color> FRIENDLY_COLOR = SimpleOption.<Color>builder()
158168
.node("crosshair", "friendly-color").type(TypeToken.get(Color.class))
159169
.defaultValue(new Color(51, 255, 51))
@@ -165,6 +175,7 @@ public final class ModCrosshair {
165175
*
166176
* @since 1.0.0
167177
*/
178+
@Deprecated
168179
public static final SimpleOption<Color> ENEMY_COLOR = SimpleOption.<Color>builder()
169180
.node("crosshair", "enemy-color").type(TypeToken.get(Color.class))
170181
.defaultValue(new Color(255, 51, 51))

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,18 @@ public final class ModDamageTint {
9595
.notifyClient()
9696
.build();
9797

98+
/**
99+
* No documentation available.
100+
*
101+
* @since %release_version%
102+
*/
103+
public static final NumberOption<Float> HEARTBEAT_AUDIO_VOLUME = NumberOption.<Float>number()
104+
.node("damage-tint", "heartbeat-audio-volume").type(TypeToken.get(Float.class))
105+
.min(0.0F).max(1.0F)
106+
.defaultValue(1.0F)
107+
.notifyClient()
108+
.build();
109+
98110
private ModDamageTint() {
99111
}
100112

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

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,18 @@ public final class ModDirectionHud {
128128
.notifyClient()
129129
.build();
130130

131+
/**
132+
* Choose whether to show the Direction HUD when TAB is open.
133+
*
134+
* @since 1.1.9
135+
*/
136+
public static final SimpleOption<Boolean> SHOW_WITH_TAB = SimpleOption.<Boolean>builder()
137+
.comment("Choose whether to show the Direction HUD when TAB is open.")
138+
.node("direction-hud", "show-with-tab").type(TypeToken.get(Boolean.class))
139+
.defaultValue(false)
140+
.notifyClient()
141+
.build();
142+
131143
/**
132144
* No documentation available.
133145
*
@@ -153,23 +165,34 @@ public final class ModDirectionHud {
153165
/**
154166
* No documentation available.
155167
*
156-
* @since 1.0.0
168+
* @since %release_version%
157169
*/
158-
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
159-
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
160-
.defaultValue(false)
170+
public static final SimpleOption<Boolean> SHOW_WAYPOINTS = SimpleOption.<Boolean>builder()
171+
.node("direction-hud", "show-waypoints").type(TypeToken.get(Boolean.class))
172+
.defaultValue(true)
161173
.notifyClient()
162174
.build();
163175

164176
/**
165-
* Choose whether to show the Direction HUD when TAB is open.
177+
* No documentation available.
166178
*
167-
* @since 1.1.9
179+
* @since %release_version%
168180
*/
169-
public static final SimpleOption<Boolean> SHOW_WITH_TAB = SimpleOption.<Boolean>builder()
170-
.comment("Choose whether to show the Direction HUD when TAB is open.")
171-
.node("direction-hud", "show-with-tab").type(TypeToken.get(Boolean.class))
172-
.defaultValue(false)
181+
public static final SimpleOption<Boolean> SHOW_TEAMMATES = SimpleOption.<Boolean>builder()
182+
.node("direction-hud", "show-teammates").type(TypeToken.get(Boolean.class))
183+
.defaultValue(true)
184+
.notifyClient()
185+
.build();
186+
187+
/**
188+
* Show markers from the Markers Mod.
189+
*
190+
* @since %release_version%
191+
*/
192+
public static final SimpleOption<Boolean> SHOW_EXTERNAL_MARKERS = SimpleOption.<Boolean>builder()
193+
.comment("Show markers from the Markers Mod.")
194+
.node("direction-hud", "show-external-markers").type(TypeToken.get(Boolean.class))
195+
.defaultValue(true)
173196
.notifyClient()
174197
.build();
175198

@@ -217,6 +240,18 @@ public final class ModDirectionHud {
217240
.notifyClient()
218241
.build();
219242

243+
/**
244+
* No documentation available.
245+
*
246+
* @since 1.0.0
247+
*/
248+
@Deprecated
249+
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
250+
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
251+
.defaultValue(false)
252+
.notifyClient()
253+
.build();
254+
220255
private ModDirectionHud() {
221256
}
222257

0 commit comments

Comments
 (0)