Skip to content

Commit

Permalink
Version - 1.1.6 (#183)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Sync LunarClient Mods & Options (#181)

* Sync LunarClient Mods & Options

* Update version tags to 1.1.6

---------

Co-authored-by: LunarClient Bot <[email protected]>

* Bump to 1.1.6 (#182)

---------

Co-authored-by: TrentinTheKid <[email protected]>
Co-authored-by: Hugo <[email protected]>
Co-authored-by: Connor <[email protected]>
Co-authored-by: LunarClient Bot <[email protected]>
  • Loading branch information
5 people authored Oct 28, 2024
1 parent 11600a8 commit d155e01
Show file tree
Hide file tree
Showing 252 changed files with 12,216 additions and 1,282 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Apollo
![Build Status](https://img.shields.io/github/actions/workflow/status/LunarClient/Apollo/.github/workflows/deploy.yml)
[![Discord](https://img.shields.io/discord/1080556677004271666?logo=discord&label=discord)](https://discord.gg/3T9Atyb6pf)

Apollo is a powerful tool that allows developers to create custom integrations with Lunar Client.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.lunarclient.apollo.client.version.LunarClientVersion;
import com.lunarclient.apollo.client.version.MinecraftVersion;
import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.tebex.TebexEmbeddedCheckoutSupport;
import com.lunarclient.apollo.player.ApolloPlayer;
import java.util.List;
import lombok.Value;
Expand Down Expand Up @@ -71,4 +72,12 @@ public class ApolloPlayerHandshakeEvent implements Event {
*/
List<LunarClientMod> installedMods;

/**
* The {@link TebexEmbeddedCheckoutSupport} type.
*
* @return the Tebex checkout support type
* @since 1.1.6
*/
TebexEmbeddedCheckoutSupport tebexEmbeddedCheckoutSupport;

}
11 changes: 11 additions & 0 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModChat.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,17 @@ public final class ModChat {
.notifyClient()
.build();

/**
* Requires the ping message to exactly contain your name.For example, if your name is Notch, this will ping on Notch but not Notch123.
*
* @since 1.1.6
*/
public static final SimpleOption<Boolean> CHAT_PING_EXACT_MATCH = SimpleOption.<Boolean>builder()
.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.")
.node("chat", "chat-ping-exact-match").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* Copies the hovered chat message when holding the keybind and clicking.
*
Expand Down
49 changes: 35 additions & 14 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModClock.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,26 @@ public final class ModClock {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("clock", "brackets").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.6
*/
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
.node("clock", "bracket-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -88,13 +108,13 @@ public final class ModClock {
.build();

/**
* No documentation available.
* If this is disabled the background will change size with the text.
*
* @since 1.0.0
* @since 1.1.6
*/
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("clock", "background-width").type(TypeToken.get(Integer.class))
.min(46).max(62)
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
.comment("If this is disabled the background will change size with the text.")
.node("clock", "static-background-height").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand All @@ -103,9 +123,9 @@ public final class ModClock {
*
* @since 1.0.0
*/
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("clock", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("clock", "background-width").type(TypeToken.get(Integer.class))
.min(46).max(62)
.notifyClient()
.build();

Expand All @@ -114,8 +134,9 @@ public final class ModClock {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("clock", "brackets").type(TypeToken.get(Boolean.class))
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("clock", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
.notifyClient()
.build();

Expand Down Expand Up @@ -145,8 +166,8 @@ public final class ModClock {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("clock", "text-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("clock", "border-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand All @@ -165,8 +186,8 @@ public final class ModClock {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("clock", "border-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("clock", "text-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand Down
49 changes: 35 additions & 14 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModCombo.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,26 @@ public final class ModCombo {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("combo", "brackets").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.6
*/
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
.node("combo", "bracket-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -88,13 +108,13 @@ public final class ModCombo {
.build();

/**
* No documentation available.
* If this is disabled the background will change size with the text.
*
* @since 1.0.0
* @since 1.1.6
*/
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("combo", "background-width").type(TypeToken.get(Integer.class))
.min(46).max(62)
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
.comment("If this is disabled the background will change size with the text.")
.node("combo", "static-background-height").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand All @@ -103,9 +123,9 @@ public final class ModCombo {
*
* @since 1.0.0
*/
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("combo", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("combo", "background-width").type(TypeToken.get(Integer.class))
.min(46).max(62)
.notifyClient()
.build();

Expand All @@ -114,8 +134,9 @@ public final class ModCombo {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("combo", "brackets").type(TypeToken.get(Boolean.class))
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("combo", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
.notifyClient()
.build();

Expand Down Expand Up @@ -145,8 +166,8 @@ public final class ModCombo {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("combo", "text-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("combo", "border-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand All @@ -165,8 +186,8 @@ public final class ModCombo {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("combo", "border-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("combo", "text-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand Down
57 changes: 39 additions & 18 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModCps.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,26 @@ public final class ModCps {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("cps", "brackets").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.6
*/
public static final SimpleOption<Color> BRACKET_COLOR = SimpleOption.<Color>builder()
.node("cps", "bracket-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -88,13 +108,13 @@ public final class ModCps {
.build();

/**
* No documentation available.
* If this is disabled the background will change size with the text.
*
* @since 1.0.0
* @since 1.1.6
*/
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("cps", "background-width").type(TypeToken.get(Integer.class))
.min(40).max(62)
public static final SimpleOption<Boolean> STATIC_BACKGROUND_HEIGHT = SimpleOption.<Boolean>builder()
.comment("If this is disabled the background will change size with the text.")
.node("cps", "static-background-height").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand All @@ -103,9 +123,9 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("cps", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
public static final NumberOption<Integer> BACKGROUND_WIDTH = NumberOption.<Integer>number()
.node("cps", "background-width").type(TypeToken.get(Integer.class))
.min(40).max(62)
.notifyClient()
.build();

Expand All @@ -114,8 +134,9 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> BRACKETS = SimpleOption.<Boolean>builder()
.node("cps", "brackets").type(TypeToken.get(Boolean.class))
public static final NumberOption<Integer> BACKGROUND_HEIGHT = NumberOption.<Integer>number()
.node("cps", "background-height").type(TypeToken.get(Integer.class))
.min(10).max(22)
.notifyClient()
.build();

Expand Down Expand Up @@ -145,8 +166,8 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("cps", "text-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("cps", "border-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand All @@ -165,8 +186,8 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("cps", "border-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Color> TEXT_COLOR = SimpleOption.<Color>builder()
.node("cps", "text-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand All @@ -185,8 +206,8 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> SHOW_CPSTEXT = SimpleOption.<Boolean>builder()
.node("cps", "show-c-p-s-text").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Color> LINE_COLOR = SimpleOption.<Color>builder()
.node("cps", "line-color").type(TypeToken.get(Color.class))
.notifyClient()
.build();

Expand All @@ -195,8 +216,8 @@ public final class ModCps {
*
* @since 1.0.0
*/
public static final SimpleOption<Color> LINE_COLOR = SimpleOption.<Color>builder()
.node("cps", "line-color").type(TypeToken.get(Color.class))
public static final SimpleOption<Boolean> SHOW_CPSTEXT = SimpleOption.<Boolean>builder()
.node("cps", "show-c-p-s-text").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand Down
Loading

1 comment on commit d155e01

@LunarClientBot
Copy link
Collaborator

@LunarClientBot LunarClientBot commented on d155e01 Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📄 Documentation Deployment

Status:✅ Completed
Environment:production
URL:https://e7e4a506.lunarclient-dev.pages.dev

Please sign in to comment.