Merge remote-tracking branch 'origin/backend/command-register-event' …

…into backend/command-register-event

build.gradle.kts

@@ -171,6 +171,9 @@ dependencies {
 
     implementation("net.hypixel:mod-api:0.3.1")
 
+    // getting clock offset
+    shadowImpl("commons-net:commons-net:3.8.0")
+
     detektPlugins("org.notenoughupdates:detektrules:1.0.0")
     detektPlugins(project(":detekt"))
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
@@ -279,6 +282,7 @@ tasks.shadowJar {
     relocate("io.github.notenoughupdates.moulconfig", "at.hannibal2.skyhanni.deps.moulconfig")
     relocate("moe.nea.libautoupdate", "at.hannibal2.skyhanni.deps.libautoupdate")
     relocate("com.jagrosh.discordipc", "at.hannibal2.skyhanni.deps.discordipc")
+    relocate("org.apache.commons.net", "at.hannibal2.skyhanni.deps.commons.net")
 }
 tasks.jar {
     archiveClassifier.set("nodeps")

docs/CHANGELOG.md

@@ -24,6 +24,10 @@
 + Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
     + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
 + Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
++ Added a helper for tracking the Buttons Enigma Soul in the Rift. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+    + Using pathfinding to guide the player to the nearest spot with unpressed buttons and highlights them.
++ Added a route helper for Gunther's Rift Race in the West Village. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
++ Added the ability to mute Wilted Berberis sounds when not farming. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 #### Dungeon Features
 
@@ -178,6 +182,7 @@
 + Added an option to hide all tooltips inside the Fossil Excavator. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2579)
 + Added support for using the Pickobulus ability for the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2540)
 + Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
++ Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - luna (https://github.com/hannibal002/SkyHanni/pull/2633)
 
 #### Diana Improvements
 
@@ -250,11 +255,13 @@
     + Since the cactus knife now allows 500 max speed.
 + Made the waypoint to the middle of the plot for Pest Waypoint optional (off by default). - Luna (https://github.com/hannibal002/SkyHanni/pull/2469)
 + Reduced one click for supercrafting visitor materials by using `/viewrecipe` instead of `/recipe` when using the Shopping List button. - Miestiek (https://github.com/hannibal002/SkyHanni/pull/2505)
++ Added ignored crops for the Farming Lane feature. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2622)
 
 #### Rift Improvements
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
 + Added Path Finder to Enigma Soul waypoints in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2515)
++ Added the option to choose the color of the Living Metal Helper highlight. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 #### Dungeon Improvements
 
@@ -263,6 +270,7 @@
 #### The Carnival Improvements
 
 + Updated the Zombie Shootout Diamond color to be a deeper blue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2511)
++ Added a cooldown to the Carnival NPC Quickstart feature. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2628)
 
 #### Misc Improvements
 
@@ -276,6 +284,9 @@
 + Improved pathfinding. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2597)
     + The line to the target no longer jumps around as much.
     + Progress to the target now shows up in chat, displaying blocks remaining and percentage completed. Clicking on the chat message cancels the pathfinding.
++ Added a warning in chat when the computer's time is inaccurate, along with a tutorial on how to fix it. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
++ Improved the way pathfinding lines are rendered. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
++ Automatically starts pathfinding after clicking on SkyHanni reminder chat messages about Carnival Reminder, Hoppity NPC, City Project, and account/profile upgrades. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
 
 ### Fixes
 
@@ -288,6 +299,7 @@
 #### Bingo Fixes
 
 + Fixed "show bingo rank number" feature toggle not functioning. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2445)
++ Fixed Custom Scoreboard not showing Carnival Lines on Bingo. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2631)
 
 #### Inventory Fixes
 
@@ -313,6 +325,10 @@
     + Fixed `/shedittracker` support not functioning properly.
 + Fixed an issue where the item stack size on Diamond/Golden Heads and Master Skulls could be incorrect. - Fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2611)
 + Fixed item category detection for recombobulated items. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2608)
++ Fixed bugs in Superpair Data. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2566)
+    + Fixed pair detection.
+    + Fixed enchanting XP detection.
++ Fixed Minister in Calendar Perk description sometimes not using the gray color. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2632)
 
 #### Mining Fixes
 
@@ -338,6 +354,7 @@
 + Fixed "Mining Commissions Block Color" causing OptiFine connected textures not to connect properly. - nopo (https://github.com/hannibal002/SkyHanni/pull/2577)
 + Fixed the Mineshaft Pity Counter not working in the Great Glacite Lake. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2565)
 + Fixed Powder Tracker inaccuracies. - Empa (https://github.com/hannibal002/SkyHanni/pull/2591)
++ Fixed Jasper gemstones not being addressed in the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2618)
 
 #### Scoreboard Fixes
 
@@ -371,6 +388,7 @@
 + Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
 + Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 + Fixed inconsistencies in Hoppity Duplicate Number counts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2595)
