Merge branch 'beta' of https://github.com/hannibal002/SkyHanni into i…

…tem-stack-size-bingo

CHANGELOG.md

@@ -18,6 +18,10 @@
 + Added Sea Creature Tracker. - hannibal2
     + Allows to only show single variants, e.g. water or lava or winter.
 
+#### Dungeon Features
+
++ Hide particles and damage splashes during the terracotta phase in dungeons F6 and M6. - hannibal2
+
 #### Crimson Isle Features
 
 + Added Volcano Explosivity in Crimson Isle. - Erymanthus
@@ -88,6 +92,7 @@
     + This helps to farm the correct amount, especially when in the early game.
 + Made blocks per second calculation more accurate immediately after starting to farm. - hannibal2
 + Warn to open visitor inventory again after partially serving Spaceman. - alexia
++ Updating the Garden Optimal Speed Display and Warning immediately when changing the setting. - hannibal2
 
 #### Rift Changes
 
@@ -130,6 +135,7 @@
 + Added options to change exactly what part of the Dungeon Chat Filter should be used. - Wambo
 + Hide F3/M3 guardian Damage Indicators once the professor spawns. - hannibal2
 + Added exact names for the floor 6 giants in the Damage Indicator. - hannibal2
++ Show the laser phase timer even during the hit phase after a successful damage phase skip. - hannibal2
 
 #### Diana Changes
 
@@ -144,11 +150,20 @@
     + Earned mystery dust. - alexia
 + Added the fire sale ended message to the Fire Sale Chat Hider. - hannibal2
 
+#### Command Changes
+
++ Added /pd short command for party disband. - Empa
+
+#### Config Changes
+
++ Using a better title for Area Boss features. - hannibal2
+
 #### Misc Changes
 
 + Tia Relay Helper: Suggest /togglemusic. - alexia
 + Added option to ignore Everything Chroma in the chat. - VixidDev
 + Added Item Ability Cooldown support for Talbot's Theodolite (the Farming Island Trapper tracker thing). - Erymanthus
++ Fewer election API updates, fewer election API errors. - CalMWolfs
 
 ### Fixes
 
@@ -165,6 +180,7 @@
 + Fixed grammar in Jacob Contest chat messages. - alexia
 + Fixed rarity error for items thrown around when using Sprayanator. - hannibal2
 + Added cooldown to Garden Warp Commands. - Empa
++ Fixed the detection of Anita and Jacob visitors. - hannibal2
 
 #### Combat Fixes
 
@@ -176,6 +192,8 @@
 + Fixed Fire Veil Wand circle shows on left-clicking. - hannibal2
 + Fixed Ashfang Freeze Cooldown being off by one second. Fixed Fire Veil line gets shown even while frozen. - hannibal2
 + Fixed time until the next area mini boss spawns being off by one second. - hannibal2
++ Fixed Reputation Helper in Crimson Isle showing incorrect sack amount. - CalMWolfs
++ Fixed the ender slayer laser phase timer being inaccurate in the Damage Indicator. - hannibal2
 
 #### Dungeon Fixes
 
@@ -186,12 +204,14 @@
 + Fixed Bonzo phase 1 does not get detected properly for Damage Indicator. - hannibal2
 + Fixed Dungeon Clean End sometimes not deactivating when chest spawned. - hannibal2
 + Fixed F3/M3 guardian spawn timer in Damage Indicator. - hannibal2
++ Fixed Highlight Clicked Chest in water puzzle room not showing. - hannibal2
 
 #### Diana Fixes
 
 + Fixed close griffin burrow detection with particles failing sometimes. - hannibal2
 + Fixed Diana mobs being invisible because of Fix Ghost Entities and four season pet skin. - hannibal2
 + Fixed a rare bug that leaves ghost burrows around. - hannibal2
++ Properly deleting Diana target markers when manually clearing griffin burrows by talking to Diana NPC. - hannibal2
 
 #### Mining Fixes
 
@@ -219,6 +239,7 @@
 + Fixed Crap Hat of Celebration not getting detected as accessory in Hide Not Clickable Items. - Empa
 + Fixed rune price calculation in Chest Value. - hannibal2
 + Fixed Power Stone Guide Highlight shows in other inventories when exiting via command. - hannibal2
++ Added options to hide Helmet Skins, Armor Dyes or Runes from Estimated Item Value Calculation. - hannibal2
 
 #### Bingo Fixes
 
@@ -229,12 +250,15 @@
 #### Chat Fixes
 
 + Fixed poisoned candy potion chat message not getting compacted. - alexia
++ Fixed the fire sale chat message hider again. - CalMWolfs
 
 #### GUI Fixes
 
 + Fixed items in SkyHanni GUI elements rendering over minecraft menus. - Thunderblade73
 + Fixed GUI Editor hotkey working while inside a NEU PV text box. - Thunderblade73
 + Fixed render overlapping problem with chat, SkyHanni GUIs and title. - Thunderblade73
