Merge branch 'version/1.1.9' into bump/1.1.9

Author: ItsNature

.checkstyle/suppressions.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "http://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
     <!-- don't require javadocs on platform modules -->
-    <suppress files="bukkit-example-(api|json|proto|common)[\\/]src[\\/]main[\\/]java[\\/].*" checks="(FilteringWriteTag|MissingJavadoc.*)"/>
+    <suppress files="example[\\/]bukkit[\\/](api|json|proto|common)[\\/]src[\\/]main[\\/]java[\\/].*" checks="(FilteringWriteTag|MissingJavadoc.*)"/>
 
     <!-- ignore illegal import in loader -->
     <suppress files="extra[\\/]loader[\\/]src[\\/]main[\\/]java[\\/].*" checks="(IllegalImport)"/>

api/build.gradle.kts

@@ -7,7 +7,7 @@ setupPlatforms()
 
 setupPlatformDependency("bukkit", "bukkitJar")
 setupPlatformDependency("bungee", "bungeeJar")
-setupPlatformDependency("velocity", "velocityJar")
+setupPlatformDependency("velocity", "velocityJar", 17)
 setupPlatformDependency("folia", "foliaJar", 21)
 
 val main by sourceSets

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

@@ -53,10 +53,12 @@
 import com.lunarclient.apollo.mods.impl.ModHurtCam;
 import com.lunarclient.apollo.mods.impl.ModHypixelBedwars;
 import com.lunarclient.apollo.mods.impl.ModHypixelMod;
+import com.lunarclient.apollo.mods.impl.ModInventoryMod;
 import com.lunarclient.apollo.mods.impl.ModItemCounter;
 import com.lunarclient.apollo.mods.impl.ModItemPhysics;
 import com.lunarclient.apollo.mods.impl.ModItemTracker;
 import com.lunarclient.apollo.mods.impl.ModKeystrokes;
+import com.lunarclient.apollo.mods.impl.ModKillSounds;
 import com.lunarclient.apollo.mods.impl.ModLighting;
 import com.lunarclient.apollo.mods.impl.ModMemory;
 import com.lunarclient.apollo.mods.impl.ModMenuBlur;
@@ -93,10 +95,12 @@
 import com.lunarclient.apollo.mods.impl.ModStopwatch;
 import com.lunarclient.apollo.mods.impl.ModTab;
 import com.lunarclient.apollo.mods.impl.ModTeamView;
+import com.lunarclient.apollo.mods.impl.ModTierTagger;
 import com.lunarclient.apollo.mods.impl.ModTimeChanger;
 import com.lunarclient.apollo.mods.impl.ModTitles;
 import com.lunarclient.apollo.mods.impl.ModTntCountdown;
 import com.lunarclient.apollo.mods.impl.ModToggleSneak;
+import com.lunarclient.apollo.mods.impl.ModTotemCounter;
 import com.lunarclient.apollo.mods.impl.ModUhcOverlay;
 import com.lunarclient.apollo.mods.impl.ModWaila;
 import com.lunarclient.apollo.mods.impl.ModWaypoints;