++ Fixed Fish the Rabbit and El Dorado incorrectly counting as unique rabbits during Hoppity's Hunt. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2627)
 
 #### Chat Fixes
 
@@ -414,6 +432,10 @@
 
 + Fixed error messages while using the Chum Bucket Hider feature. - nea89 (https://github.com/hannibal002/SkyHanni/pull/2587)
 
+#### Rift Fixes
+
++ Fixed the Rift Timer pausing while in Gunther's Rift Race. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+
 #### Misc Fixes
 
 + Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
@@ -434,6 +456,9 @@
 + Fixed reforge display not working with new mining stats. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2555)
 + Fixed Totem of Corruption expiry warning not working in some cases. - Luna (https://github.com/hannibal002/SkyHanni/pull/2554)
 + Fixed a few typos in the config. - rdbt (https://github.com/hannibal002/SkyHanni/pull/2585)
++ Fixed Area Navigation distances to player being incorrect. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
++ Fixed item trackers displaying removed item names incorrectly. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2620)
++ Fixed some messages from Pablo NPC not being detected. - Luna (https://github.com/hannibal002/SkyHanni/pull/2636)
 
 ### Technical Details
 
@@ -503,6 +528,8 @@
 + Added Blossom Gradle plugin for token replacement in code. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2558)
     + `@MOD_VERSION@` is now a token that will be replaced.
 + Added `detekt` runner to the build process. - Daveed & nea (https://github.com/hannibal002/SkyHanni/pull/2547)
++ Added Clock Offset Millis using an NTP server. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
++ Added `EntityMovementData.onNextTeleport()` logic, which triggers a runnable after the world has changed or the player has teleported. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
 
 ### Removed Features
 

docs/FEATURES.md

@@ -841,6 +841,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
     + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
 + Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
++ Added a helper for tracking the Buttons Enigma Soul in the Rift. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+    + Using pathfinding to guide the player to the nearest spot with unpressed buttons and highlights them.
++ Added a route helper for Gunther's Rift Race in the West Village. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
++ Added the ability to mute Wilted Berberis sounds when not farming. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 </details>
 <details open><summary>

root.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.13"
+    version = "0.27.Beta.14"
     repositories {
         mavenCentral()
         mavenLocal()

src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java

@@ -334,4 +334,13 @@ public class MiscConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean userluckEnabled = true;
+
+    @Expose
+    @ConfigOption(name = "Computer Time Offset Warning",
+        desc = "Sends a Chat Warning if your computer time is not synchronized with the actual time.\n" +
+        "§cMaking sure your computer time is correct is important for SkyHanni to display times correctly."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean warnAboutPcTimeOffset = true;
 }

src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt

@@ -265,6 +265,7 @@ object IslandGraphs {
 
     private fun onCurrentPath(): Boolean {
         val path = fastestPath ?: return false
+        if (path.isEmpty()) return false
         val closest = path.nodes.minBy { it.position.distanceSqToPlayer() }
         val distance = closest.position.distanceToPlayer()
         if (distance > 7) return false
@@ -441,12 +442,14 @@ object IslandGraphs {
         if (label == "") return
         val path = fastestPath ?: return
         var distance = 0.0
-        for ((a, b) in path.zipWithNext()) {
-            distance += a.position.distance(b.position)
+        if (path.isNotEmpty()) {
+            for ((a, b) in path.zipWithNext()) {
+                distance += a.position.distance(b.position)
+            }
+            val distanceToPlayer = path.first().position.distanceToPlayer()
+            distance += distanceToPlayer
+            distance = distance.roundTo(1)
         }
-        val distanceToPlayer = path.first().position.distanceToPlayer()
-        distance += distanceToPlayer
-        distance = distance.roundTo(1)
 
         if (distance == lastDistance) return
         lastDistance = distance

src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt

@@ -97,11 +97,9 @@ object BroodmotherFeatures {
         // this is so that two messages aren't immediately sent upon joining a server
         if (!(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
             val duration = currentStage?.duration
-            val minutes = duration?.inWholeMinutes?.toInt() ?: 0
-            val pluralize = StringUtils.pluralize(minutes, "minute")
             var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
             if (duration != 0.minutes) {
-                message += " It will spawn §bwithin $duration $pluralize§e."
+                message += " It will spawn §bwithin $duration§e."
             }
             ChatUtils.chat(message)
             return true

src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt

@@ -101,7 +101,7 @@ object FlareDisplay {
                     }
                 }
             }
-            if (remainingTime !in 5.seconds..0.seconds) continue
+            if (remainingTime !in 0.seconds..5.seconds) continue
             val message = "$name §eexpires in: §b${remainingTime.inWholeSeconds}s"
             when (config.alertType) {
                 FlareConfig.AlertType.CHAT -> {