++ Fixed GUI positions moving into the bottom-right corner when leaving the GUI position editor while pressing the mouse
+  button on next reopen. - hannibal2
 
 #### Winter Fixes
 
@@ -250,6 +274,7 @@
 + Fixed a typo in Odger Waypoint config. - Empa
 + Fixed NPC typos in config. - absterge
 + Fixed rare error in Harp Features. - Thunderblade73
++ Fixed some getItemStack errors. - CalMWolfs
 
 ### Technical Changes
 
@@ -297,6 +322,10 @@
 + Better error handling when an unknown crimson isle quest is detected. - hannibal2
 + Marked old number formatting code as deprecated. - hannibal2
 + Added the SkyHanni icon to the IntelliJ profile view. - Erymanthus
++ Fixed key name in utils patterns. - CalMWolfs
++ Using NEUInternalName in the Reputation Helper Quest. - CalMWolfs
++ Limit RAM to 4 GB in the developement enviroment. - CalMWolfs
+    + This is just the default and can be changed if needed.
 
 ## Version 0.22
 

FEATURES.md

@@ -79,6 +79,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Color class levels in the tab list. (Also hide rank colors and emblems because who needs that in dungeons anyway?)
 + Soulweaver Skull Hider in the Dungeon Object Hider. - nea
     + Hide the annoying soulweaver skulls that float around you if you have the soulweaver gloves equipped.
++ Hide particles and damage splashes during the terracotta phase in dungeons F6 and M6. - hannibal2
 
 </details>
 <details open><summary>

build.gradle.kts

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

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

@@ -379,7 +379,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.15",
+    version = "0.23.Beta.16",
 )
 class SkyHanniMod {
 

src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt

@@ -42,6 +42,9 @@ class GuiPositionEditor(private val positions: List<Position>, private val borde
     override fun onGuiClosed() {
         super.onGuiClosed()
         clickedPos = -1
+        for (position in positions) {
+            position.clicked = false
+        }
         OtherInventoryData.close()
     }
 
@@ -235,4 +238,4 @@ class GuiPositionEditor(private val positions: List<Position>, private val borde
         else
             hovered.scale += .1F
     }
-}
+}

src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java

