merge 0.22 beta 9

Author: martimavocado

CHANGELOG.md

@@ -58,6 +58,7 @@
 + Added the option to only show tier 1 Minion Crafts in the Helper display when their items needed are fully collected. - hannibal2
 + Added the option to click in the bingo card viewer on goals to mark them as highlighted. - hannibal2
   + If at least one goal is highlighted, non-highlighted goals will be hidden.
++ Send a chat message with the change of community goal percentages after opening the bingo card inventory. - hannibal2
 
 #### Inventory Features
 
@@ -72,6 +73,11 @@
 
 + Hide the repeating fire sale reminder chat messages. - hannibal2
 
+
+#### Event Features
+
++ Added Waypoints for 2023 Lobby Presents. - walker
+
 ### Changes
 
 #### Garden Changes
@@ -89,6 +95,9 @@
 + Highlight the boosted crop contest in all Jacob's Contest displays. - alexia
 + Added Delicate 5 to visitor drop counter and visitor block refuse and highlighter. - hannibal2
 + Block visitor interaction for dedication cycling is now disabled by default. - hannibal2
++ Added an option to only warn for specific crop contests. - Obsidian
++ Added an option to show plot borders for a given number of seconds after holding a vacuum. - HiZe
++ Added command /shclearcontestdata to Reset Jacob's Contest Data. - martimavocado
 
 #### Fishing Changes
 
@@ -102,12 +111,20 @@
 
 + Added fire sale messages in the hub to the chat message filter. - hannibal2
 + Added compact potion message support for splash messages and for Poisoned Candy I. - walker
++ Added "fire sale starting soon" message to fire sale chat hider. - hannibal2
 
 #### Bingo Changes
 
 + Option to remove the background difficulty color in the bingo card inventory when the goal is done. - hannibal2
 + Mark the background difficulty gray for unknown goals. - hannibal2
   + This is no longer needed as all 20 hidden goals are known now, but we now have this support for the next extreme bingo with hidden goals.
++ Added the community goal percentage to the bingo card display. - hannibal2
++ Saving minion craft helper crafted tier 1 minions and bingo card goals per bingo session/month. - hannibal2
+
+#### Misc Changes
+
++ Titles sent by SkyHanni look better now. - Cad
++ Added support for show XP gained from wheat minion in hub. - Thunderblade73
 
 ### Fixes
 
@@ -125,26 +142,35 @@
 + Fixed Mooshroom cow Perk display not showing when maxed. - hannibal2
 + Show a text around the new year that the calendar is not loaded for the next Jacob Contest. - hannibal2
 + Fixed visitor reward item refuse inconsistencies. - hannibal2
++ Fixed wrong base 100ff calculations in the farming fortune needed display. - alexia
++ Fixed showing Sprayanator plot grid overlay outside garden. - HiZe
 
 #### Bingo Fixes
 
 + Hide the long hint line in the Bingo Goal Display. - hannibal2
 + Show community goals in the Bingo Display correctly. - hannibal2
 + Hide enchanted tools in Minion Craft Helper. - hannibal2
++ Opening the bingo card will no longer crash the game sometimes. Showing an error message instead. - hannibal2
 
 #### Minion Fixes
 
 + Fixed Minion XP display not showing sometimes. - Thunderblade73
 + Updating the Minion XP display when the minion picks up a new item while inside the inventory. - hannibal2
 + Fixed minion features disappear inside the minion inventory when picking up an item. - hannibal2
 
+#### Fishing Fixes
+
++ Fixed Water Hydra warning showing up multiple times. - Cad
+
 #### Misc Fixes
 
 + Fixed Item Tracker not ignoring manual sack movements. - hannibal2
 + Fixed showing yourself green with Unique Gifting Opportunities. - hannibal2
 + Fixed NPC messages getting detected as player messages. - CalMWolfs
 + Hide Scavenger 5 on an Ice Spray Wand and Replenish on an Advanced Gardening Hoe/Axe for the Estimated Item Value. - hannibal2
 + Fixed an error when the king talisman helper does not find the king in range. - hannibal2
++ Fixed control/modifier key logic on Apple devices. - walker
++ Fixed lag spikes when downloading updates. - nea
 
 #### Config Fixes
 
@@ -178,6 +204,11 @@
 + Replaced ItemWarnEntry with VisitorReward. This should fix some errors. - hannibal2
 + GardenNextJacobContest now uses SimpleTimeMark. SimpleTimeMark is storable in the config and comparable - hannibal2
 + No longer sending contest data to elite close to new year. - hannibal2
