Skip to content

Commit

Permalink
Sync LunarClient Mods & Options (#181)
Browse files Browse the repository at this point in the history 
* Sync LunarClient Mods & Options

* Update version tags to 1.1.6

---------

Co-authored-by: LunarClient Bot <[email protected]>
  • Loading branch information
@ItsNature @LunarClientBot
ItsNature and LunarClientBot authored Oct 28, 2024
1 parent cd88126 commit 1efad54
Show file tree
Hide file tree
Showing 41 changed files with 892 additions and 401 deletions.
11 changes: 11 additions & 0 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModChat.java
View file
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
View file
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
View file
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
View file
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 1efad54

@LunarClientBot
Copy link
Collaborator

@LunarClientBot LunarClientBot commented on 1efad54 Oct 28, 2024 •
edited
Loading

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:preview
URL:https://d012eb02.lunarclient-dev.pages.dev

Please sign in to comment.