@@ -3,6 +3,7 @@
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.observer.Property;
 
 public class CustomSpeedConfig {
 
@@ -11,69 +12,69 @@ public class CustomSpeedConfig {
         "§e5 Blocks§7: §f✦ 93 speed\n" +
         "§e4 Blocks§7: §f✦ 116 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int wheat = 93;
+    public Property<Float> wheat = Property.of(93f);
 
     @Expose
     @ConfigOption(name = "Carrot", desc = "Suggested farm speed:\n" +
         "§e5 Blocks§7: §f✦ 93 speed\n" +
         "§e4 Blocks§7: §f✦ 116 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int carrot = 93;
+    public Property<Float> carrot = Property.of(93f);
 
     @Expose
     @ConfigOption(name = "Potato", desc = "Suggested farm speed:\n" +
         "§e5 Blocks§7: §f✦ 93 speed\n" +
         "§e4 Blocks§7: §f✦ 116 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int potato = 93;
+    public Property<Float> potato = Property.of(93f);
 
     @Expose
     @ConfigOption(name = "Nether Wart", desc = "Suggested farm speed:\n" +
         "§e5 Blocks§7: §f✦ 93 speed\n" +
         "§e4 Blocks§7: §f✦ 116 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int netherWart = 93;
+    public Property<Float> netherWart = Property.of(93f);
 
     @Expose
     @ConfigOption(name = "Pumpkin", desc = "Suggested farm speed:\n" +
         "§e3 Blocks§7: §f✦ 155 speed\n" +
         "§e2 Blocks§7: §f✦ 265 §7or §f400 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int pumpkin = 155;
+    public Property<Float> pumpkin = Property.of(155f);
 
     @Expose
     @ConfigOption(name = "Melon", desc = "Suggested farm speed:\n" +
         "§e3 Blocks§7: §f✦ 155 speed\n" +
         "§e2 Blocks§7: §f✦ 265 or 400 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int melon = 155;
+    public Property<Float> melon = Property.of(155f);
 
     @Expose
     @ConfigOption(name = "Cocoa Beans", desc = "Suggested farm speed:\n" +
         "§e3 Blocks§7: §f✦ 155 speed\n" +
         "§e4 Blocks§7: §f✦ 116 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int cocoaBeans = 155;
+    public Property<Float> cocoaBeans = Property.of(155f);
 
     // TODO does other speed settings exist?
     @Expose
     @ConfigOption(name = "Sugar Cane", desc = "Suggested farm speed:\n" +
         "§eYaw 45§7: §f✦ 328 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int sugarCane = 328;
+    public Property<Float> sugarCane = Property.of(328f);
 
     @Expose
     @ConfigOption(name = "Cactus", desc = "Suggested farm speed:\n" +
         "§eNormal§7: §f✦ 400 speed\n" +
         "§eRacing Helmet§7: §f✦ 464 speed\n" +
         "§eBlack Cat§7: §f✦ 464 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 500, minStep = 1)
-    public int cactus = 400;
+    public Property<Float> cactus = Property.of(400f);
 
     // TODO does other speed settings exist?
     @Expose
     @ConfigOption(name = "Mushroom", desc = "Suggested farm speed:\n" +
         "§eYaw 60§7: §f✦ 233 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 400, minStep = 1)
-    public int mushroom = 233;
+    public Property<Float> mushroom = Property.of(233f);
 }

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

@@ -95,7 +95,7 @@ class HypixelData {
     }
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.onHypixel) return
 
         val message = event.message.removeColor().lowercase()

src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt

@@ -20,7 +20,7 @@ class CompactBingoChat {
 
     // TODO USE SH-REPO
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!config.enabled) return
         if (!LorenzUtils.isBingoProfile && !config.outsideBingo) return
 

src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt

@@ -364,7 +364,7 @@ class ChatFilter {
     /// </editor-fold>
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         val blockReason = block(event.message)
         if (blockReason == "") return
 

src/main/java/at/hannibal2/skyhanni/features/chat/CompactBestiaryChatMessage.kt

@@ -23,7 +23,7 @@ class CompactBestiaryChatMessage {
     private val milestonePattern = "^.+(§8\\d{1,3}➡§e\\d{1,3})$".toRegex()
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!SkyHanniMod.feature.chat.compactBestiaryMessage) return
 

src/main/java/at/hannibal2/skyhanni/features/chat/CompactSplashPotionMessage.kt

@@ -24,7 +24,7 @@ class CompactSplashPotionMessage {
     )
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
         if (!event.message.isPotionMessage()) return
         event.blockedReason = "compact_potion_effect"

src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt

@@ -31,7 +31,7 @@ class PlayerDeathMessages {
     }
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
         val message = event.message

src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt

@@ -15,7 +15,7 @@ class WatchdogHider {
     private var startLineComponent: IChatComponent? = null
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.onHypixel || !SkyHanniMod.feature.chat.filterType.watchDog) return
 
         when (event.message) {

src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt

@@ -118,7 +118,7 @@ class DamageIndicatorManager {
     }
 
     @SubscribeEvent(receiveCanceled = true)
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         mobFinder?.handleChat(event.message)
     }
 

src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt

@@ -135,15 +135,22 @@ class DungeonAPI {
     }
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
-        val floor = dungeonFloor
-        if (floor != null) {
-            if (event.message == "§e[NPC] §bMort§f: §rHere, I found this map when I first entered the dungeon.") {
-                started = true
-                DungeonStartEvent(floor).postAndCatch()
-            }
-            if (event.message.removeColor().matches(uniqueClassBonus)) {
-                isUniqueClass = true
+    fun onChat(event: LorenzChatEvent) {
+        val floor = dungeonFloor ?: return
+        if (event.message == "§e[NPC] §bMort§f: §rHere, I found this map when I first entered the dungeon.") {
+            started = true
+            DungeonStartEvent(floor).postAndCatch()
+        }
+        if (event.message.removeColor().matches(uniqueClassBonus)) {
+            isUniqueClass = true
+        }
+
+        if (!LorenzUtils.inSkyBlock) return
+        killPattern.matchMatcher(event.message.removeColor()) {
+            val bossCollections = bossStorage ?: return
+            val boss = DungeonFloor.byBossName(group("boss"))
+            if (matches() && boss != null && boss !in bossCollections) {
+                bossCollections.addOrPut(boss, 1)
             }
         }
     }
@@ -209,18 +216,6 @@ class DungeonAPI {
         }
     }
 
-    @SubscribeEvent
-    fun onChat(event: LorenzChatEvent) {
-        if (!LorenzUtils.inDungeons) return
-        killPattern.matchMatcher(event.message.removeColor()) {
-            val bossCollections = bossStorage ?: return
-            val boss = DungeonFloor.byBossName(group("boss"))
-            if (matches() && boss != null && boss !in bossCollections) {
-                bossCollections.addOrPut(boss, 1)
-            }
-        }
-    }
-
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
         event.title("Dungeon")

src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt

@@ -44,7 +44,7 @@ class DungeonBossMessages {
     )
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inDungeons) return
         if (!isBoss(event.message)) return
 

src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt

@@ -190,7 +190,7 @@ class DungeonChatFilter {
     /// </editor-fold>
 
     @SubscribeEvent
-    fun onChatMessage(event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.onHypixel || config.dungeonFilteredMessageTypes.isEmpty()) return
 
         // Workaround since the potion message gets always sent at that moment when SkyBlock is set as false