++ Added RepoPatterns. - nea
++ Use LorenzToolTipEvent over ItemTooltipEvent if possible. - hannibal2
++ Added an abstract error message on LorenzToolTipEvent error. - hannibal2
++ Added test command /shsendtitle - Cad
++ Saving bingo goal data into the config. - hannibal2
 
 ## Version 0.21.1
 

FEATURES.md

@@ -349,6 +349,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Option to only show tier 1 Minion Crafts in the Helper display when their items needed are fully collected. - hannibal2
 + Added the option to click in the bingo card viewer on goals to mark them as highlighted. - hannibal2
   + If at least one goal is highlighted, non-highlighted goals will be hidden.
++ Send a chat message with the change of community goal percentages after opening the bingo card inventory. - hannibal2
 
 </details>
 <details open><summary>
@@ -640,6 +641,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Unique Gifted users counter. - hannibal2
   + Show in a display how many unique players you have given gifts to in the winter 2023 event.
   + Run command /opengenerowmenu to sync up.
++ Waypoints for 2023 Lobby Presents. - walker
 </details>
 <details open><summary>
 

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.22.Beta.8"
+version = "0.22.Beta.9"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()

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

@@ -113,6 +113,8 @@ import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare
 import at.hannibal2.skyhanni.features.event.diana.SoopyGuessBurrow
 import at.hannibal2.skyhanni.features.event.jerry.HighlightJerries
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker
+import at.hannibal2.skyhanni.features.event.lobby.waypoints.christmas.PresentWaypoints
+import at.hannibal2.skyhanni.features.event.lobby.waypoints.halloween.BasketWaypoints
 import at.hannibal2.skyhanni.features.event.spook.TheGreatSpook
 import at.hannibal2.skyhanni.features.event.winter.UniqueGiftCounter
 import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder
@@ -141,7 +143,6 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.GardenCropMilestoneFix
 import at.hannibal2.skyhanni.features.garden.GardenLevelDisplay
 import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest
-import at.hannibal2.skyhanni.features.garden.GardenOptimalDepthStrider
 import at.hannibal2.skyhanni.features.garden.GardenOptimalSpeed
 import at.hannibal2.skyhanni.features.garden.GardenPlotAPI
 import at.hannibal2.skyhanni.features.garden.GardenPlotBorders
@@ -205,8 +206,6 @@ import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayWaypoints
 import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer
 import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles
 import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown
-import at.hannibal2.skyhanni.features.mainlobby.halloweenwaypoints.BasketWaypoints
-import at.hannibal2.skyhanni.features.mining.SkymallDisplay
 import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore
@@ -227,7 +226,6 @@ import at.hannibal2.skyhanni.features.misc.InGameDateDisplay
 import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows
 import at.hannibal2.skyhanni.features.misc.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.LockMouseLook
-import at.hannibal2.skyhanni.features.misc.LowerMouseSens
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
 import at.hannibal2.skyhanni.features.misc.MiscFeatures
 import at.hannibal2.skyhanni.features.misc.MovementSpeedDisplay
