Merge branch 'hannibal002:beta' into openInElitebotDotDev

CHANGELOG.md

@@ -18,6 +18,21 @@
 + Added Sea Creature Tracker. - hannibal2
     + Allows to only show single variants, e.g. water or lava or winter.
 
+#### Inventory Features
+
++ Added Power Stone Guide features. - hannibal2
+    + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
+      items in the Power Stone Guide.
++ Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
+
+#### Item Features
+
++ Lesser Orb of Healing Hider. - jani
+
+#### Chat Features
+
++ Add tab list fire sale advertisement hider. - nea
+
 ### Changes
 
 #### Garden Changes
@@ -29,6 +44,9 @@
 + Don't count Bountiful as a max reforge fortune on tools. - alexia
 + /shcroptime now supports k, m and b numbers. - DylanBruner
 + Only show the Garden Vacuum Bag on your own vacuums. - alexia
++ Jacob Contest feature now has clickable calendar open command when Elite API is not ready yet. - alexia
++ Mark carrot/pumpkin fortune as completed when giving to Carrolyn after already done. - alexia
++ Added ability to get unique visitors served without Green Thumb. - alexia
 
 #### Rift Changes
 
@@ -41,6 +59,7 @@
 #### Fishing Changes
 
 + Odger highlight feature tells in description that it is only useful for users without abiphone. - hannibal2
++ Added toggle to count double hook catches as two catches in Sea Creature Tracker. - hannibal2
 
 #### Mining Changes
 
@@ -60,6 +79,7 @@
 #### Dungeon Changes
 
 + Changed the description of the Dungeon Chat Filter feature to be more descriptive. - Wambo
++ Added options to change exactly what part of the Dungeon Chat Filter should be used. - Wambo
 
 #### Chat Changes
 
@@ -81,15 +101,21 @@
   hannibal2
 + Auto-fixing plots marked as pests when killing all pests without SkyHanni earlier. - hannibal2
 + Fixed error message that nearest pests cannot get removed properly. - hannibal2
++ Fixed grammar in Jacob Contest chat messages. - alexia
++ Fixed rarity error for items thrown around when using Sprayanator. - hannibal2
 
 #### Combat Fixes
 
 + Fixed corrupted Kada Knight getting detected as Revenant Slayer mini boss. - hannibal2
++ Fixed Daily Kuudra part of Crimson Isle Reputation Helper not detecting completed runs. - hannibal2
++ Fixed wrong calculation when zero bosses killed in slayer profit trackers. - hannibal2
++ Hide No Fishing Bait warning during Kuudra fight. - hannibal2
 
 #### Mining Fixes
 
 + Fixed an error when showing all elements in Powder Tracker. - hannibal2
 + Fixed powder tracker detecting gemstone chat messages. - CalMWolfs
++ Fixed Mining Chat Filter not hiding gemstone messages. - CalMWolfs
 
 #### Rift Fixes
 
@@ -117,6 +143,10 @@
 
 + Fixed poisoned candy potion chat message not getting compacted. - alexia
 
+#### GUI Fixes
+
++ Fixed items in SkyHanni GUI elements rendering over minecraft menus. - Thunderblade73
+
 #### Misc Fixes
 
 + Maybe fixed Tia Relay Helper. - Thunderblade73
@@ -138,6 +168,12 @@
 + Moving minion craft helper fully over to neu internal names. - hannibal2
 + Added information about trackers to the Discord FAQ. - j10a1n15
 + Defined the way how dependent PRs should be written in contributing.md. - Thunderblade73
++ Added debug command /shtestburrow. - hannibal2
++ Using SkyHanniMod.coroutineScope instead of CoroutineScope(Dispatchers.Default). - CalMWolfs
++ Creating function addTotalProfit for item trackers. - hannibal2
++ Tell people how to name a pattern variable. - CalMWolfs
++ Typo fixes in contributing md. - CalMWolfs
++ Make Repo Pattern keys more consistent for Farming Gear. - CalMWolfs
 
 ## Version 0.22
 

