Merge remote-tracking branch 'origin/item-stack-size' into item-stack…

…-size

.github/workflows/generate-constants.yaml

@@ -37,7 +37,8 @@ jobs:
         runs-on: ubuntu-latest
         needs: regexes
         name: "Publish regexes"
-        if: ${{ 'push' == github.event_name && 'beta' == github.ref_name }}
+        # 511310721 is the Repository ID for SkyHanni
+        if: ${{ 'push' == github.event_name && 'beta' == github.ref_name && '511310721' == github.repository_id }}
         steps:
             -   uses: actions/checkout@v3
                 with:

CHANGELOG.md

@@ -48,6 +48,9 @@
 + Added 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.
++ Jyrre Timer for Bottle of Jyrre. - walker
+    + A timer showing the remaining duration of your intelligence boost.
+    + Option to show the timer when inactive rather than removing it.
 
 #### Bingo Features
 
@@ -58,6 +61,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 +76,11 @@
 
 + Hide the repeating fire sale reminder chat messages. - hannibal2
 
+
+#### Event Features
+
++ Added Waypoints for 2023 Lobby Presents. - walker
+
 ### Changes
 
 #### Garden Changes
@@ -89,6 +98,11 @@
 + 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
++ Display Farming Fortune reduction from pests on the HUD. - alexia
++ Allow showing optimal speed warning without HUD enabled. - alexia
 
 #### Fishing Changes
 
@@ -102,12 +116,23 @@
 
 + 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
++ Option to change the color of Marked Players in chat and in the world. - walker & hannibal2
++ Added support for the new item rarity "Ultimate Cosmetic". - hannibal2
++ Hide "Winter Island Close" timer during the month of December. - hannibal2
 
 ### Fixes
 
@@ -125,26 +150,42 @@
 + 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
++ Fixed an error message in the composter inventory when hovering over some items.- hannibal2
++ Correctly load the plot names of locked plots from inventory. - hannibal2
++ Fixed the boosted crop not being highlighted during contest participation. - alexia
 
 #### 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
++ Fixed showing the Minion XP display in the Bazaar. - Thunderblade73
++ Fixed the city project time remaining "soon!" error. - hannibal2
++ Fixed Slayer Profit Tracker display and price problems with Wisp's Ice Flavored Water Potion. - hannibal2
++ Fixed an error message when closing the wheat minion in the Hub. - Thunderblade73
 
 #### Config Fixes
 
@@ -178,6 +219,18 @@
 + 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
++ Added WorldEdit region selection preview support. - nea
+  + Command /shworldedit and rigth/left clicking with a wood axe work.
++ Fixed error message in the "/shconfig set" command. - Thunderblade73
++ Add a check for the SkyHanni repository ID in publish. - walker
++ Cleanup getItemsInOpenChest. - walker
++ Changed MinionCraftHelper to use NeuInternalName. - walker
++ Added a separate debug hotkey for Bypass Advanced Tab List. - 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,10 @@ 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
++ Jyrre Timer for Bottle of Jyrre. - walker
+  + A timer showing the remaining duration of your intelligence boost.
+  + Option to show the timer when inactive rather than removing it.
 </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.10"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()

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

@@ -113,7 +113,10 @@ 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.JyrreTimer
 import at.hannibal2.skyhanni.features.event.winter.UniqueGiftCounter
 import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder
 import at.hannibal2.skyhanni.features.fame.CityProjectFeatures
@@ -213,7 +216,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.HighlightMiningCommissionMobs
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore
@@ -316,6 +318,7 @@ import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerFirePitsWarning
 import at.hannibal2.skyhanni.features.slayer.blaze.HellionShieldHelper
 import at.hannibal2.skyhanni.features.slayer.enderman.EndermanSlayerFeatures
 import at.hannibal2.skyhanni.features.slayer.enderman.EndermanSlayerHideParticles
+import at.hannibal2.skyhanni.features.stranded.HighlightPlaceableNpcs
 import at.hannibal2.skyhanni.features.summonings.SummoningMobManager
 import at.hannibal2.skyhanni.features.summonings.SummoningSoulsName
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
@@ -330,6 +333,7 @@ import at.hannibal2.skyhanni.test.TestCopyBestiaryValues
 import at.hannibal2.skyhanni.test.TestCopyRngMeterValues
 import at.hannibal2.skyhanni.test.TestExportTools
 import at.hannibal2.skyhanni.test.TestShowSlotNumber
+import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
 import at.hannibal2.skyhanni.utils.EntityOutlineRenderer
 import at.hannibal2.skyhanni.utils.KeyboardManager
