Merge pull request #4 from j10a1n15/beta

a

CHANGELOG.md

@@ -69,6 +69,8 @@
       color, to change the time alive, and the line width.
 + Added the option to change Hypixel Wiki to the fandom Wiki in more areas than just the /wiki command. - Erymanthus
     + E.g. inside the SkyBlock leveling guide.
++ Added Chat **Translator** - NetheriteMiner
+    + After enabling, click on any chat message sent by another player to translate it to English.
 
 #### Events
 
@@ -120,6 +122,13 @@
 + Removed armor stand checks for Trevor Solver. This fixes or nerfs the feature to not highlight mobs behind blocks sometimes. - hannibal2
 + Added diamond and gold essence support to PowderTracker. - walker
 + Change the fandom wiki search engine (under the /wiki command) from Google to the fandom wiki's built-in search engine - Erymanthus
++ Added option to hide Chest Value while the Estimated Item Value display is showing. - hannibal2
++ No longer merging same items with different prices in Chest Value together. - hannibal2
++ Adding Great Spook support for Non God Pot Effect display. - hannibal2
++ Added a title warning to the Worm Cap Alert ping sound. - Vahvl
++ Added support for detecting refreshed farming fortune century cake effect. - alexia
++ Show key to press below burrow warp. - hannibal2
++ Makes the Compact Potion message open the Potion effects menu on click. - jani
 
 ### Bug Fixes
 
@@ -172,6 +181,16 @@
 + Fixed Enderman Slayer errors again. - hannibal2
 + Fixed the Sack Display error again. - HiZe
 + Fixed the attribute Vitality getting wrongly labeled as Mending on attribute shards. - hannibal2
++ Made Livid Solver great again. - hannibal2
++ Fixed Damage Indicator in Dungeons for some floors. - hannibal2
++ Fixed Damage Indicator "hide nametag" feature works even for disabled mobs. - hannibal2
++ Fixed item rarity detection for pets. - hannibal2
++ Fixed rare error message while disconnecting. - Thunderblade73
++ Disabled the Daily Quest part of the Reputation Helper during the great spook. - hannibal2
++ Fixed Diana warp key not working. - hannibal2
++ SkyHanni Keybinds no longer work inside SkyHanni config. - hannibal2
++ Fixed Great Spook potion not working in Non God Pot Effect feature. - jani
++ Fixed wrong Rhys (Deep Caverns NPC) items needed for Dwarven Mines unlock in Bingo Step Helper. - ReyMaratov
 
 #### Config
 
@@ -192,6 +211,11 @@
 + Reducing cognitive complexity in StatsTuning.kt - walker
 + Reducing indentations and line counts in StatsTuning.kt - hannibal2
 + Mark functions around item utils and neu items as deprecated. - walker
++ Added debug command /shconfigmanagerreset. - hannibal2
++ Reloads the config manager and rendering processors of MoulConfig. This WILL RESET your config, but also update the
+  java config files (names, description, orderings and stuff).
++ Adding 100 lines to MobFinder.kt and making it better readable in the process. - walker
++ Making ChatFiler.kt way better, storing regex objects for reuse and preparing future repo support. - walker
 
 ## Version 0.20
 
@@ -237,8 +261,6 @@
     + Option to send local contest data to elitebot.dev at the start of the new SkyBlock year.
 + Added SkyHanni **Installer** - NetheriteMiner
     + Double-clicking the mod jar file will open a window that asks you where to move the mod into.