CONTRIBUTING.md

@@ -71,14 +71,15 @@ format like "- #821" to illustrate the dependency.
     - See [this commit](https://github.com/hannibal002/SkyHanni/commit/3d748cb79f3a1afa7f1a9b7d0561e5d7bb284a9b)
       as an example.
 - Try to avoid using kotlin's `!!` (catch if not null) feature.
-    - Replace it with `?:` (ff null return this).
-    - This will most likely not be possible to avoid when working with obects from java.
+    - Replace it with `?:` (if null return this).
+    - This will most likely not be possible to avoid when working with objects from java.
 - Don't forget to add `@FeatureToggle` to new standalone features (not options to that feature) in the config.
 - Do not use `e.printStackTrace()`, use `CopyErrorCommand.logError(e, "explanation for users")` instead.
 - Do not use `MinecraftForge.EVENT_BUS.post(event)`, use `event.postAndCatch()` instead.
 - Do not use `toRegex()` or `toPattern()`, use `RepoPattern` instead.
     - See [RepoPattern.kt](https://github.com/walkerselby/SkyHanni/blob/beta/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPattern.kt)
-    for more information and usages.
+for more information and usages.
+    - The pattern variables are named in the scheme `variableNamePattern`
 - Please use Regex instead of String comparison when it is likely Hypixel will change the message in the future.
 
 ## Software Used in SkyHanni
@@ -116,8 +117,8 @@ For more information, see https://github.com/NotEnoughUpdates/MoulConfig
 SkyHanni utilizes the [Elite API](https://api.elitebot.dev/) (view the [public site here](https://elitebot.dev)) for
 some farming features.
 
-This includes features relating to Farming Weight, as well as syncing jacob contests amongst players for conviencience.
-All data sent is anonymonized and opt-in.
+This includes features relating to Farming Weight, as well as syncing jacob contests amongst players for convenience.
+All data sent is anonymized and opt-in.
 
 ### Mixin
 
@@ -128,7 +129,7 @@ It allows to easily modify methods in Minecraft itself, without conflicting with
 
 For more information, see https://github.com/SpongePowered/Mixin or [our existing mixins](https://github.com/hannibal002/SkyHanni/tree/beta/src/main/java/at/hannibal2/skyhanni/mixins/transformers).
 
-When creating new Mixins, try to keep the code inside of the mixin as small as possible, and calling a hook as soon as
+When creating new Mixins, try to keep the code inside the mixin as small as possible, and calling a hook as soon as
 possible.
 
 ### Repo

FEATURES.md

@@ -30,6 +30,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Optional if left or right side of name.
     + Should not break with other mods.
 + Hide the repeating fire sale reminder chat messages. - hannibal2
++ Add tab list fire sale advertisement hider. - nea
 
 #### Chat Filter
 
@@ -132,6 +133,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + This removes the need to shift-click to swap the equipment items, without the annoying "pick up animation".
 + Added Copy Underbid Price. - hannibal2
     + Copies the price of an item in the "Create BIN Auction" minus 1 coin into the clipboard for faster under-bidding.
++ Added Power Stone Guide features. - hannibal2
+    + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
+      items in the Power Stone Guide.
++ Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
 
 </details>
 <details open><summary>
@@ -145,6 +150,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Supports dungeon mage cooldown reduction. - Cad
 + Hiding the flame particles when using the Fire Veil Wand ability.
 + Circle around the player when having the Fire Veil Wand ability active.
++ Lesser Orb of Healing Hider. - jani
 
 </details>
 <details open><summary>

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.6"
+version = "0.23.Beta.7"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()

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

@@ -205,10 +205,12 @@ import at.hannibal2.skyhanni.features.inventory.HideNotClickableItems
 import at.hannibal2.skyhanni.features.inventory.HighlightBonzoMasks
 import at.hannibal2.skyhanni.features.inventory.ItemDisplayOverlayFeatures
 import at.hannibal2.skyhanni.features.inventory.ItemStars
+import at.hannibal2.skyhanni.features.inventory.PowerStoneGuideFeatures
 import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures
 import at.hannibal2.skyhanni.features.inventory.RngMeterInventory
 import at.hannibal2.skyhanni.features.inventory.SackDisplay
 import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment
+import at.hannibal2.skyhanni.features.inventory.ShiftClickNPCSell
 import at.hannibal2.skyhanni.features.inventory.SkyBlockLevelGuideHelper
 import at.hannibal2.skyhanni.features.inventory.StatsTuning
 import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayHelper
@@ -235,6 +237,7 @@ import at.hannibal2.skyhanni.features.misc.FixNEUHeavyPearls
 import at.hannibal2.skyhanni.features.misc.HideArmor
 import at.hannibal2.skyhanni.features.misc.InGameDateDisplay
 import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows
+import at.hannibal2.skyhanni.features.misc.LesserOrbHider
 import at.hannibal2.skyhanni.features.misc.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.LockMouseLook
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
@@ -365,7 +368,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.6",
+    version = "0.23.Beta.7",
 )
 class SkyHanniMod {
     @Mod.EventHandler
@@ -516,6 +519,7 @@ class SkyHanniMod {
         loadModule(SoopyGuessBurrow())
         loadModule(DianaProfitTracker)
         loadModule(MythologicalCreatureTracker)
+        loadModule(ShiftClickNPCSell)
         loadModule(HighlightJerries())
         loadModule(TheGreatSpook())
         loadModule(GriffinBurrowHelper)
@@ -529,10 +533,12 @@ class SkyHanniMod {
         loadModule(CompactBingoChat())
         loadModule(BrewingStandOverlay())
         loadModule(FishingTimer())
+        loadModule(LesserOrbHider())
         loadModule(FishingHookDisplay())
         loadModule(CrimsonIsleReputationHelper(this))
         loadModule(SharkFishCounter())
         loadModule(SkyBlockLevelGuideHelper())
+        loadModule(PowerStoneGuideFeatures())
         loadModule(OdgerWaypoint())
         loadModule(TiaRelayHelper())
         loadModule(TiaRelayWaypoints())

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

@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil
 import at.hannibal2.skyhanni.features.commands.PartyCommands
 import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper
 import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker
+import at.hannibal2.skyhanni.features.event.diana.GriffinBurrowHelper
 import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker
@@ -317,6 +318,10 @@ object Commands {
             "shconfigsave",
             "Manually saving the config"
         ) { SkyHanniMod.configManager.saveConfig(ConfigFileType.FEATURES, "manual-command") }
+        registerCommand(
+            "shtestburrow",
+            "Sets a test burrow waypoint at your location"
+        ) { GriffinBurrowHelper.setTestBurrow(it) }
     }
 
     private fun developersCodingHelp() {

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

@@ -4,10 +4,14 @@
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ChatConfig {
 
     @Expose
@@ -32,10 +36,36 @@ public class ChatConfig {
     public ChatSymbols chatSymbols = new ChatSymbols();
 
     @Expose
-    @ConfigOption(name = "Dungeon Filter", desc = "Hides pickup, reminder, buff, damage, ability, puzzle and end messages in Dungeons.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean dungeonMessages = true;
+    @ConfigOption(name = "Dungeon Filter", desc = "Hide specific message types in Dungeons.")
+    @ConfigEditorDraggableList
+    public List<DungeonMessageTypes> dungeonFilteredMessageTypes = new ArrayList<>();
+
+
+    public enum DungeonMessageTypes {
+        PREPARE("§bPreparation"),
+        START("§aClass Buffs §r/ §cMort Dialogue"),
+        AMBIENCE("§bAmbience"),
+        PICKUP("§ePickup"),
+        REMINDER("§cReminder"),
+        BUFF("§dBlessings"),
+        NOT_POSSIBLE("§cNot possible"),
+        DAMAGE("§cDamage"),
+        ABILITY("§dAbilities"),
+        PUZZLE("§dPuzzle §r/ §cQuiz"),
+        END("§cEnd §a(End of run spam)"),
+        ;
+
+        private final String name;
+
+        DungeonMessageTypes(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
 
     @Expose
     @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the Watcher and bosses in the Dungeon.")

src/main/java/at/hannibal2/skyhanni/config/features/fishing/SeaCreatureTrackerConfig.java

@@ -27,4 +27,9 @@ public class SeaCreatureTrackerConfig {
     @ConfigOption(name = "Hide Chat", desc = "Hide the chat messages when catching a sea creature.")
     @ConfigEditorBoolean
     public boolean hideChat = false;
+
+    @Expose
+    @ConfigOption(name = "Count Double", desc = "Count double hook catches as two catches.")
+    @ConfigEditorBoolean
+    public boolean countDouble = true;
 }

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

@@ -9,7 +9,6 @@
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -155,6 +154,13 @@ public String toString() {
     @FeatureToggle
     public boolean highlightMissingSkyBlockLevelGuide = true;
 
+    @Expose
+    @ConfigOption(name = "Power Stone Guide",
+        desc = "Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the items in the Power Stone Guide.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean powerStoneGuide = true;
+
     @Expose
     @ConfigOption(name = "Highlight Auctions",
         desc = "Highlight own items that are sold in green and that are expired in red.")
@@ -177,9 +183,15 @@ public String toString() {
     public boolean copyUnderbidPrice = false;
 
     @Expose
-    @ConfigOption(name = "Shift Click Equipment", desc = "Makes normal clicks to shift clicks in equipment inventory")
+    @ConfigOption(name = "Shift Click Equipment", desc = "Makes normal clicks to shift clicks in equipment inventory.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean shiftClickForEquipment = false;
 
+    @Expose
+    @ConfigOption(name = "Shift Click NPC sell", desc = "Makes normal clicks to shift clicks in npc inventory for selling.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean shiftClickNPCSell = false;
+
 }

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

@@ -203,6 +203,14 @@ public class MiscConfig {
     @FeatureToggle
     public boolean showTimeInLimbo = true;
 
+    @Expose
+    @ConfigOption(
+        name = "Lesser Orb of Healing Hider",
+        desc = "Hides the Lesser Orb of Healing.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean lesserOrbHider = false;
+
     @Expose
     @ConfigOption(
         name = "Lock Mouse Message",

src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java

@@ -20,6 +20,11 @@ public class CompactTabListConfig {
     @ConfigEditorBoolean
     public boolean hideAdverts = false;
 
+    @Expose
+    @ConfigOption(name = "Hide Fire Sale Adverts", desc = "Hides fire sales from the tablist")
+    @ConfigEditorBoolean
+    public boolean hideFiresales = false;
+
     @Expose
     @ConfigOption(name = "Advanced Player List", desc = "")
     @Accordion

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

@@ -5,7 +5,7 @@ enum class IslandType(val displayName: String, val modeName: String = "null") {
     PRIVATE_ISLAND("Private Island"),
     PRIVATE_ISLAND_GUEST("Private Island Guest"),
     THE_END("The End"),
-    KUUDRA_ARENA("Instanced"),
+    KUUDRA_ARENA("Kuudra"),
     CRIMSON_ISLE("Crimson Isle"),
     DWARVEN_MINES("Dwarven Mines"),
     DUNGEON_HUB("Dungeon Hub", "dungeon_hub"),

src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt

@@ -66,4 +66,9 @@ abstract class LorenzEvent : Event() {
     }
 
     fun postWithoutCatch() = MinecraftForge.EVENT_BUS.post(this)
+
+    // TODO let walker use this function for all 101 other uses
+    fun cancel() {
+        isCanceled = true
+    }
 }