Version - 1.0.9 (#120)

* Publish as 1.0.9-SNAPSHOT * Add default features in the example plugin (#114) * fix hologram example typo (#115) * Feature - LunarClient Command (#113) * WIP: Command system improvements, add LunarClient command on Bukkit * Implement LunarClient command on Velocity & Bungee * Finish LunarClient command * Add lunarclient command to commands.mdx * Improve - Add range annotations & validation (#116) * add range annotations where needed * add validation * fix code style * add review suggestion * Feature - Apollo Updater (#117) * WIP: Apollo Updater * Remove debug * Implement /apollo update * Change Apollo velocity version to test * Fix velocity & bungee updating * Change back the apollo version * Sync LunarClient Mods & Options (#118) * Sync LunarClient Mods & Options * Update since tags * Update since tags --------- Co-authored-by: LunarClient Bot <[email protected]> * Bump to 1.0.9 (#119) --------- Co-authored-by: Connor <[email protected]> Co-authored-by: LunarClient Bot <[email protected]>
LunarClient · Feb 2, 2024 · 3794b36 · 3794b36 · LunarClientBot · Feb 2, 2024
1 parent 9ec9158
commit 3794b36
Show file tree

Hide file tree

Showing 76 changed files with 2,028 additions and 340 deletions.
diff --git a/api/src/main/java/com/lunarclient/apollo/ApolloPlatform.java b/api/src/main/java/com/lunarclient/apollo/ApolloPlatform.java
@@ -76,6 +76,14 @@ public interface ApolloPlatform {
      */
     ApolloStats getStats();
 
+    /**
+     * Returns the platform plugin class.
+     *
+     * @return the platform plugin class
+     * @since 1.0.9
+     */
+    Object getPlugin();
+
     /**
      * Represents the kind of server a platform is.
      *

diff --git a/api/src/main/java/com/lunarclient/apollo/common/icon/AdvancedResourceLocationIcon.java b/api/src/main/java/com/lunarclient/apollo/common/icon/AdvancedResourceLocationIcon.java
@@ -25,6 +25,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.jetbrains.annotations.Range;
 
 /**
  * Represents an advanced resource location icon.
@@ -51,22 +52,24 @@ public final class AdvancedResourceLocationIcon extends Icon {
     /**
      * Returns the icon width {@link Float}.
      *
-     * <p>Size of the image width (in pixels).</p>
+     * <p>Size of the image width (in pixels). Must be equal to or greater
+     * than 0.</p>
      *
      * @return the icon width
      * @since 1.0.0
      */
-    float width;
+    @Range(from = 0, to = Integer.MAX_VALUE) float width;
 
     /**
      * Returns the icon height {@link Float}.
      *
-     * <p>Size of the image height (in pixels).</p>
+     * <p>Size of the image height (in pixels). Must be equal to or greater
+     * than 0.</p>
      *
      * @return the icon height
      * @since 1.0.0
      */
-    float height;
+    @Range(from = 0, to = Integer.MAX_VALUE) float height;
 
     /**
      * Returns the icon min u {@link Float}.
@@ -76,7 +79,7 @@ public final class AdvancedResourceLocationIcon extends Icon {
      * @return the icon min u
      * @since 1.0.0
      */
-    float minU;
+    @Range(from = 0, to = 1) float minU;
 
     /**
      * Returns the icon max u {@link Float}.
@@ -86,7 +89,7 @@ public final class AdvancedResourceLocationIcon extends Icon {
      * @return the icon max u
      * @since 1.0.0
      */
-    float maxU;
+    @Range(from = 0, to = 1) float maxU;
 
     /**
      * Returns the icon min v {@link Float}.
@@ -96,7 +99,7 @@ public final class AdvancedResourceLocationIcon extends Icon {
      * @return the icon min v
      * @since 1.0.0
      */
-    float minV;
+    @Range(from = 0, to = 1) float minV;
 
     /**
      * Returns the icon max v {@link Float}.
@@ -106,6 +109,6 @@ public final class AdvancedResourceLocationIcon extends Icon {
      * @return the icon max v
      * @since 1.0.0
      */
-    float maxV;
+    @Range(from = 0, to = 1) float maxV;
 
 }
diff --git a/api/src/main/java/com/lunarclient/apollo/common/icon/SimpleResourceLocationIcon.java b/api/src/main/java/com/lunarclient/apollo/common/icon/SimpleResourceLocationIcon.java
@@ -25,6 +25,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.jetbrains.annotations.Range;
 
 /**
  * Represents a simple resource location icon.
@@ -48,11 +49,12 @@ public final class SimpleResourceLocationIcon extends Icon {
     /**
      * Returns the icon {@link Integer} size.
      *
-     * <p>Size of the image height and width (in pixels).</p>
+     * <p>Size of the image height and width (in pixels). Must be equal to or
+     * greater than 0.</p>
      *
      * @return the icon size
      * @since 1.0.0
      */
-    int size;
+    @Range(from = 0, to = Integer.MAX_VALUE) int size;
 
 }
diff --git a/api/src/main/java/com/lunarclient/apollo/mods/Mods.java b/api/src/main/java/com/lunarclient/apollo/mods/Mods.java
@@ -84,6 +84,7 @@
 import com.lunarclient.apollo.mods.impl.ModServerAddress;
 import com.lunarclient.apollo.mods.impl.ModShinyPots;
 import com.lunarclient.apollo.mods.impl.ModShulkerPreview;
+import com.lunarclient.apollo.mods.impl.ModSkyblock;
 import com.lunarclient.apollo.mods.impl.ModSnaplook;
 import com.lunarclient.apollo.mods.impl.ModSoundChanger;
 import com.lunarclient.apollo.mods.impl.ModStopwatch;
@@ -190,7 +191,8 @@ public final class Mods {
             ModWaila.class,
             ModNeu.class,
             ModHurtCam.class,
-            ModDamageTint.class
+            ModDamageTint.class,
+            ModSkyblock.class
         );
 
     private Mods() {

diff --git a/api/src/main/java/com/lunarclient/apollo/mods/impl/ModBlockOutline.java b/api/src/main/java/com/lunarclient/apollo/mods/impl/ModBlockOutline.java
@@ -50,8 +50,8 @@ public final class ModBlockOutline {
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Color> BLOCK_OUTLINE_COLOR = SimpleOption.<Color>builder()
-        .node("block-outline", "block-outline-color").type(TypeToken.get(Color.class))
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE = SimpleOption.<Boolean>builder()
+        .node("block-outline", "block-outline").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
 
@@ -60,19 +60,75 @@ public final class ModBlockOutline {
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Color> BLOCK_OVERLAY_COLOR = SimpleOption.<Color>builder()
-        .node("block-outline", "block-overlay-color").type(TypeToken.get(Color.class))
+    public static final NumberOption<Float> BLOCK_OUTLINE_WIDTH = NumberOption.<Float>number()
+        .node("block-outline", "block-outline-width").type(TypeToken.get(Float.class))
+        .min(1.0F).max(10.0F)
         .notifyClient()
         .build();
 
     /**
-     * No documentation available.
+     * Primary block outline color.
      *
      * @since 1.0.0
      */
-    public static final NumberOption<Float> BLOCK_OUTLINE_WIDTH = NumberOption.<Float>number()
-        .node("block-outline", "block-outline-width").type(TypeToken.get(Float.class))
-        .min(1.0F).max(10.0F)
+    public static final SimpleOption<Color> BLOCK_OUTLINE_COLOR = SimpleOption.<Color>builder()
+        .comment("Primary block outline color")
+        .node("block-outline", "block-outline-color").type(TypeToken.get(Color.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * Secondary block outline color.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Color> BLOCK_OUTLINE_COLOR_END = SimpleOption.<Color>builder()
+        .comment("Secondary block outline color")
+        .node("block-outline", "block-outline-color-end").type(TypeToken.get(Color.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the transparency should also blend between both outline colors.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_INTERPOLATE_ALPHA = SimpleOption.<Boolean>builder()
+        .comment("If the transparency should also blend between both outline colors")
+        .node("block-outline", "block-outline-interpolate-alpha").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the exact block bounding box should be used, this comes at a slight performance cost.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_ACCURATE = SimpleOption.<Boolean>builder()
+        .comment("If the exact block bounding box should be used, this comes at a slight performance cost")
+        .node("block-outline", "block-outline-accurate").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the outline colors should travel through the block.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_TRAVERSAL = SimpleOption.<Boolean>builder()
+        .comment("If the outline colors should travel through the block")
+        .node("block-outline", "block-outline-traversal").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.0.9
+     */
+    public static final NumberOption<Float> BLOCK_OUTLINE_TRAVERSAL_SPEED = NumberOption.<Float>number()
+        .node("block-outline", "block-outline-traversal-speed").type(TypeToken.get(Float.class))
+        .min(0.15F).max(5.0F)
         .notifyClient()
         .build();
 
@@ -87,12 +143,112 @@ public final class ModBlockOutline {
         .build();
 
     /**
-     * No documentation available.
+     * Primary block overlay color.
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Boolean> BLOCK_OUTLINE = SimpleOption.<Boolean>builder()
-        .node("block-outline", "block-outline").type(TypeToken.get(Boolean.class))
+    public static final SimpleOption<Color> BLOCK_OVERLAY_COLOR = SimpleOption.<Color>builder()
+        .comment("Primary block overlay color")
+        .node("block-outline", "block-overlay-color").type(TypeToken.get(Color.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * Secondary block overlay color.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Color> BLOCK_OVERLAY_COLOR_END = SimpleOption.<Color>builder()
+        .comment("Secondary block overlay color")
+        .node("block-outline", "block-overlay-color-end").type(TypeToken.get(Color.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the transparency should also blend between both overlay colors.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OVERLAY_INTERPOLATE_ALPHA = SimpleOption.<Boolean>builder()
+        .comment("If the transparency should also blend between both overlay colors")
+        .node("block-outline", "block-overlay-interpolate-alpha").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the exact block bounding box should be used, this comes at a slight performance cost.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OVERLAY_ACCURATE = SimpleOption.<Boolean>builder()
+        .comment("If the exact block bounding box should be used, this comes at a slight performance cost")
+        .node("block-outline", "block-overlay-accurate").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If the overlay colors should travel through the block.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OVERLAY_TRAVERSAL = SimpleOption.<Boolean>builder()
+        .comment("If the overlay colors should travel through the block")
+        .node("block-outline", "block-overlay-traversal").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.0.9
+     */
+    public static final NumberOption<Float> BLOCK_OVERLAY_TRAVERSAL_SPEED = NumberOption.<Float>number()
+        .node("block-outline", "block-overlay-traversal-speed").type(TypeToken.get(Float.class))
+        .min(0.15F).max(5.0F)
+        .notifyClient()
+        .build();
+
+    /**
+     * If only a single side of the block should have outlines.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_SIDE = SimpleOption.<Boolean>builder()
+        .comment("If only a single side of the block should have outlines")
+        .node("block-outline", "block-outline-side").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If using hide foliage, should outlines still show on foliage.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_SHOW_HIDDEN_FOLIAGE = SimpleOption.<Boolean>builder()
+        .comment("If using hide foliage, should outlines still show on foliage")
+        .node("block-outline", "block-outline-show-hidden-foliage").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If blocks that connect together should share an outline.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> BLOCK_OUTLINE_MULTI_BLOCK = SimpleOption.<Boolean>builder()
+        .comment("If blocks that connect together should share an outline")
+        .node("block-outline", "block-outline-multi-block").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * If outlines should be visible in spectator mode.
+     *
+     * @since 1.0.9
+     */
+    public static final SimpleOption<Boolean> SHOW_IN_SPECTATOR = SimpleOption.<Boolean>builder()
+        .comment("If outlines should be visible in spectator mode")
+        .node("block-outline", "show-in-spectator").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
 

diff --git a/api/src/main/java/com/lunarclient/apollo/mods/impl/ModClock.java b/api/src/main/java/com/lunarclient/apollo/mods/impl/ModClock.java
@@ -56,16 +56,6 @@ public final class ModClock {
         .notifyClient()
         .build();
 
-    /**
-     * No documentation available.
-     *
-     * @since 1.0.0
-     */
-    public static final SimpleOption<Boolean> MILITARY_TIME = SimpleOption.<Boolean>builder()
-        .node("clock", "military-time").type(TypeToken.get(Boolean.class))
-        .notifyClient()
-        .build();
-
     /**
      * No documentation available.
      *
@@ -180,6 +170,16 @@ public final class ModClock {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.0.0
+     */
+    public static final SimpleOption<Boolean> MILITARY_TIME = SimpleOption.<Boolean>builder()
+        .node("clock", "military-time").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     private ModClock() {
     }
Status:	✅ Completed
Environment:	`preview`
URL:	https://b6219ee5.lunarclient-dev.pages.dev