@@ -358,7 +362,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.10",
 )
 class SkyHanniMod {
     @Mod.EventHandler
@@ -685,6 +689,9 @@ class SkyHanniMod {
         loadModule(PestSpawnTimer)
         loadModule(PestFinder())
         loadModule(SprayFeatures())
+        loadModule(HighlightPlaceableNpcs())
+        loadModule(PresentWaypoints())
+        loadModule(JyrreTimer())
 
         init()
 
@@ -700,6 +707,7 @@ class SkyHanniMod {
         loadModule(ParkourWaypointSaver())
         loadModule(TestShowSlotNumber())
         loadModule(SkyHanniDebugsAndTests)
+        loadModule(WorldEdit)
         loadModule(HotSwapDetection)
         PreInitFinishedEvent().postAndCatch()
     }

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 = 14
     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/Features.java

@@ -12,8 +12,8 @@
 import at.hannibal2.skyhanni.config.features.dungeon.DungeonConfig;
 import at.hannibal2.skyhanni.config.features.event.EventConfig;
 import at.hannibal2.skyhanni.config.features.fishing.FishingConfig;
-import at.hannibal2.skyhanni.config.features.gui.GUIConfig;
 import at.hannibal2.skyhanni.config.features.garden.GardenConfig;
+import at.hannibal2.skyhanni.config.features.gui.GUIConfig;
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig;
 import at.hannibal2.skyhanni.config.features.itemability.ItemAbilityConfig;
 import at.hannibal2.skyhanni.config.features.markedplayer.MarkedPlayerConfig;
@@ -22,6 +22,7 @@
 import at.hannibal2.skyhanni.config.features.misc.MiscConfig;
 import at.hannibal2.skyhanni.config.features.rift.RiftConfig;
 import at.hannibal2.skyhanni.config.features.slayer.SlayerConfig;
+import at.hannibal2.skyhanni.config.features.stranded.StrandedConfig;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.Config;
 import io.github.moulberry.moulconfig.Social;
@@ -137,6 +138,10 @@ public String getTitle() {
     @Category(name = "Slayer", desc = "Slayer features.")
     public SlayerConfig slayer = new SlayerConfig();
 
+    @Expose
+    @Category(name = "Stranded", desc = "Features for the Stranded game mode.")
+    public StrandedConfig stranded = new StrandedConfig();
+
     @Expose
     @Category(name = "The Rift", desc = "Features for The Rift dimension.")
     public RiftConfig rift = new RiftConfig();

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;
@@ -92,6 +93,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 {
@@ -113,9 +125,9 @@ public static class MinionConfig {
             @Override
             public String toString() {
                 return "MinionConfig{" +
-                    "displayName='" + displayName + '\'' +
-                    ", lastClicked=" + lastClicked +
-                    '}';
+                        "displayName='" + displayName + '\'' +
+                        ", lastClicked=" + lastClicked +
+                        '}';
             }
         }
 
@@ -367,11 +379,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

@@ -46,6 +46,7 @@ import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
 import at.hannibal2.skyhanni.test.TestBingo
+import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyItemCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
@@ -174,9 +175,18 @@ object Commands {
             "shresetendernodetracker",
             "Resets the Ender Node Tracker"
         ) { EnderNodeTracker.resetCommand(it) }
-        registerCommand("shresetarmordroptracker", "Resets the Armor Drop Tracker") { ArmorDropTracker.resetCommand(it) }
-        registerCommand("shresetfrozentreasuretracker", "Resets the Frozen Treasure Tracker") { FrozenTreasureTracker.resetCommand(it) }
-        registerCommand("shresetfishingtracker", "Resets the Frozen Treasure Tracker") { FishingProfitTracker.resetCommand(it) }
+        registerCommand(
+            "shresetarmordroptracker",
+            "Resets the Armor Drop Tracker"
+        ) { ArmorDropTracker.resetCommand(it) }
+        registerCommand(
+            "shresetfrozentreasuretracker",
+            "Resets the Frozen Treasure Tracker"
+        ) { FrozenTreasureTracker.resetCommand(it) }
+        registerCommand(
+            "shresetfishingtracker",
+            "Resets the Frozen Treasure Tracker"
+        ) { FishingProfitTracker.resetCommand(it) }
         registerCommand("shbingotoggle", "Toggle the bingo card display mode") { BingoCardDisplay.toggleCommand() }
         registerCommand(
             "shfarmingprofile",
@@ -216,7 +226,11 @@ object Commands {
         registerCommand(
             "shwhereami",
             "Print current island in chat"
-        ) { SkyHanniDebugsAndTests.whereami() }
+        ) { SkyHanniDebugsAndTests.whereAmI() }
+        registerCommand(
+            "shclearcontestdata",
+            "Resets Jacob's Contest Data"
+        ) { SkyHanniDebugsAndTests.clearContestData() }
         registerCommand(
             "shconfig",
             "Search or reset config elements §c(warning, dangerous!)"
@@ -260,6 +274,11 @@ object Commands {
         registerCommand("shtestinquisitor", "dev command") { InquisitorWaypointShare.test() }
         registerCommand("shshowcropmoneycalculation", "dev command") { CropMoneyDisplay.toggleShowCalculation() }
         registerCommand("shcropspeedmeter", "Debugs how many crops you collect over time") { CropSpeedMeter.toggle() }
+        registerCommand0(
+            "shworldedit",
+            "Select regions in the world",
+            { WorldEdit.command(it) },
+            { listOf("copy", "reset", "help", "left", "right") })
         registerCommand(
             "shconfigsave",
             "Manually saving the config"
@@ -418,6 +437,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/dev/DebugConfig.java

@@ -91,4 +91,9 @@ public class DebugConfig {
         "show the total amount in console output.")
     @ConfigEditorBoolean
     public boolean eventCounter = false;
+
+    @Expose
+    @ConfigOption(name = "Bypass Advanced Tab List", desc = "The Advaced Player Tab list is disabled whie pressing this hotkey.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int bypassAdvancedPlayerTabList = Keyboard.KEY_NONE;
 }