Skip to content

Commit d155e01

Browse files
ItsNatureTrentinTheKidRhodlessvectrixdevelopsLunarClientBot
authored
Version - 1.1.6 (#183)
* Deploy as 1.1.5-SNAPSHOT * Lightweight (#162) * WIP: lightweight docs * Lightweight doc revamp * Simple touch-ups * Switch methods to tabs * Attempt to fix tabs * Close tabs * again * Revert tabs * Attempt to add tabs once more * Add tab import * Fix tab import * Add lightweight-wrapper & lightweight-example modules * Register "lunar:apollo" for player detection * Add protobuf repo section * Remove lightweight-wrapper & lightweight-example * Add the Apollo repository & protobuf-java-util as dependency to docs * Use correct ` * Fix typo --------- Co-authored-by: TrentinTheKid <25537885+TrentinTheKid@users.noreply.github.com> * fix: ClassCastException for Color conversion in newer Java versions (#161) * fix: ClassCastException for Color conversion in newer Java versions This commit corrects the issue by converting the Color object to its RGB hex string representation. * fix: Restore HEX string compatibility while retaining Color object support This commit addresses the regression introduced in the previous fix that enabled Color object usage but broke HEX string compatibility. The code has been adjusted to ensure that both HEX strings (e.g., "#FFFFAA00") and Color objects (e.g., Color.RED) can be used interchangeably when setting color values in options.set(). This fix ensures backward compatibility with the previous behavior while retaining the ability to use Color objects without causing a ClassCastException. * Throw RuntimeException for invalid Color types --------- Co-authored-by: ItsNature <matej.bucaric@gmail.com> * make player an audience (#163) * Deploy as 1.1.6-SNAPSHOT * Feature - Tebex Module (#167) * Implement Tebex module * Rename TebexCheckoutSupportType to TebexEmbeddedCheckoutSupport & add basket id parameter to the tebex command * basketId -> basketIdent * Remove callout & doc page --------- Co-authored-by: TrentinTheKid <25537885+TrentinTheKid@users.noreply.github.com> * Feature - Add Tebex locale field (#174) * Add locale field to the tebex module * Add seperate method to not break the API * Use correct locale arg * Lightweight: Documentation (#172) * Add a bunch of lightweight examples * Add more examples * Even more examples... * More examples & prepare for example plugin merge * Fix adventure usages * Testable state * Add more notes * Add switch implementation command * Finish more examples, start working on markdown * Spotless fixes * Update beam.mdx with new examples * Finish team examples * More markdown work * Add missing import to chat.mdx * Move builders outside tabs again * Fix remaining serialization issues * Add more markdown examples * Add hologram & limb examples * move builders inside API tab, add nametag, nickhider & notification examples * Finish proto examples * Remove object utils * add temp layout * Finish all Json Examples * Add Tebex module locale field to lightweight examples * The merge! * Start lightweight.mdx rewrite * Close tab * Import callout * ADd modsettings examples * richpresence, serverrule, staffmod, stopwatch, title, tntcountdown, tranfser, vignette & waypoint markdown examples * Protobuf Lightweight Documentation * Minor changes * Updating player world code & markdown, packet enrichment & minor parameter fixups * Fix links * Fix the fixed links * Spotless fixes * Add lightweight callout to intro * add intro to meta json * Finish JSON lightweight docs * Remove old lightweight.mdx * Link usage methods, add module examples note * resolve callout issue? * Rebuild * Team markdown examples * update callout * update callout * remove placeholder text * Remove build status * Replace Component#appendNewLine with Component.append(Component.newline()) for backwards compatibility * Default implementation type to API * Remove protobuf-java-util dependency * Final touch-ups * fix typo * Wording Change * Lightning -> Lighting * Use Futures for Roundtrip example & implement timeout * Mark player data fields with `@Nullable` --------- Co-authored-by: TrentinTheKid <25537885+TrentinTheKid@users.noreply.github.com> * Feature - Add packet spam debug command example (#177) * add spam packet debug command * decrease delay on packet spam * improve spam packets command --------- Co-authored-by: ItsNature <matej.bucaric@gmail.com> * Sync LunarClient Mods & Options (#181) * Sync LunarClient Mods & Options * Update version tags to 1.1.6 --------- Co-authored-by: LunarClient Bot <lc-bot@moonsworth.com> * Bump to 1.1.6 (#182) --------- Co-authored-by: TrentinTheKid <25537885+TrentinTheKid@users.noreply.github.com> Co-authored-by: Hugo <58655174+Rhodless@users.noreply.github.com> Co-authored-by: Connor <vectrixu+gh@gmail.com> Co-authored-by: LunarClient Bot <lc-bot@moonsworth.com>
1 parent 11600a8 commit d155e01

File tree

252 files changed

+12216
-1282
lines changed

Some content is hidden

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

252 files changed

+12216
-1282
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Apollo
2-
![Build Status](https://img.shields.io/github/actions/workflow/status/LunarClient/Apollo/.github/workflows/deploy.yml)
32
[![Discord](https://img.shields.io/discord/1080556677004271666?logo=discord&label=discord)](https://discord.gg/3T9Atyb6pf)
43

54
Apollo is a powerful tool that allows developers to create custom integrations with Lunar Client.

‎api/src/main/java/com/lunarclient/apollo/event/player/ApolloPlayerHandshakeEvent.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.lunarclient.apollo.client.version.LunarClientVersion;
2828
import com.lunarclient.apollo.client.version.MinecraftVersion;
2929
import com.lunarclient.apollo.event.Event;
30+
import com.lunarclient.apollo.module.tebex.TebexEmbeddedCheckoutSupport;
3031
import com.lunarclient.apollo.player.ApolloPlayer;
3132
import java.util.List;
3233
import lombok.Value;
@@ -71,4 +72,12 @@ public class ApolloPlayerHandshakeEvent implements Event {
7172
*/
7273
List<LunarClientMod> installedMods;
7374

75+
/**
76+
* The {@link TebexEmbeddedCheckoutSupport} type.
77+
*
78+
* @return the Tebex checkout support type
79+
* @since 1.1.6
80+
*/
81+
TebexEmbeddedCheckoutSupport tebexEmbeddedCheckoutSupport;
82+
7483
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@ public final class ModChat {
118118
.notifyClient()
119119
.build();
120120

121+
/**
122+
* Requires the ping message to exactly contain your name.For example, if your name is Notch, this will ping on Notch but not Notch123.
123+
*
124+
* @since 1.1.6
125+
*/
126+
public static final SimpleOption<Boolean> CHAT_PING_EXACT_MATCH = SimpleOption.<Boolean>builder()
127+
.comment("Requires the ping message to exactly contain your name.For example, if your name is Notch, this will ping on Notch but not Notch123.")
128+
.node("chat", "chat-ping-exact-match").type(TypeToken.get(Boolean.class))
129+
.notifyClient()
130+
.build();
131+
121132
/**
122133
* Copies the hovered chat message when holding the keybind and clicking.
123134
*

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

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,26 @@ public final class ModClock {
6666
.notifyClient()
6767
.build();
6868

69+
/**
70+
* No documentation available.
71+
*
72+
* @since 1.0.0
73+
*/
74+
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
75+
.node("clock", "brackets").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
79+
/**
80+
* No documentation available.
81+
*
82+
* @since 1.1.6
83+
*/
84+
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
85+
.node("clock", "bracket-color").type(TypeToken.get(Color.class))
86+
.notifyClient()
87+
.build();
88+
6989
/**
7090
* No documentation available.
7191
*
@@ -88,13 +108,13 @@ public final class ModClock {
88108
.build();
89109

90110
/**
91-
* No documentation available.
111+
* If this is disabled the background will change size with the text.
92112
*
93-
* @since 1.0.0
113+
* @since 1.1.6
94114
*/
95-
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
96-
.node("clock", "background-width").type(TypeToken.get(Integer.class))
97-
.min(46).max(62)
115+
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
116+
.comment("If this is disabled the background will change size with the text.")
117+
.node("clock", "static-background-height").type(TypeToken.get(Boolean.class))
98118
.notifyClient()
99119
.build();
100120

@@ -103,9 +123,9 @@ public final class ModClock {
103123
*
104124
* @since 1.0.0
105125
*/
106-
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
107-
.node("clock", "background-height").type(TypeToken.get(Integer.class))
108-
.min(10).max(22)
126+
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
127+
.node("clock", "background-width").type(TypeToken.get(Integer.class))
128+
.min(46).max(62)
109129
.notifyClient()
110130
.build();
111131

@@ -114,8 +134,9 @@ public final class ModClock {
114134
*
115135
* @since 1.0.0
116136
*/
117-
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
118-
.node("clock", "brackets").type(TypeToken.get(Boolean.class))
137+
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
138+
.node("clock", "background-height").type(TypeToken.get(Integer.class))
139+
.min(10).max(22)
119140
.notifyClient()
120141
.build();
121142

@@ -145,8 +166,8 @@ public final class ModClock {
145166
*
146167
* @since 1.0.0
147168
*/
148-
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
149-
.node("clock", "text-color").type(TypeToken.get(Color.class))
169+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
170+
.node("clock", "border-color").type(TypeToken.get(Color.class))
150171
.notifyClient()
151172
.build();
152173

@@ -165,8 +186,8 @@ public final class ModClock {
165186
*
166187
* @since 1.0.0
167188
*/
168-
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
169-
.node("clock", "border-color").type(TypeToken.get(Color.class))
189+
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
190+
.node("clock", "text-color").type(TypeToken.get(Color.class))
170191
.notifyClient()
171192
.build();
172193

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

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,26 @@ public final class ModCombo {
6666
.notifyClient()
6767
.build();
6868

69+
/**
70+
* No documentation available.
71+
*
72+
* @since 1.0.0
73+
*/
74+
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
75+
.node("combo", "brackets").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
79+
/**
80+
* No documentation available.
81+
*
82+
* @since 1.1.6
83+
*/
84+
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
85+
.node("combo", "bracket-color").type(TypeToken.get(Color.class))
86+
.notifyClient()
87+
.build();
88+
6989
/**
7090
* No documentation available.
7191
*
@@ -88,13 +108,13 @@ public final class ModCombo {
88108
.build();
89109

90110
/**
91-
* No documentation available.
111+
* If this is disabled the background will change size with the text.
92112
*
93-
* @since 1.0.0
113+
* @since 1.1.6
94114
*/
95-
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
96-
.node("combo", "background-width").type(TypeToken.get(Integer.class))
97-
.min(46).max(62)
115+
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
116+
.comment("If this is disabled the background will change size with the text.")
117+
.node("combo", "static-background-height").type(TypeToken.get(Boolean.class))
98118
.notifyClient()
99119
.build();
100120

@@ -103,9 +123,9 @@ public final class ModCombo {
103123
*
104124
* @since 1.0.0
105125
*/
106-
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
107-
.node("combo", "background-height").type(TypeToken.get(Integer.class))
108-
.min(10).max(22)
126+
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
127+
.node("combo", "background-width").type(TypeToken.get(Integer.class))
128+
.min(46).max(62)
109129
.notifyClient()
110130
.build();
111131

@@ -114,8 +134,9 @@ public final class ModCombo {
114134
*
115135
* @since 1.0.0
116136
*/
117-
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
118-
.node("combo", "brackets").type(TypeToken.get(Boolean.class))
137+
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
138+
.node("combo", "background-height").type(TypeToken.get(Integer.class))
139+
.min(10).max(22)
119140
.notifyClient()
120141
.build();
121142

@@ -145,8 +166,8 @@ public final class ModCombo {
145166
*
146167
* @since 1.0.0
147168
*/
148-
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
149-
.node("combo", "text-color").type(TypeToken.get(Color.class))
169+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
170+
.node("combo", "border-color").type(TypeToken.get(Color.class))
150171
.notifyClient()
151172
.build();
152173

@@ -165,8 +186,8 @@ public final class ModCombo {
165186
*
166187
* @since 1.0.0
167188
*/
168-
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
169-
.node("combo", "border-color").type(TypeToken.get(Color.class))
189+
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
190+
.node("combo", "text-color").type(TypeToken.get(Color.class))
170191
.notifyClient()
171192
.build();
172193

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

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,26 @@ public final class ModCps {
6666
.notifyClient()
6767
.build();
6868

69+
/**
70+
* No documentation available.
71+
*
72+
* @since 1.0.0
73+
*/
74+
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
75+
.node("cps", "brackets").type(TypeToken.get(Boolean.class))
76+
.notifyClient()
77+
.build();
78+
79+
/**
80+
* No documentation available.
81+
*
82+
* @since 1.1.6
83+
*/
84+
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
85+
.node("cps", "bracket-color").type(TypeToken.get(Color.class))
86+
.notifyClient()
87+
.build();
88+
6989
/**
7090
* No documentation available.
7191
*
@@ -88,13 +108,13 @@ public final class ModCps {
88108
.build();
89109

90110
/**
91-
* No documentation available.
111+
* If this is disabled the background will change size with the text.
92112
*
93-
* @since 1.0.0
113+
* @since 1.1.6
94114
*/
95-
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
96-
.node("cps", "background-width").type(TypeToken.get(Integer.class))
97-
.min(40).max(62)
115+
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
116+
.comment("If this is disabled the background will change size with the text.")
117+
.node("cps", "static-background-height").type(TypeToken.get(Boolean.class))
98118
.notifyClient()
99119
.build();
100120

@@ -103,9 +123,9 @@ public final class ModCps {
103123
*
104124
* @since 1.0.0
105125
*/
106-
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
107-
.node("cps", "background-height").type(TypeToken.get(Integer.class))
108-
.min(10).max(22)
126+
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
127+
.node("cps", "background-width").type(TypeToken.get(Integer.class))
128+
.min(40).max(62)
109129
.notifyClient()
110130
.build();
111131

@@ -114,8 +134,9 @@ public final class ModCps {
114134
*
115135
* @since 1.0.0
116136
*/
117-
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
118-
.node("cps", "brackets").type(TypeToken.get(Boolean.class))
137+
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
138+
.node("cps", "background-height").type(TypeToken.get(Integer.class))
139+
.min(10).max(22)
119140
.notifyClient()
120141
.build();
121142

@@ -145,8 +166,8 @@ public final class ModCps {
145166
*
146167
* @since 1.0.0
147168
*/
148-
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
149-
.node("cps", "text-color").type(TypeToken.get(Color.class))
169+
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
170+
.node("cps", "border-color").type(TypeToken.get(Color.class))
150171
.notifyClient()
151172
.build();
152173

@@ -165,8 +186,8 @@ public final class ModCps {
165186
*
166187
* @since 1.0.0
167188
*/
168-
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
169-
.node("cps", "border-color").type(TypeToken.get(Color.class))
189+
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
190+
.node("cps", "text-color").type(TypeToken.get(Color.class))
170191
.notifyClient()
171192
.build();
172193

@@ -185,8 +206,8 @@ public final class ModCps {
185206
*
186207
* @since 1.0.0
187208
*/
188-
public static final SimpleOption<Boolean> SHOW_CPSTEXT = SimpleOption.<Boolean>builder()
189-
.node("cps", "show-c-p-s-text").type(TypeToken.get(Boolean.class))
209+
public static final SimpleOption<Color> LINE_COLOR = SimpleOption.<Color>builder()
210+
.node("cps", "line-color").type(TypeToken.get(Color.class))
190211
.notifyClient()
191212
.build();
192213

@@ -195,8 +216,8 @@ public final class ModCps {
195216
*
196217
* @since 1.0.0
197218
*/
198-
public static final SimpleOption<Color> LINE_COLOR = SimpleOption.<Color>builder()
199-
.node("cps", "line-color").type(TypeToken.get(Color.class))
219+
public static final SimpleOption<Boolean> SHOW_CPSTEXT = SimpleOption.<Boolean>builder()
220+
.node("cps", "show-c-p-s-text").type(TypeToken.get(Boolean.class))
200221
.notifyClient()
201222
.build();
202223

0 commit comments

Comments
 (0)