Merge pull request #23 from hannibal002/beta

0.22 beta 6.5

Author: martimavocado

CHANGELOG.md

@@ -23,6 +23,7 @@
   + Option to only show the time while holding vacuum in the hand.
 + Mark the plots with pests on them in the world. - hannibal2
 + Press the key to warp to the nearest plot with pests on it. - hannibal2
++ Draw plot borders when holding the Sprayonator. - HiZe
 
 #### Fishing Features
 
@@ -48,6 +49,12 @@
   + Show in a display how many unique players you have given gifts to in the winter 2023 event.
   + Run command /opengenerowmenu to sync up.
 
+#### Bingo Features
+
++ Show the duration until the next hidden bingo goal tip gets revealed. - hannibal2
++ Added support for tips in hidden bingo card display. - hannibal2
++ Added support for 'found by' info in bingo card. - hannibal2
+
 #### Inventory Features
 
 + Added bottle of Jyrre time overlay in stack size feature. - HiZe
@@ -57,6 +64,10 @@
 
 + Shows how much skill experience you will get when picking up items from the minion storage. - Thunderblade73
 
+#### Chat Features
+
++ Hide the repeating fire sale reminder chat messages. - hannibal2
+
 ### Changes
 
 #### Garden Changes
@@ -69,7 +80,7 @@
 + Added the "plot" word to the sidebar again (only if there are no pests in garden). - hannibal2
 + Hide the Composter Overlay in composter inventory while the Estimated Item Value is visible. - hannibal2
 + Made the wording of "no pest spawned yet" message more clear. - hannibal2
-+ Not only show the waypoint for infected plots, also show their waypoints in the world. - hannibal2
++ Not only show the waypoint for infested plots, also show their waypoints in the world. - hannibal2
 
 #### Fishing Changes
 
@@ -98,7 +109,7 @@
 
 + 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. - walker
++ Fixed NPC messages getting detected as player messages. - CalMWolfs
 
 #### Config Fixes
 

FEATURES.md

@@ -28,6 +28,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Will not break with emblems.
     + Optional if left or right side of name.
     + Should not break with other mods.
++ Hide the repeating fire sale reminder chat messages. - hannibal2
 
 #### Chat Filter
 
@@ -341,6 +342,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 
 + Shortens chat messages about skill level ups, collection gains and new area discoveries while on bingo.
 + Bingo Card
++ Show the duration until the next hidden bingo goal tip gets revealed. - hannibal2
++ Support for tips in hidden bingo card display. - hannibal2
++ Support for 'found by' info in bingo card. - hannibal2
 </details>
 <details open><summary>
 
@@ -499,7 +503,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Garden Vacuum Pests in Pest bag to item number as stack size. - hannibal2
     + Enable via /sh vacuum.
 
-### Pests
+### Garden Pests
 
 + Added Garden Vacuum Pests in Pest bag to item number as stack size. - hannibal2
   + Enable via /sh vacuum.
@@ -518,6 +522,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
   + Option to only show the time while holding vacuum in the hand.
 + Mark the plots with pests on them in the world. - hannibal2
 + Press the key to warp to the nearest plot with pests on it. - hannibal2
++ Draw plot borders when holding the Sprayonator. - HiZe
 
 </details>
 <details open><summary>

build.gradle.kts

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

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

@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.config.Features
 import at.hannibal2.skyhanni.config.SackData
 import at.hannibal2.skyhanni.config.commands.Commands.init
 import at.hannibal2.skyhanni.data.ActionBarStatsData
-import at.hannibal2.skyhanni.data.BingoAPI
 import at.hannibal2.skyhanni.data.BlockData
 import at.hannibal2.skyhanni.data.ChatManager
 import at.hannibal2.skyhanni.data.CropAccessoryData
@@ -54,6 +53,7 @@ import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod
 import at.hannibal2.skyhanni.features.bazaar.BazaarCancelledBuyOrderClipboard
 import at.hannibal2.skyhanni.features.bazaar.BazaarOpenPriceWebsite
 import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper
