From d58dfb57cc78d0a73b81a58e01b6e17899355924 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 31 Jan 2024 19:03:41 +0100 Subject: replace onChatMessage with onChat --- .../at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt | 3 +-- .../java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt | 2 +- .../skyhanni/features/garden/farming/WrongFungiCutterWarning.kt | 2 +- .../skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt index b75929edb..495d82bb6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt @@ -12,7 +12,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import java.util.regex.Pattern class GardenCropMilestoneFix { private val tabListPattern = " Milestone: §r§a(?.*) (?.*): §r§3(?.*)%".toPattern() @@ -21,7 +20,7 @@ class GardenCropMilestoneFix { private val tabListCropProgress = mutableMapOf() @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { levelUpPattern.matchMatcher(event.message) { val cropName = group("crop") val crop = CropType.getByNameOrNull(cropName) ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt index d2772d837..f674340d7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt @@ -31,7 +31,7 @@ class GardenLevelDisplay { } @SubscribeEvent(receiveCanceled = true) - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!GardenAPI.inGarden()) return visitorRewardPattern.matchMatcher(event.message) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WrongFungiCutterWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WrongFungiCutterWarning.kt index bea0d4b92..aeae6de44 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WrongFungiCutterWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WrongFungiCutterWarning.kt @@ -18,7 +18,7 @@ class WrongFungiCutterWarning { private var lastPlaySoundTime = 0L @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { val message = event.message if (message == "§eFungi Cutter Mode: §r§cRed Mushrooms") { mode = FungiMode.RED diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 1ab640b2d..d9eb440e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -454,7 +454,7 @@ class GardenVisitorFeatures { } @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (config.hypixelArrivedMessage && newVisitorArrivedMessage.matcher(event.message).matches()) { event.blockedReason = "new_visitor_arrived" } -- cgit