diff options
| author | Phoebe <77941535+catgirlseraid@users.noreply.github.com> | 2024-05-18 12:29:50 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 02:29:50 +0200 |
| commit | fcfd30fc47bc1f0f56d5c1fb5548b9b058cd0e95 (patch) | |
| tree | aee8e92ca7920016d809208289d8b83631972949 /src/main/java/at | |
| parent | a28a9a693563151815b4d71014e998fc50ab8a8e (diff) | |
| download | skyhanni-fcfd30fc47bc1f0f56d5c1fb5548b9b058cd0e95.tar.gz skyhanni-fcfd30fc47bc1f0f56d5c1fb5548b9b058cd0e95.tar.bz2 skyhanni-fcfd30fc47bc1f0f56d5c1fb5548b9b058cd0e95.zip | |
Few bug fixes (#1820)
Co-authored-by: SeRaid <77941535+SeRaid743@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at')
3 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt index d59891902..c02a769e5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt @@ -352,7 +352,8 @@ class ChatFilter { private val factoryUpgradePatterns = listOf( "§.* §r§7has been promoted to §r§7\\[.*§r§7] §r§.*§r§7!".toPattern(), "§7Your §r§aRabbit Barn §r§7capacity has been increased to §r§a.* Rabbits§r§7!".toPattern(), - "§7You will now produce §r§6.* Chocolate §r§7per click!".toPattern() + "§7You will now produce §r§6.* Chocolate §r§7per click!".toPattern(), + "§7You upgraded to §r§d.*?§r§7!".toPattern(), ) private val powderMiningMessages = listOf( "§aYou uncovered a treasure chest!", diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt index 97da18d3c..2b0d9d72f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.event.lobby.waypoints.christmas import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.HypixelData +import at.hannibal2.skyhanni.data.WinterAPI import at.hannibal2.skyhanni.data.jsonobjects.repo.EventWaypointsJson import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent @@ -123,5 +124,5 @@ class PresentWaypoints { } private fun isEnabled(): Boolean = - LorenzUtils.inHypixelLobby && (config.allWaypoints || config.allEntranceWaypoints) + LorenzUtils.inHypixelLobby && (config.allWaypoints || config.allEntranceWaypoints && WinterAPI.isDecember()) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index 5fcaf580b..c250396b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -135,7 +135,7 @@ class HideNotClickableItems { ChatUtils.error("No hide reason for not clickable item!") } else { event.toolTip.add("§c$hideReason") - if (config.itemsBypass) { + if (config.itemsBypass && !hideReason.contains("SkyBlock Menu")) { event.toolTip.add(" §7(Bypass by holding the ${KeyboardManager.getModifierKeyName()} key)") } } @@ -440,7 +440,7 @@ class HideNotClickableItems { return true } - if (stack.cleanName() == "Green Candy" || stack.cleanName() == "Purple Candy") return false + if (stack.cleanName() == "Green Candy" || stack.cleanName() == "Purple Candy" || stack.cleanName() == "Dark Candy") return false hideReason = "This item is not a spooky candy!" return true |