+import at.hannibal2.skyhanni.features.bingo.BingoAPI
 import at.hannibal2.skyhanni.features.bingo.BingoCardDisplay
 import at.hannibal2.skyhanni.features.bingo.BingoCardTips
 import at.hannibal2.skyhanni.features.bingo.BingoNextStepHelper
@@ -350,7 +350,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.22.Beta.5",
+    version = "0.22.Beta.6",
 )
 class SkyHanniMod {
     @Mod.EventHandler

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

@@ -187,10 +187,7 @@ class ConfigManager {
                             run()
                         } catch (e: Throwable) {
                             e.printStackTrace()
-                            println("This is a crash.")
-                            while (true) {
-                                // If you know the forge method to shut down correctly, please quietly pr it.
-                            }
+                            LorenzUtils.shutdownMinecraft("Config is corrupt inside developement enviroment.")
                         }
                     } else {
                         run()

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

@@ -396,7 +396,7 @@ object Commands {
     @JvmStatic
     fun openFortuneGuide() {
         if (!LorenzUtils.inSkyBlock) {
-            LorenzUtils.chat("§cJoin SkyBlock to open the fortune guide!", false)
+            LorenzUtils.userError("Join SkyBlock to open the fortune guide!")
         } else {
             CaptureFarmingGear.captureFarmingGear()
             SkyHanniMod.screenToOpen = FFGuideGUI()
@@ -406,7 +406,7 @@ object Commands {
     @JvmStatic
     fun openVisualWords() {
         if (!LorenzUtils.onHypixel) {
-            LorenzUtils.chat("§cYou need to join Hypixel to use this feature!", false)
+            LorenzUtils.userError("You need to join Hypixel to use this feature!")
         } else {
             if (VisualWordGui.sbeConfigPath.exists()) VisualWordGui.drawImport = true
             SkyHanniMod.screenToOpen = VisualWordGui()

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

@@ -74,6 +74,12 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean profileJoin = true;
 
+    @Expose
+    @ConfigOption(name = "Fire Sale", desc = "Hide the repeating fire sale reminder chat messages.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean fireSale = true;
+
     //TODO remove
     @Expose
     @ConfigOption(name = "Others", desc = "Hide other annoying messages.")

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

@@ -42,4 +42,9 @@ public class BingoCardConfig {
 
     @Expose
     public Position bingoCardPos = new Position(10, 10, false, true);
+
+    @Expose
+    @ConfigOption(name = "Next Tip Duration", desc = "Show the duration until the next hidden personal goal gets a tip revealed.")
+    @ConfigEditorBoolean
+    public Property<Boolean> nextTipDuration = Property.of(true);
 }

src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/SprayConfig.java

@@ -11,12 +11,18 @@ public class SprayConfig {
     @Expose
     @ConfigOption(
         name = "Pest Spray Selector",
-        desc = "Show the pests that are attracted when changing the selected material of the §aSprayanator§7."
+        desc = "Show the pests that are attracted when changing the selected material of the §aSprayonator§7."
     )
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean pestWhenSelector = true;
 
+    @Expose
+    @ConfigOption(name = "Draw Plot Border", desc = "Draw plots border when holding the Sprayonator.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean drawPlotsBorderWhenInHands = true;
+
     @Expose
     public Position position = new Position(315, -200, 2.3f);
 }

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

@@ -87,6 +87,7 @@ public enum ItemNumberEntry implements HasLegacyId {
         VACUUM_GARDEN("§bVacuum (Garden)", 14),
         BOTTLE_OF_JYRRE("§bBottle Of Jyrre", 15),
         EDITION_NUMBER("§bEdition Number", 16),
+        BINGO_GOAL_RANK("§bBingo Goal Rank"),
         ;
 
         private final String str;