Skip to content

Commit 6dd6348

Browse files
Sync LunarClient Mods & Options
1 parent 9dc9aec commit 6dd6348

File tree

141 files changed

+5638
-874
lines changed

Some content is hidden

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

141 files changed

+5638
-874
lines changed

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

Lines changed: 10 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,12 +84,14 @@
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;
8791
import com.lunarclient.apollo.mods.impl.ModScreenshot;
8892
import com.lunarclient.apollo.mods.impl.ModScrollableTooltips;
8993
import com.lunarclient.apollo.mods.impl.ModServerAddress;
94+
import com.lunarclient.apollo.mods.impl.ModShields;
9095
import com.lunarclient.apollo.mods.impl.ModShinyPots;
9196
import com.lunarclient.apollo.mods.impl.ModShulkerPreview;
9297
import com.lunarclient.apollo.mods.impl.ModSkyblock;
@@ -187,6 +192,7 @@ public final class Mods {
187192
ModBossbar.class,
188193
ModFreelook.class,
189194
ModPvpInfo.class,
195+
ModMarkers.class,
190196
ModSnaplook.class,
191197
ModTeamView.class,
192198
ModPackDisplay.class,
@@ -202,8 +208,12 @@ public final class Mods {
202208
ModHurtCam.class,
203209
ModTierTagger.class,
204210
ModDamageTint.class,
211+
ModMobSize.class,
205212
ModSkyblock.class,
206213
ModHorseStats.class,
214+
ModRewind.class,
215+
ModAudioSubtitles.class,
216+
ModShields.class,
207217
ModKillSounds.class,
208218
ModInventoryMod.class,
209219
ModRadio.class

api/src/main/java/com/lunarclient/apollo/mods/impl/Mod2dItems.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public final class Mod2dItems {
4040
*/
4141
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
4242
.node("2d-items", "enabled").type(TypeToken.get(Boolean.class))
43+
.defaultValue(false)
4344
.notifyClient()
4445
.build();
4546

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public final class Mod3dSkins {
4141
*/
4242
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
4343
.node("3d-skins", "enabled").type(TypeToken.get(Boolean.class))
44+
.defaultValue(false)
4445
.notifyClient()
4546
.build();
4647

@@ -52,6 +53,7 @@ public final class Mod3dSkins {
5253
public static final NumberOption<Integer> RENDER_DISTANCE_LOD = NumberOption.<Integer>number()
5354
.node("3d-skins", "render-distance-lod").type(TypeToken.get(Integer.class))
5455
.min(5).max(40)
56+
.defaultValue(14)
5557
.notifyClient()
5658
.build();
5759

@@ -62,6 +64,7 @@ public final class Mod3dSkins {
6264
*/
6365
public static final SimpleOption<Boolean> SHOW_OTHERS = SimpleOption.<Boolean>builder()
6466
.node("3d-skins", "show-others").type(TypeToken.get(Boolean.class))
67+
.defaultValue(true)
6568
.notifyClient()
6669
.build();
6770

@@ -72,6 +75,7 @@ public final class Mod3dSkins {
7275
*/
7376
public static final SimpleOption<Boolean> ENABLE_HAT = SimpleOption.<Boolean>builder()
7477
.node("3d-skins", "enable-hat").type(TypeToken.get(Boolean.class))
78+
.defaultValue(true)
7579
.notifyClient()
7680
.build();
7781

@@ -82,6 +86,7 @@ public final class Mod3dSkins {
8286
*/
8387
public static final SimpleOption<Boolean> ENABLE_JACKET = SimpleOption.<Boolean>builder()
8488
.node("3d-skins", "enable-jacket").type(TypeToken.get(Boolean.class))
89+
.defaultValue(true)
8590
.notifyClient()
8691
.build();
8792

@@ -92,6 +97,7 @@ public final class Mod3dSkins {
9297
*/
9398
public static final SimpleOption<Boolean> ENABLE_LEFT_SLEEVE = SimpleOption.<Boolean>builder()
9499
.node("3d-skins", "enable-left-sleeve").type(TypeToken.get(Boolean.class))
100+
.defaultValue(true)
95101
.notifyClient()
96102
.build();
97103

@@ -102,6 +108,7 @@ public final class Mod3dSkins {
102108
*/
103109
public static final SimpleOption<Boolean> ENABLE_RIGHT_SLEEVE = SimpleOption.<Boolean>builder()
104110
.node("3d-skins", "enable-right-sleeve").type(TypeToken.get(Boolean.class))
111+
.defaultValue(true)
105112
.notifyClient()
106113
.build();
107114

@@ -112,6 +119,7 @@ public final class Mod3dSkins {
112119
*/
113120
public static final SimpleOption<Boolean> ENABLE_LEFT_PANTS = SimpleOption.<Boolean>builder()
114121
.node("3d-skins", "enable-left-pants").type(TypeToken.get(Boolean.class))
122+
.defaultValue(true)
115123
.notifyClient()
116124
.build();
117125

@@ -122,6 +130,7 @@ public final class Mod3dSkins {
122130
*/
123131
public static final SimpleOption<Boolean> ENABLE_RIGHT_PANTS = SimpleOption.<Boolean>builder()
124132
.node("3d-skins", "enable-right-pants").type(TypeToken.get(Boolean.class))
133+
.defaultValue(true)
125134
.notifyClient()
126135
.build();
127136

@@ -133,6 +142,7 @@ public final class Mod3dSkins {
133142
public static final NumberOption<Float> BASE_VOXEL_SIZE = NumberOption.<Float>number()
134143
.node("3d-skins", "base-voxel-size").type(TypeToken.get(Float.class))
135144
.min(1.001F).max(1.4F)
145+
.defaultValue(1.15F)
136146
.notifyClient()
137147
.build();
138148

@@ -144,6 +154,7 @@ public final class Mod3dSkins {
144154
public static final NumberOption<Float> BODY_VOXEL_WIDTH_SIZE = NumberOption.<Float>number()
145155
.node("3d-skins", "body-voxel-width-size").type(TypeToken.get(Float.class))
146156
.min(1.001F).max(1.4F)
157+
.defaultValue(1.05F)
147158
.notifyClient()
148159
.build();
149160

@@ -155,6 +166,7 @@ public final class Mod3dSkins {
155166
public static final NumberOption<Float> HEAD_VOXEL_SIZE = NumberOption.<Float>number()
156167
.node("3d-skins", "head-voxel-size").type(TypeToken.get(Float.class))
157168
.min(1.001F).max(1.25F)
169+
.defaultValue(1.18F)
158170
.notifyClient()
159171
.build();
160172

@@ -166,6 +178,7 @@ public final class Mod3dSkins {
166178
public static final NumberOption<Float> FIRST_PERSON_VOXEL_SIZE = NumberOption.<Float>number()
167179
.node("3d-skins", "first-person-voxel-size").type(TypeToken.get(Float.class))
168180
.min(1.001F).max(1.3F)
181+
.defaultValue(1.1F)
169182
.notifyClient()
170183
.build();
171184

@@ -176,6 +189,7 @@ public final class Mod3dSkins {
176189
*/
177190
public static final SimpleOption<Boolean> ENABLE_SKULLS = SimpleOption.<Boolean>builder()
178191
.node("3d-skins", "enable-skulls").type(TypeToken.get(Boolean.class))
192+
.defaultValue(true)
179193
.notifyClient()
180194
.build();
181195

@@ -186,6 +200,7 @@ public final class Mod3dSkins {
186200
*/
187201
public static final SimpleOption<Boolean> ENABLE_SKULLS_ITEMS = SimpleOption.<Boolean>builder()
188202
.node("3d-skins", "enable-skulls-items").type(TypeToken.get(Boolean.class))
203+
.defaultValue(true)
189204
.notifyClient()
190205
.build();
191206

@@ -197,6 +212,7 @@ public final class Mod3dSkins {
197212
public static final NumberOption<Float> SKULL_VOXEL_SIZE = NumberOption.<Float>number()
198213
.node("3d-skins", "skull-voxel-size").type(TypeToken.get(Float.class))
199214
.min(1.001F).max(1.2F)
215+
.defaultValue(1.1F)
200216
.notifyClient()
201217
.build();
202218

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

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public final class ModArmorstatus {
4242
*/
4343
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
4444
.node("armorstatus", "enabled").type(TypeToken.get(Boolean.class))
45+
.defaultValue(true)
4546
.notifyClient()
4647
.build();
4748

@@ -52,7 +53,8 @@ public final class ModArmorstatus {
5253
*/
5354
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
5455
.node("armorstatus", "scale").type(TypeToken.get(Float.class))
55-
.min(0.5F).max(1.5F)
56+
.min(0.25F).max(5.0F)
57+
.defaultValue(1.0F)
5658
.notifyClient()
5759
.build();
5860

@@ -63,6 +65,7 @@ public final class ModArmorstatus {
6365
*/
6466
public static final SimpleOption<Boolean> MOVE_ARMOR_INDIVIDUALLY = SimpleOption.<Boolean>builder()
6567
.node("armorstatus", "move-armor-individually").type(TypeToken.get(Boolean.class))
68+
.defaultValue(false)
6669
.notifyClient()
6770
.build();
6871

@@ -73,6 +76,7 @@ public final class ModArmorstatus {
7376
*/
7477
public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
7578
.node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
79+
.defaultValue(false)
7680
.notifyClient()
7781
.build();
7882

@@ -83,6 +87,7 @@ public final class ModArmorstatus {
8387
*/
8488
public static final SimpleOption<Boolean> ITEM_NAME = SimpleOption.<Boolean>builder()
8589
.node("armorstatus", "item-name").type(TypeToken.get(Boolean.class))
90+
.defaultValue(false)
8691
.notifyClient()
8792
.build();
8893

@@ -93,6 +98,7 @@ public final class ModArmorstatus {
9398
*/
9499
public static final SimpleOption<Boolean> ITEM_COUNT = SimpleOption.<Boolean>builder()
95100
.node("armorstatus", "item-count").type(TypeToken.get(Boolean.class))
101+
.defaultValue(true)
96102
.notifyClient()
97103
.build();
98104

@@ -103,16 +109,19 @@ public final class ModArmorstatus {
103109
*/
104110
public static final SimpleOption<Boolean> SHOW_WHILE_TYPING = SimpleOption.<Boolean>builder()
105111
.node("armorstatus", "show-while-typing").type(TypeToken.get(Boolean.class))
112+
.defaultValue(false)
106113
.notifyClient()
107114
.build();
108115

109116
/**
110-
* No documentation available.
117+
* Adds a shadow to text.
111118
*
112119
* @since 1.0.0
113120
*/
114121
public static final SimpleOption<Boolean> TEXT_SHADOW = SimpleOption.<Boolean>builder()
122+
.comment("Adds a shadow to text")
115123
.node("armorstatus", "text-shadow").type(TypeToken.get(Boolean.class))
124+
.defaultValue(true)
116125
.notifyClient()
117126
.build();
118127

@@ -123,6 +132,7 @@ public final class ModArmorstatus {
123132
*/
124133
public static final SimpleOption<Boolean> DAMAGE_OVERLAY = SimpleOption.<Boolean>builder()
125134
.node("armorstatus", "damage-overlay").type(TypeToken.get(Boolean.class))
135+
.defaultValue(true)
126136
.notifyClient()
127137
.build();
128138

@@ -133,6 +143,7 @@ public final class ModArmorstatus {
133143
*/
134144
public static final SimpleOption<Boolean> ITEM_DAMAGE = SimpleOption.<Boolean>builder()
135145
.node("armorstatus", "item-damage").type(TypeToken.get(Boolean.class))
146+
.defaultValue(true)
136147
.notifyClient()
137148
.build();
138149

@@ -143,6 +154,7 @@ public final class ModArmorstatus {
143154
*/
144155
public static final SimpleOption<Boolean> ARMOR_DAMAGE = SimpleOption.<Boolean>builder()
145156
.node("armorstatus", "armor-damage").type(TypeToken.get(Boolean.class))
157+
.defaultValue(true)
146158
.notifyClient()
147159
.build();
148160

@@ -153,6 +165,7 @@ public final class ModArmorstatus {
153165
*/
154166
public static final SimpleOption<Boolean> MAX_DAMAGE = SimpleOption.<Boolean>builder()
155167
.node("armorstatus", "max-damage").type(TypeToken.get(Boolean.class))
168+
.defaultValue(false)
156169
.notifyClient()
157170
.build();
158171

@@ -163,6 +176,7 @@ public final class ModArmorstatus {
163176
*/
164177
public static final SimpleOption<Boolean> STATIC_DAMAGE_COLORS = SimpleOption.<Boolean>builder()
165178
.node("armorstatus", "static-damage-colors").type(TypeToken.get(Boolean.class))
179+
.defaultValue(false)
166180
.notifyClient()
167181
.build();
168182

@@ -173,6 +187,7 @@ public final class ModArmorstatus {
173187
*/
174188
public static final SimpleOption<Color> NAME_TEXT_COLOR = SimpleOption.<Color>builder()
175189
.node("armorstatus", "name-text-color").type(TypeToken.get(Color.class))
190+
.defaultValue(new Color(255, 255, 255))
176191
.notifyClient()
177192
.build();
178193

@@ -183,6 +198,7 @@ public final class ModArmorstatus {
183198
*/
184199
public static final SimpleOption<Color> HIGHEST_COLOR = SimpleOption.<Color>builder()
185200
.node("armorstatus", "highest-color").type(TypeToken.get(Color.class))
201+
.defaultValue(new Color(255, 255, 255))
186202
.notifyClient()
187203
.build();
188204

@@ -193,6 +209,7 @@ public final class ModArmorstatus {
193209
*/
194210
public static final SimpleOption<Color> HIGH_COLOR = SimpleOption.<Color>builder()
195211
.node("armorstatus", "high-color").type(TypeToken.get(Color.class))
212+
.defaultValue(new Color(85, 255, 85))
196213
.notifyClient()
197214
.build();
198215

@@ -203,6 +220,7 @@ public final class ModArmorstatus {
203220
*/
204221
public static final SimpleOption<Color> MEDIUM_COLOR = SimpleOption.<Color>builder()
205222
.node("armorstatus", "medium-color").type(TypeToken.get(Color.class))
223+
.defaultValue(new Color(255, 255, 85))
206224
.notifyClient()
207225
.build();
208226

@@ -213,6 +231,7 @@ public final class ModArmorstatus {
213231
*/
214232
public static final SimpleOption<Color> MEDIUM_LOW_COLOR = SimpleOption.<Color>builder()
215233
.node("armorstatus", "medium-low-color").type(TypeToken.get(Color.class))
234+
.defaultValue(new Color(255, 170, 0))
216235
.notifyClient()
217236
.build();
218237

@@ -223,6 +242,7 @@ public final class ModArmorstatus {
223242
*/
224243
public static final SimpleOption<Color> LOW_COLOR = SimpleOption.<Color>builder()
225244
.node("armorstatus", "low-color").type(TypeToken.get(Color.class))
245+
.defaultValue(new Color(255, 85, 85))
226246
.notifyClient()
227247
.build();
228248

@@ -233,6 +253,7 @@ public final class ModArmorstatus {
233253
*/
234254
public static final SimpleOption<Color> LOWEST_COLOR = SimpleOption.<Color>builder()
235255
.node("armorstatus", "lowest-color").type(TypeToken.get(Color.class))
256+
.defaultValue(new Color(170, 0, 0))
236257
.notifyClient()
237258
.build();
238259

0 commit comments

Comments
 (0)