@@ -178,6 +182,7 @@ public final class Mods {
             ModAutoTextHotkey.class,
             ModAutoTextActions.class,
             ModMumbleLink.class,
+            ModTotemCounter.class,
             Mod2dItems.class,
             ModBossbar.class,
             ModFreelook.class,
@@ -195,9 +200,12 @@ public final class Mods {
             ModWaila.class,
             ModNeu.class,
             ModHurtCam.class,
+            ModTierTagger.class,
             ModDamageTint.class,
             ModSkyblock.class,
             ModHorseStats.class,
+            ModKillSounds.class,
+            ModInventoryMod.class,
             ModRadio.class
         );
 

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

@@ -55,6 +55,16 @@ public final class Mod3dSkins {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> SHOW_OTHERS = SimpleOption.<Boolean>builder()
+        .node("3d-skins", "show-others").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     /**
      * No documentation available.
      *
@@ -148,6 +158,17 @@ public final class Mod3dSkins {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final NumberOption<Float> FIRST_PERSON_VOXEL_SIZE = NumberOption.<Float>number()
+        .node("3d-skins", "first-person-voxel-size").type(TypeToken.get(Float.class))
+        .min(1.001F).max(1.3F)
+        .notifyClient()
+        .build();
+
     /**
      * No documentation available.
      *

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

@@ -66,6 +66,16 @@ public final class ModArmorstatus {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
+        .node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     /**
      * No documentation available.
      *

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

@@ -43,6 +43,17 @@ public final class ModAutoTextHotkey {
         .notifyClient()
         .build();
 
+    /**
+     * Displays a notification when an input is blocked by the server.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> NOTIFY_ON_BLOCKED_INPUT = SimpleOption.<Boolean>builder()
+        .comment("Displays a notification when an input is blocked by the server")
+        .node("auto-text-hotkey", "notify-on-blocked-input").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     private ModAutoTextHotkey() {
     }
 

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

@@ -55,6 +55,26 @@ public final class ModChat {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> MODERN_CHAT_LENGTH_HYPIXEL = SimpleOption.<Boolean>builder()
+        .node("chat", "modern-chat-length-hypixel").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> LONG_CHAT_SINGLEPLAYER = SimpleOption.<Boolean>builder()
+        .node("chat", "long-chat-singleplayer").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     /**
      * Choose whether or not you want to stack multiple of the same messages in chat.
      *
@@ -183,12 +203,12 @@ public final class ModChat {
         .build();
 
     /**
-     * Displays a preview of an image when hovering over it.
+     * Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.
      *
      * @since 1.1.3
      */
     public static final SimpleOption<Boolean> HOVER_IMAGE_PREVIEW = SimpleOption.<Boolean>builder()
-        .comment("Displays a preview of an image when hovering over it.")
+        .comment("Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.")
         .node("chat", "hover-image-preview").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
@@ -217,6 +237,17 @@ public final class ModChat {
         .notifyClient()
         .build();
 
+    /**
+     * When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> FULLSCREEN_IMAGE = SimpleOption.<Boolean>builder()
+        .comment("When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%")
+        .node("chat", "fullscreen-image").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     /**
      * No documentation available.
      *
@@ -238,6 +269,56 @@ public final class ModChat {
         .notifyClient()
         .build();
 
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> CHAT_NAME_BOLD = SimpleOption.<Boolean>builder()
+        .node("chat", "chat-name-bold").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> CHAT_NAME_ITALIC = SimpleOption.<Boolean>builder()
+        .node("chat", "chat-name-italic").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> CHAT_NAME_UNDERLINE = SimpleOption.<Boolean>builder()
+        .node("chat", "chat-name-underline").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> CHAT_NAME_STRIKETHROUGH = SimpleOption.<Boolean>builder()
+        .node("chat", "chat-name-strikethrough").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> CHAT_NAME_OBFUSCATED = SimpleOption.<Boolean>builder()
+        .node("chat", "chat-name-obfuscated").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
     /**
      * No documentation available.
      *

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

@@ -124,8 +124,8 @@ public final class ModDirectionHud {
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
-        .node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
+    public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
+        .node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
 
@@ -134,8 +134,8 @@ public final class ModDirectionHud {
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
-        .node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
+    public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
+        .node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
 
@@ -144,8 +144,19 @@ public final class ModDirectionHud {
      *
      * @since 1.0.0
      */
-    public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
-        .node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
+    public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
+        .node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * Choose whether to show the Direction HUD when TAB is open.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> SHOW_WITH_TAB = SimpleOption.<Boolean>builder()
+        .comment("Choose whether to show the Direction HUD when TAB is open.")
+        .node("direction-hud", "show-with-tab").type(TypeToken.get(Boolean.class))
         .notifyClient()
         .build();
 

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

@@ -0,0 +1,72 @@
+/*
+ * This file is part of Apollo, licensed under the MIT License.
+ *
+ * Copyright (c) 2023 Moonsworth
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.lunarclient.apollo.mods.impl;
+
+import com.lunarclient.apollo.option.NumberOption;
+import com.lunarclient.apollo.option.SimpleOption;
+import io.leangen.geantyref.TypeToken;
+
+/**
+ * A collection of quality of life tweaks for the inventory.
+ *
+ * @since 1.1.9
+ */
+public final class ModInventoryMod {
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> ENABLED = SimpleOption.<Boolean>builder()
+        .node("inventory-mod", "enabled").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * Useful for navigating inventory menus on servers.
+     *
+     * @since 1.1.9
+     */
+    public static final SimpleOption<Boolean> DONT_RESET_CURSOR = SimpleOption.<Boolean>builder()
+        .comment("Useful for navigating inventory menus on servers.")
+        .node("inventory-mod", "dont-reset-cursor").type(TypeToken.get(Boolean.class))
+        .notifyClient()
+        .build();
+
+    /**
+     * No documentation available.
+     *
+     * @since 1.1.9
+     */
+    public static final NumberOption<Float> RESET_CURSOR_TIMEOUT = NumberOption.<Float>number()
+        .node("inventory-mod", "reset-cursor-timeout").type(TypeToken.get(Float.class))
+        .min(0.1F).max(5.0F)
+        .notifyClient()
+        .build();
+
+    private ModInventoryMod() {
+    }
+
+}