-+ Added Chat **Translator** - NetheriteMiner
-    + After enabling, click on any chat message sent by another player to translate it to English.
 + Show the progress bar until maxed crop milestone in the crop milestone inventory. - hannibal2
 + Show a line to the enderman slayer beacon. - hannibal2
 + Added **Default Option Settings:** - nea

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.21.Beta.14"
+version = "0.21.Beta.16"
 
 // Toolchains:
 java {

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt

@@ -321,7 +321,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.21.Beta.14",
+    version = "0.21.Beta.16",
 )
 class SkyHanniMod {
     @Mod.EventHandler

src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java

@@ -159,10 +159,23 @@ public static class ChatSymbols {
     //TODO jawbus + thunder
 
     @Expose
-    @ConfigOption(name = "Compact Potion Message", desc = "Shorten chat messages about player potion effects.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean compactPotionMessage = true;
+    @ConfigOption(name = "Compact Potion Messages", desc = "")
+    @Accordion
+    public CompactPotionConfig compactPotionMessages = new CompactPotionConfig();
+
+    public static class CompactPotionConfig {
+
+        @Expose
+        @ConfigOption(name = "Enabled", desc = "Shorten chat messages about player potion effects.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean enabled = true;
+
+        @Expose
+        @ConfigOption(name = "Clickable Chat Message", desc = "Makes the Compact Potion message open the Potion effects menu on click.")
+        @ConfigEditorBoolean
+        public boolean clickableChatMessage = true;
+    }
 
     @Expose
     @ConfigOption(name = "Compact Bestiary Message", desc = "Shorten the Bestiary level up message, showing additional information when hovering.")

src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java

@@ -141,7 +141,7 @@ public static class BarnTimerConfig {
         @Expose
         @ConfigOption(
                 name = "Worm Cap Alert",
-                desc = "Alerts you with sound if you hit the Worm Sea Creature limit of 60."
+                desc = "Alerts you with title and sound if you hit the Worm Sea Creature limit of 60."
         )
         @ConfigEditorBoolean
         public boolean wormLimitAlert = true;

src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java

@@ -241,13 +241,11 @@ public static class ChestValueConfig {
         @Expose
         @ConfigOption(name = "Enabled in dungeons", desc = "Enable the feature in dungeons.")
         @ConfigEditorBoolean
-        @FeatureToggle
         public boolean enableInDungeons = false;
 
         @Expose
         @ConfigOption(name = "Enable during Item Value", desc = "Show this display even if the Estimated Item Value is visible.")
         @ConfigEditorBoolean
-        @FeatureToggle
         public boolean showDuringEstimatedItemValue = false;
 
         @Expose

src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt

@@ -36,7 +36,7 @@ class BingoNextStepHelper {
     private val collectionPattern = "Reach (?<amount>[0-9]+(?:,\\d+)*) (?<name>.*) Collection\\.".toPattern()
     private val crystalPattern = "Obtain a (?<name>\\w+) Crystal in the Crystal Hollows\\.".toPattern()
     private val skillPattern = "Obtain level (?<level>.*) in the (?<skill>.*) Skill.".toPattern()
-    private val rhysTaskName = "30x Enchanted Redstone (for Rhys)"
+    private val rhysTaskName = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)"
 
     companion object {
         private val finalSteps = mutableListOf<NextStep>()
@@ -303,6 +303,8 @@ class BingoNextStepHelper {
 
         itemIslandRequired["Acacia Wood"] = IslandType.THE_PARK.getStep()
         itemIslandRequired["Redstone"] = IslandType.DEEP_CAVERNS.getStep()
+        itemIslandRequired["Lapis Lazuli"] = IslandType.DEEP_CAVERNS.getStep()
+        itemIslandRequired["Coal"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Slimeball"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Emerald"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Mithril"] = IslandType.DEEP_CAVERNS.getStep()
@@ -313,15 +315,7 @@ class BingoNextStepHelper {
         IslandType.DEEP_CAVERNS.getStep() requires IslandType.GOLD_MINES.getStep()
         IslandType.DEEP_CAVERNS.getStep() requires SkillLevelStep("Mining", 5)
 
-        val redstoneForThys = PartialProgressItemsStep(
-            rhysTaskName,
-            "Redstone",
-            160 * 10 * 3,
-            mapOf("Redstone" to 1, "Enchanted Redstone" to 160)
-        )
-        redstoneForThys requires IslandType.DEEP_CAVERNS.getStep()
-
-        IslandType.DWARVEN_MINES.getStep() requires redstoneForThys
+        rhys()
         IslandType.DWARVEN_MINES.getStep() requires SkillLevelStep(
             "Mining",
             12
@@ -347,6 +341,37 @@ class BingoNextStepHelper {
 //        compactor(7)
     }
 
+    private fun rhys() {
+        val redstoneForRhys = PartialProgressItemsStep(
+            rhysTaskName,
+            "Redstone",
+            160 * 10,
+            mapOf("Redstone" to 1, "Enchanted Redstone" to 160)
+        )
+        redstoneForRhys requires IslandType.DEEP_CAVERNS.getStep()
+
+        val lapisForRhys = PartialProgressItemsStep(
+            rhysTaskName,
+            "Lapis Lazuli",
+            160 * 10,
+            mapOf("Lapis Lazuli" to 1, "Enchanted Lapis Lazuli" to 160)
+        )
+        lapisForRhys requires IslandType.DEEP_CAVERNS.getStep()
+
+        val coalForRhys = PartialProgressItemsStep(
+            rhysTaskName,
+            "Coal",
+            160 * 10,
+            mapOf("Coal" to 1, "Enchanted Coal" to 160)
+        )
+        coalForRhys requires IslandType.DEEP_CAVERNS.getStep()
+
+        val mines = IslandType.DWARVEN_MINES.getStep()
+        mines requires redstoneForRhys
+        mines requires lapisForRhys
+        mines requires coalForRhys
+    }
+
     private fun compactor(amount: Long) {
         val compactorForMinions = ItemsStep(
             "Compactor (for Minions)",