From 977991e8cfe61b843c922e380be72a0c72e886b5 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 23 Jul 2022 10:19:23 +0200 Subject: moving api key and current pet data into hidden config entry --- .../java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt') diff --git a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt index 5adf570b5..06284c7c9 100644 --- a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt @@ -11,10 +11,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class CurrentPetDisplay { - companion object { - var currentPet: String = "" - } - @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.inSkyblock) return @@ -23,15 +19,15 @@ class CurrentPetDisplay { val message = event.message if (message.matchRegex("§aYou summoned your §r(.*)§r§a!")) { - currentPet = message.between("your §r", "§r§a") + SkyHanniMod.feature.hidden.currentPet = message.between("your §r", "§r§a") blocked = true } if (message.matchRegex("§cAutopet §eequipped your §7(.*)§e! §a§lVIEW RULE")) { - currentPet = message.between("] ", "§e!") + SkyHanniMod.feature.hidden.currentPet = message.between("] ", "§e!") blocked = true } if (message.matchRegex("§aYou despawned your §r(.*)§r§a!")) { - currentPet = "" + SkyHanniMod.feature.hidden.currentPet = "" blocked = true } @@ -46,8 +42,7 @@ class CurrentPetDisplay { if (!LorenzUtils.inSkyblock) return if (!SkyHanniMod.feature.misc.petDisplay) return - if (currentPet == "") return - SkyHanniMod.feature.misc.petDisplayPos.renderString(currentPet) + SkyHanniMod.feature.misc.petDisplayPos.renderString(SkyHanniMod.feature.hidden.currentPet) } } \ No newline at end of file -- cgit