Merge branch 'beta' into present-waypoints

CHANGELOG.md

@@ -56,6 +56,8 @@
 + Added support for 'found by' info in bingo card. - hannibal2
 + Added Bingo Goal Rank as stack size in Bingo Card. - Erymanthus
 + 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.
 
 #### Inventory Features
 
@@ -85,6 +87,8 @@
 + Not only show the waypoint for infested plots, also show their waypoints in the world. - hannibal2
 + Use different colors in the tab list depending on the pest count. - alexia
 + 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
 
 #### Fishing Changes
 
@@ -94,6 +98,17 @@
 
 + Hiding Unique Gifted Players Highlighting for ironman and bingo while not on those modes. - Thunderblade73
 
+#### Chat Changes
+
++ 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
+
+#### 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.
+
 ### Fixes
 
 #### Garden Fixes
@@ -108,6 +123,8 @@
 + Fixed showing on the scoreboard  "garden outside" immediately after teleporting to a plot. - hannibal2
 + Fixed visitor timer counting down too fast sometimes. - hannibal2
 + 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
 
 #### Bingo Fixes
 
@@ -127,6 +144,7 @@
 + 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
 
 #### Config Fixes
 
@@ -146,6 +164,20 @@
 + Changed OwnInventoryItemUpdateEvent to be called synced to the main thread. - hannibal2
 + romanToDecimalIfNeeded -> romanToDecimalIfNecessary. - hannibal2
   + For more context: https://chat.openai.com/share/502571b5-8851-4047-b343-3b1475ca8a88
++ Added the debug feature SkyHanni Event Counter. - hannibal2
++ Fix Consecutive Spaces in RegEx. - walker
++ No longer creating new regex pattern elements each time in DungeonDeathCounter. - walker
++ Changed DungeonChatFilter to use lists of patterns. - walker
++ Code cleanup in DungeonMilestoneDisplay. - walker
++ Code cleanup and removed .matchRegex() - walker
++ Misc pattern optimizations. - walker
++ Moving the bingo goal list into BingoAPI. - hannibal2
++ Created BingoGoalReachedEvent. - hannibal2
++ Created Matcher.groupOrNull. - walker
++ cleanPlayerName respects playerRankHider option now. - hannibal2
++ 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
 
 ## Version 0.21.1
 

CONTRIBUTING.md

