From 29f8bad3e41c8a0215a8b4f3e971a24a2a1f9758 Mon Sep 17 00:00:00 2001
From: Lorenz <ESs95s3P5z8Pheb>
Date: Sat, 9 Jul 2022 02:41:10 +0200
Subject: adding support for isOnHypixel, inSkyblock and inDungeons

---
 src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt         | 5 +++--
 .../java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt  | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/lorenz/mod/dungeon')

diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
index d05c480bd..4c71d0c3b 100644
--- a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
@@ -3,12 +3,14 @@ package at.lorenz.mod.dungeon
 import at.lorenz.mod.events.LorenzChatEvent
 import at.lorenz.mod.utils.LorenzUtils.matchRegex
 import at.lorenz.mod.LorenzMod
+import at.lorenz.mod.utils.LorenzUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class DungeonChatFilter {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyblock) return
 
         if (!LorenzMod.feature.chat.dungeonMessages) return
 
@@ -24,8 +26,7 @@ class DungeonChatFilter {
             isStart(message) -> return "start"
         }
 
-        //TODO add
-//        if (!LorenzUtils.inDungeon) return ""
+        if (!LorenzUtils.inDungeons) return ""
 
         return when {
             isKey(message) -> "key"
diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt
index d6284cfca..86f205347 100644
--- a/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt
@@ -28,8 +28,7 @@ class DungeonHighlightClickedBlocks {
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
         if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return
-        //TODO add
-//        if (!LorenzUtils.inDungeon) return
+        if (!LorenzUtils.inDungeons) return
 
         if (event.message == "§cYou hear the sound of something opening...") {
             event.blockedReason = "dungeon_highlight_clicked_block"
@@ -39,8 +38,7 @@ class DungeonHighlightClickedBlocks {
     @SubscribeEvent
     fun onSendPacket(event: PacketEvent.SendEvent) {
         if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return
-        //TODO add
-//        if (!LorenzUtils.inDungeon) return
+        if (!LorenzUtils.inDungeons) return
 //      TODO add
 //        if (DungeonAPI.inBossRoom) return
         if (event.packet !is C08PacketPlayerBlockPlacement || event.packet.stack == null) return
@@ -76,8 +74,7 @@ class DungeonHighlightClickedBlocks {
     @SubscribeEvent
     fun onWorldRender(event: RenderWorldLastEvent) {
         if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return
-        //TODO add
-//        if (!LorenzUtils.inDungeon) return
+        if (!LorenzUtils.inDungeons) return
 
         blocks.removeAll { System.currentTimeMillis() > it.time + 3000 }
         blocks.forEach {
-- 
cgit