aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-08-24 17:21:32 +0200
committerLorenz <lo.scherf@gmail.com>2022-08-24 17:21:32 +0200
commit405d6b7365c28bca729a1c1c46ff0c2db3317881 (patch)
tree37d9113c8523e8843b0ac71b6f311cdd75229ac4 /src/main/java/at/hannibal2/skyhanni/data
parent54a3f5fcb6bdf57e22b2fb482d5d5aaf96b62188 (diff)
downloadSkyHanni-405d6b7365c28bca729a1c1c46ff0c2db3317881.tar.gz
SkyHanni-405d6b7365c28bca729a1c1c46ff0c2db3317881.tar.bz2
SkyHanni-405d6b7365c28bca729a1c1c46ff0c2db3317881.zip
hiding damage splashes while inside the boss room (fixing Skytils feature)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 98370fee7..91e1240a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -2,12 +2,10 @@ package at.hannibal2.skyhanni.data
import at.hannibal2.skyhanni.events.LocationChangeEvent
import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.PacketEvent
import at.hannibal2.skyhanni.events.ProfileJoinEvent
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import at.hannibal2.skyhanni.utils.TabListUtils
import net.minecraft.client.Minecraft
-import net.minecraft.network.play.server.S38PacketPlayerListItem
import net.minecraftforge.event.world.WorldEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -18,7 +16,6 @@ class HypixelData {
companion object {
var hypixel = false
var skyblock = false
- var dungeon = false
var mode: String = ""
}
@@ -33,31 +30,14 @@ class HypixelData {
val areaRegex = Regex("§r§b§l(?<area>[\\w]+): §r§7(?<loc>[\\w ]+)§r")
@SubscribeEvent
- fun onTabUpdate(event: PacketEvent.ReceiveEvent) {
- if (dungeon || !hypixel || event.packet !is S38PacketPlayerListItem ||
- (event.packet.action != S38PacketPlayerListItem.Action.UPDATE_DISPLAY_NAME &&
- event.packet.action != S38PacketPlayerListItem.Action.ADD_PLAYER)
- ) return
- event.packet.entries.forEach { playerData ->
- val name = playerData?.displayName?.formattedText ?: playerData?.profile?.name ?: return@forEach
- areaRegex.matchEntire(name)?.let { result ->
- dungeon = skyblock && result.groups["area"]?.value == "Dungeon"
- return@forEach
- }
- }
- }
-
- @SubscribeEvent
fun onWorldChange(event: WorldEvent.Load) {
skyblock = false
- dungeon = false
}
@SubscribeEvent
fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) {
hypixel = false
skyblock = false
- dungeon = false
}
@SubscribeEvent