@@ -73,6 +73,8 @@ You can write in the description of the pr the wording for the changelog as well
 - 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()`, use `toPattern()` instead.
+- Please use Regex instead of String comparison when it is likely Hypixel will change the message in the future.
 
 ## Software Used in SkyHanni
 

DISCORD_FAQ.md

@@ -25,8 +25,9 @@ _Frequently Asked Questions_
 > No, the barn fishing timer is not supported in the Crimson Isle in Hypixel Skyblock because it would disrupt other fishers due to competition for the maximum sea creature cap, potentially leading to conflicts and stealing of sea creatures.
 
 > **8: My Jacob Contest Display crops are wrong, how do I fix this?**
-> 1. Run the command `/shconfig reset config.storage.gardenJacobFarmingContestTimes`
-> 2. Restart the game
+> 1. Close your minecraft.
+> 2. Delete ".minecraft\config\skyhanni\jacob_contests.json".
+> 3. Open minecraft.
 
-*This FAQ was last updated on October 17th, 2023.
-If you believe there's something that should be added to this list, please tell us, so we can add it.*
+*This FAQ was last updated on december 05th, 2023.
+If you believe there's something that should be added to this list, please tell us, so we can add it.*

FEATURES.md

@@ -347,6 +347,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Support for 'found by' info in bingo card. - hannibal2
 + Bingo Goal Rank as stack size in Bingo Card. - Erymanthus
 + 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.
+
 </details>
 <details open><summary>
 

build.gradle.kts

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

src/main/java/SkyHanniInstallerFrame.java

@@ -430,7 +430,7 @@ public void mouseClicked(MouseEvent e) {
         if (e.getSource() == getForgeTextArea()) {
             try {
                 Desktop.getDesktop().browse(new URI(
-                    "http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
+                    "https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
             } catch (IOException | URISyntaxException ex) {
                 showErrorPopup(ex);
             }

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

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

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

@@ -14,6 +14,8 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
@@ -121,6 +123,15 @@ class ConfigManager {
                     return TrackerDisplayMode.valueOf(reader.nextString())
                 }
             }.nullSafe())
+            .registerTypeAdapter(SimpleTimeMark::class.java, object : TypeAdapter<SimpleTimeMark>() {
+                override fun write(out: JsonWriter, value: SimpleTimeMark) {
+                    out.value(value.toMillis())
+                }
+
+                override fun read(reader: JsonReader): SimpleTimeMark {
+                    return reader.nextString().toLong().asTimeMark()
+                }
+            }.nullSafe())
             .enableComplexMapKeySerialization()
             .create()
 

src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java

@@ -12,18 +12,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.ACCEPTED;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.COINS_SPENT;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.COPPER;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.DEDICATION_IV;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.DENIED;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.FARMING_EXP;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.GREEN_BANDANA;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.OVERGROWN_GRASS;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.SPACER_1;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.TITLE;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.TOTAL_VISITORS;
-import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.VISITORS_BY_RARITY;
+import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.*;
 
 public class DropsStatisticsConfig {
 
@@ -57,7 +46,12 @@ public class DropsStatisticsConfig {
         DEDICATION_IV
     ));
 
+    /**
+     * Do not change the order of the enums added to that list! New items are to be synced up with the implementation in GardenVisitorDropStatistics.drawDisplay.
+     * Generic non VisitorReward stuff belongs in front of the first VisitorReward.
+     */
     public enum DropsStatisticsTextEntry implements HasLegacyId {
+        // generic stuff
         TITLE("§e§lVisitor Statistics", 0),
         TOTAL_VISITORS("§e1,636 Total", 1),
         VISITORS_BY_RARITY("§a1,172§f-§9382§f-§681§f-§d2§f-§c1", 2),
@@ -67,6 +61,13 @@ public enum DropsStatisticsTextEntry implements HasLegacyId {
         COPPER("§c62,072 Copper", 6),
         FARMING_EXP("§33.2m Farming EXP", 7),
         COINS_SPENT("§647.2m Coins Spent", 8),
+        SPACER_2(" ", 17),
+        GARDEN_EXP("§212,600 Garden EXP", 18),
+        BITS("§b4.2k Bits", 19),
+        MITHRIL_POWDER("§220k Mithril Powder", 20),
+        GEMSTONE_POWDER("§d18k Gemstone Powder", 21),
+
+        // VisitorReward items
         FLOWERING_BOUQUET("§b23 §9Flowering Bouquet", 9),
         OVERGROWN_GRASS("§b4 §9Overgrown Grass", 10),
         GREEN_BANDANA("§b2 §5Green Bandana", 11),
@@ -75,11 +76,7 @@ public enum DropsStatisticsTextEntry implements HasLegacyId {
         SPACE_HELMET("§b1 §cSpace Helmet", 14),
         CULTIVATING_I("§b1 §9Cultivating I", 15),
         REPLENISH_I("§b1 §9Replenish I", 16),
-        SPACER_2(" ", 17),
-        GARDEN_EXP("§212,600 Garden EXP", 18),
-        BITS("§b4.2k Bits", 19),
-        MITHRIL_POWDER("§220k Mithril Powder", 20),
-        GEMSTONE_POWDER("§d18k Gemstone Powder", 21),
+        DELICATE("§9Delicate V"),
         ;
 
         private final String str;

src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java

@@ -39,13 +39,10 @@ public class RewardWarningConfig {
     public int bypassKey = Keyboard.KEY_NONE;
 
 
-    /**
-     * Sync up with {at.hannibal2.skyhanni.features.garden.visitor.VisitorReward}
-     */
     @Expose
     @ConfigOption(
         name = "Items",
-        desc = "Warn for these reward items."
+        desc = "Warn for these reward item visitor drops."
     )
     @ConfigEditorDraggableList
     public List<VisitorReward> drops = new ArrayList<>(Arrays.asList(

src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java

@@ -98,7 +98,7 @@ public class VisitorConfig {
         desc = "Blocks you from interacting with / unlocking Visitors to allow for Dedication Cycling"
     )
     @ConfigEditorDropdown
-    public VisitorBlockBehaviour blockInteracting = VisitorBlockBehaviour.ONLY_ON_BINGO;
+    public VisitorBlockBehaviour blockInteracting = VisitorBlockBehaviour.DONT;
 
     public enum VisitorBlockBehaviour {
         DONT("Don't"), ALWAYS("Always"), ONLY_ON_BINGO("Only on Bingo");

src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/JacobContestsJson.java

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.data.jsonobjects.local;
 
 import at.hannibal2.skyhanni.features.garden.CropType;
+import at.hannibal2.skyhanni.utils.SimpleTimeMark;
 import com.google.gson.annotations.Expose;
 
 import java.util.HashMap;
@@ -9,5 +10,5 @@
 
 public class JacobContestsJson {
     @Expose
-    public Map<Long, List<CropType>> contestTimes = new HashMap<>();
+    public Map<SimpleTimeMark, List<CropType>> contestTimes = new HashMap<>();
 }