Skip to content

Commit a3c88cf

Browse files
Sync LunarClient Mods & Options
1 parent 169126b commit a3c88cf

14 files changed

Lines changed: 399 additions & 1233 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ public final class Mods {
135135
ModOneSevenVisuals.class,
136136
ModFps.class,
137137
ModCps.class,
138-
ModSba.class,
139138
ModToggleSneak.class,
140139
ModZoom.class,
141140
ModHypixelMod.class,
@@ -206,7 +205,6 @@ public final class Mods {
206205
ModChunkBorders.class,
207206
ModSoundChanger.class,
208207
ModWaila.class,
209-
ModNeu.class,
210208
ModHurtCam.class,
211209
ModTierTagger.class,
212210
ModDamageTint.class,
@@ -222,7 +220,9 @@ public final class Mods {
222220
ModInventoryMod.class,
223221
ModF3Display.class,
224222
ModRadio.class,
225-
ModUhcOverlay.class
223+
ModUhcOverlay.class,
224+
ModSba.class,
225+
ModNeu.class
226226
);
227227

228228
private Mods() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public final class ModArmorstatus {
7676
*/
7777
public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
7878
.node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
79-
.defaultValue(false)
79+
.defaultValue(true)
8080
.notifyClient()
8181
.build();
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public final class ModBossbar {
8787
*/
8888
public static final SimpleOption<Boolean> CUSTOM_BOSS_BAR = SimpleOption.<Boolean>builder()
8989
.node("bossbar", "custom-boss-bar").type(TypeToken.get(Boolean.class))
90-
.defaultValue(true)
90+
.defaultValue(false)
9191
.notifyClient()
9292
.build();
9393

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727
import io.leangen.geantyref.TypeToken;
2828

2929
/**
30-
* Skyblock Mod made by Moulberry.
30+
* No documentation available.
3131
*
3232
* @since 1.0.0
3333
*/
34+
@Deprecated
3435
public final class ModNeu {
3536

3637
/**
3738
* No documentation available.
3839
*
3940
* @since 1.0.0
4041
*/
42+
@Deprecated
4143
public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
4244
.node("neu", "enabled").type(TypeToken.get(Boolean.class))
4345
.defaultValue(true)

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

Lines changed: 71 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -49,56 +49,70 @@ public final class ModParticleChanger {
4949
/**
5050
* No documentation available.
5151
*
52-
* @since 1.2.2
52+
* @since 1.0.0
5353
*/
54-
public static final SimpleOption<Boolean> SHOW_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
55-
.node("particle-changer", "show-blood-particles").type(TypeToken.get(Boolean.class))
54+
public static final SimpleOption<Boolean> ALWAYS_ENCHANT_STRIKES = SimpleOption.<Boolean>builder()
55+
.node("particle-changer", "always-enchant-strikes").type(TypeToken.get(Boolean.class))
5656
.defaultValue(false)
5757
.notifyClient()
5858
.build();
5959

6060
/**
61-
* No documentation available.
61+
* Hide particles which are emitted in first person (e.g. potion effects).
6262
*
63-
* @since 1.2.2
63+
* @since 1.0.0
6464
*/
65-
public static final NumberOption<Integer> BLOOD_MULTIPLIER = NumberOption.<Integer>number()
66-
.node("particle-changer", "blood-multiplier").type(TypeToken.get(Integer.class))
67-
.min(1).max(10)
68-
.defaultValue(1)
65+
public static final SimpleOption<Boolean> HIDE_FIRST_PERSON_PARTICLES = SimpleOption.<Boolean>builder()
66+
.comment("Hide particles which are emitted in first person (e.g. potion effects)")
67+
.node("particle-changer", "hide-first-person-particles").type(TypeToken.get(Boolean.class))
68+
.defaultValue(false)
6969
.notifyClient()
7070
.build();
7171

7272
/**
7373
* No documentation available.
7474
*
75+
* @since %release_version%
76+
*/
77+
public static final SimpleOption<Boolean> HIDE_BLOCK_BREAK_PARTICLES = SimpleOption.<Boolean>builder()
78+
.node("particle-changer", "hide-block-break-particles").type(TypeToken.get(Boolean.class))
79+
.defaultValue(false)
80+
.notifyClient()
81+
.build();
82+
83+
/**
84+
* Simple toggle for clean game rendering. This may cause issues with certain server mechanics being more challenging to see!.
85+
*
7586
* @since 1.2.2
7687
*/
77-
public static final SimpleOption<Boolean> PLAYER_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
78-
.node("particle-changer", "player-blood-particles").type(TypeToken.get(Boolean.class))
79-
.defaultValue(true)
88+
public static final SimpleOption<Boolean> HIDE_ALL_PARTICLES = SimpleOption.<Boolean>builder()
89+
.comment("Simple toggle for clean game rendering. This may cause issues with certain server mechanics being more challenging to see!")
90+
.node("particle-changer", "hide-all-particles").type(TypeToken.get(Boolean.class))
91+
.defaultValue(false)
8092
.notifyClient()
8193
.build();
8294

8395
/**
8496
* No documentation available.
8597
*
86-
* @since 1.2.2
98+
* @since 1.0.0
8799
*/
88-
public static final SimpleOption<Boolean> ENTITY_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
89-
.node("particle-changer", "entity-blood-particles").type(TypeToken.get(Boolean.class))
90-
.defaultValue(true)
100+
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
101+
.node("particle-changer", "scale").type(TypeToken.get(Float.class))
102+
.min(0.25F).max(2.0F)
103+
.defaultValue(1.0F)
91104
.notifyClient()
92105
.build();
93106

94107
/**
95108
* No documentation available.
96109
*
97-
* @since 1.2.2
110+
* @since 1.0.0
98111
*/
99-
public static final SimpleOption<Boolean> PLAY_BLOOD_SOUND = SimpleOption.<Boolean>builder()
100-
.node("particle-changer", "play-blood-sound").type(TypeToken.get(Boolean.class))
101-
.defaultValue(false)
112+
public static final NumberOption<Float> PARTICLE_MULTIPLIER = NumberOption.<Float>number()
113+
.node("particle-changer", "particle-multiplier").type(TypeToken.get(Float.class))
114+
.min(0.25F).max(10.0F)
115+
.defaultValue(1.0F)
102116
.notifyClient()
103117
.build();
104118

@@ -107,8 +121,8 @@ public final class ModParticleChanger {
107121
*
108122
* @since 1.0.0
109123
*/
110-
public static final SimpleOption<Boolean> ALWAYS_ENCHANT_STRIKES = SimpleOption.<Boolean>builder()
111-
.node("particle-changer", "always-enchant-strikes").type(TypeToken.get(Boolean.class))
124+
public static final SimpleOption<Boolean> HIDE_PARTICLE = SimpleOption.<Boolean>builder()
125+
.node("particle-changer", "hide-particle").type(TypeToken.get(Boolean.class))
112126
.defaultValue(false)
113127
.notifyClient()
114128
.build();
@@ -118,78 +132,80 @@ public final class ModParticleChanger {
118132
*
119133
* @since 1.0.0
120134
*/
121-
public static final SimpleOption<Boolean> AFFECT_ENCHANTED_WEAPONS = SimpleOption.<Boolean>builder()
122-
.node("particle-changer", "affect-enchanted-weapons").type(TypeToken.get(Boolean.class))
123-
.defaultValue(true)
135+
public static final SimpleOption<Boolean> OVERLAY_COLOR = SimpleOption.<Boolean>builder()
136+
.node("particle-changer", "overlay-color").type(TypeToken.get(Boolean.class))
137+
.defaultValue(false)
124138
.notifyClient()
125139
.build();
126140

127141
/**
128-
* Hide your players potion effect particles when you're in first person.
142+
* No documentation available.
129143
*
130144
* @since 1.0.0
131145
*/
132-
public static final SimpleOption<Boolean> HIDE_FIRST_PERSON_PARTICLES = SimpleOption.<Boolean>builder()
133-
.comment("Hide your players potion effect particles when you're in first person")
134-
.node("particle-changer", "hide-first-person-particles").type(TypeToken.get(Boolean.class))
135-
.defaultValue(false)
146+
public static final SimpleOption<Color> COLOR = SimpleOption.<Color>builder()
147+
.node("particle-changer", "color").type(TypeToken.get(Color.class))
148+
.defaultValue(new Color(255, 255, 255))
136149
.notifyClient()
137150
.build();
138151

139152
/**
140-
* Simple toggle for clean game rendering. This may cause issues with certain server mechanics being more challenging to see!.
153+
* No documentation available.
141154
*
142155
* @since 1.2.2
143156
*/
144-
public static final SimpleOption<Boolean> HIDE_ALL_PARTICLES = SimpleOption.<Boolean>builder()
145-
.comment("Simple toggle for clean game rendering. This may cause issues with certain server mechanics being more challenging to see!")
146-
.node("particle-changer", "hide-all-particles").type(TypeToken.get(Boolean.class))
157+
@Deprecated
158+
public static final SimpleOption<Boolean> SHOW_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
159+
.node("particle-changer", "show-blood-particles").type(TypeToken.get(Boolean.class))
147160
.defaultValue(false)
148161
.notifyClient()
149162
.build();
150163

151164
/**
152165
* No documentation available.
153166
*
154-
* @since 1.0.0
167+
* @since 1.2.2
155168
*/
156-
public static final SimpleOption<Color> COLOR = SimpleOption.<Color>builder()
157-
.node("particle-changer", "color").type(TypeToken.get(Color.class))
158-
.defaultValue(new Color(255, 255, 255))
169+
@Deprecated
170+
public static final NumberOption<Integer> BLOOD_MULTIPLIER = NumberOption.<Integer>number()
171+
.node("particle-changer", "blood-multiplier").type(TypeToken.get(Integer.class))
172+
.min(1).max(10)
173+
.defaultValue(1)
159174
.notifyClient()
160175
.build();
161176

162177
/**
163178
* No documentation available.
164179
*
165-
* @since 1.0.0
180+
* @since 1.2.2
166181
*/
167-
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
168-
.node("particle-changer", "scale").type(TypeToken.get(Float.class))
169-
.min(0.5F).max(2.0F)
170-
.defaultValue(1.0F)
182+
@Deprecated
183+
public static final SimpleOption<Boolean> PLAYER_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
184+
.node("particle-changer", "player-blood-particles").type(TypeToken.get(Boolean.class))
185+
.defaultValue(true)
171186
.notifyClient()
172187
.build();
173188

174189
/**
175190
* No documentation available.
176191
*
177-
* @since 1.0.0
192+
* @since 1.2.2
178193
*/
179-
public static final NumberOption<Integer> PARTICLE_MULTIPLIER = NumberOption.<Integer>number()
180-
.node("particle-changer", "particle-multiplier").type(TypeToken.get(Integer.class))
181-
.min(1).max(10)
182-
.defaultValue(1)
194+
@Deprecated
195+
public static final SimpleOption<Boolean> ENTITY_BLOOD_PARTICLES = SimpleOption.<Boolean>builder()
196+
.node("particle-changer", "entity-blood-particles").type(TypeToken.get(Boolean.class))
197+
.defaultValue(true)
183198
.notifyClient()
184199
.build();
185200

186201
/**
187202
* No documentation available.
188203
*
189-
* @since 1.0.0
204+
* @since 1.2.2
190205
*/
191-
public static final SimpleOption<Boolean> HIDE_PARTICLE = SimpleOption.<Boolean>builder()
192-
.node("particle-changer", "hide-particle").type(TypeToken.get(Boolean.class))
206+
@Deprecated
207+
public static final SimpleOption<Boolean> PLAY_BLOOD_SOUND = SimpleOption.<Boolean>builder()
208+
.node("particle-changer", "play-blood-sound").type(TypeToken.get(Boolean.class))
193209
.defaultValue(false)
194210
.notifyClient()
195211
.build();
@@ -199,9 +215,10 @@ public final class ModParticleChanger {
199215
*
200216
* @since 1.0.0
201217
*/
202-
public static final SimpleOption<Boolean> OVERLAY_COLOR = SimpleOption.<Boolean>builder()
203-
.node("particle-changer", "overlay-color").type(TypeToken.get(Boolean.class))
204-
.defaultValue(false)
218+
@Deprecated
219+
public static final SimpleOption<Boolean> AFFECT_ENCHANTED_WEAPONS = SimpleOption.<Boolean>builder()
220+
.node("particle-changer", "affect-enchanted-weapons").type(TypeToken.get(Boolean.class))
221+
.defaultValue(true)
205222
.notifyClient()
206223
.build();
207224

0 commit comments

Comments
 (0)