@@ -352,7 +350,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.22.Beta.8",
+    version = "0.22.Beta.9",
 )
 class SkyHanniMod {
     @Mod.EventHandler
@@ -534,7 +532,6 @@ class SkyHanniMod {
         loadModule(GardenCustomKeybinds)
         loadModule(ChickenHeadTimer())
         loadModule(GardenOptimalSpeed())
-        loadModule(GardenOptimalDepthStrider())
         loadModule(GardenDeskInSBMenu())
         loadModule(GardenLevelDisplay())
         loadModule(FarmingWeightDisplay())
@@ -663,7 +660,6 @@ class SkyHanniMod {
         loadModule(ArrowTrail())
         loadModule(ShiftClickEquipment())
         loadModule(LockMouseLook)
-        loadModule(LowerMouseSens)
         loadModule(DungeonFinderFeatures())
         loadModule(PabloHelper())
         loadModule(FishingBaitWarnings())
@@ -672,7 +668,7 @@ class SkyHanniMod {
         loadModule(PestSpawnTimer)
         loadModule(PestFinder())
         loadModule(SprayFeatures())
-        loadModule(SkymallDisplay())
+        loadModule(PresentWaypoints())
 
         init()
 

src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt

@@ -9,7 +9,7 @@ import com.google.gson.JsonPrimitive
 
 object ConfigUpdaterMigrator {
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 12
+    const val CONFIG_VERSION = 13
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null

src/main/java/at/hannibal2/skyhanni/config/Storage.java

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.config;
 
 import at.hannibal2.skyhanni.data.model.ComposterUpgrade;
+import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal;
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker;
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostData;
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI;
@@ -95,6 +96,17 @@ public static class WinterStorage {
             public int amountGifted = 0;
         }
 
+        @Expose
+        public Map<Long, BingoSession> bingoSessions = new HashMap<>();
+
+        public static class BingoSession {
+
+            @Expose
+            public List<String> tierOneMinionsDone = new ArrayList<>();
+
+            @Expose
+            public Map<Integer, BingoGoal> goals = new HashMap<>();
+        }
     }
 
     public static class ProfileSpecific {
@@ -116,9 +128,9 @@ public static class MinionConfig {
             @Override
             public String toString() {
                 return "MinionConfig{" +
-                    "displayName='" + displayName + '\'' +
-                    ", lastClicked=" + lastClicked +
-                    '}';
+                        "displayName='" + displayName + '\'' +
+                        ", lastClicked=" + lastClicked +
+                        '}';
             }
         }
 
@@ -370,11 +382,11 @@ public static class SlayerRngMeterStorage {
             @Override
             public String toString() {
                 return "SlayerRngMeterStorage{" +
-                    "currentMeter=" + currentMeter +
-                    ", gainPerBoss=" + gainPerBoss +
-                    ", goalNeeded=" + goalNeeded +
-                    ", itemGoal='" + itemGoal + '\'' +
-                    '}';
+                        "currentMeter=" + currentMeter +
+                        ", gainPerBoss=" + gainPerBoss +
+                        ", goalNeeded=" + goalNeeded +
+                        ", itemGoal='" + itemGoal + '\'' +
+                        '}';
             }
         }
 

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt

@@ -422,6 +422,9 @@ object Commands {
     }
 
     private fun registerCommand(name: String, description: String, function: (Array<String>) -> Unit) {
+        if (commands.any { it.name.equals(name, ignoreCase = true) }) {
+            error("The command '$name is already registered!'")
+        }
         ClientCommandHandler.instance.registerCommand(SimpleCommand(name, createCommand(function)))
         commands.add(CommandInfo(name, description, currentCategory))
     }

src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java

@@ -2,6 +2,7 @@
 
 import at.hannibal2.skyhanni.config.features.event.bingo.BingoConfig;
 import at.hannibal2.skyhanni.config.features.event.diana.DianaConfig;
+import at.hannibal2.skyhanni.config.features.event.waypoints.LobbyWaypointsConfig;
 import at.hannibal2.skyhanni.config.features.event.winter.WinterConfig;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
@@ -43,9 +44,8 @@ public class EventConfig {
     @Expose
     public CenturyConfig century = new CenturyConfig();
 
+    @Category(name = "Lobby Waypoints", desc = "Lobby Event Waypoint settings")
     @Expose
-    @ConfigOption(name = "Main Lobby Halloween Basket Waypoints", desc = "")
-    @Accordion
-    public HalloweenBasketConfig halloweenBasket = new HalloweenBasketConfig();
+    public LobbyWaypointsConfig lobbyWaypoints = new LobbyWaypointsConfig();
 
 }

src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java

@@ -13,6 +13,7 @@ public class BingoCardConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean enabled = true;
+
     @Expose
     @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the Bingo Card or the step helper by sneaking with SkyBlock Menu in hand.")
     @ConfigEditorBoolean
@@ -52,4 +53,10 @@ public class BingoCardConfig {
     @ConfigOption(name = "Hide Difficulty When Done", desc = "Remove the background difficulty color in the bingo card inventory when the goal is done.")
     @ConfigEditorBoolean
     public boolean hideDoneDifficulty = true;
+
+    @Expose
+    @ConfigOption(name = "Community Percentages", desc = "Send a chat message with the change of community goal percentages after opening the bingo card inventory.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean communityGoalProgress = true;
 }

src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java

@@ -0,0 +1,25 @@
+package at.hannibal2.skyhanni.config.features.event.waypoints;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class ChristmasPresentConfig {
+
+    @Expose
+    @ConfigOption(name = "Present Waypoints", desc = "Show all Present waypoints")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean allWaypoints = false;
+
+    @Expose
+    @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints to .")
+    @ConfigEditorBoolean
+    public boolean allEntranceWaypoints = false;
+
+    @Expose
+    @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint")
+    @ConfigEditorBoolean
+    public boolean onlyClosest = false;
+}