diff options
| author | Lorenz <ESs95s3P5z8Pheb> | 2022-07-09 02:41:10 +0200 |
|---|---|---|
| committer | Lorenz <ESs95s3P5z8Pheb> | 2022-07-09 02:41:10 +0200 |
| commit | 29f8bad3e41c8a0215a8b4f3e971a24a2a1f9758 (patch) | |
| tree | 2e3cac801aaa3c6adeb9ceb0ce30d898d2eb3881 /src/main/java/at/lorenz/mod/dungeon | |
| parent | 70ed542804a403790932abdf5d601d3c0c26cfe8 (diff) | |
| download | skyhanni-29f8bad3e41c8a0215a8b4f3e971a24a2a1f9758.tar.gz skyhanni-29f8bad3e41c8a0215a8b4f3e971a24a2a1f9758.tar.bz2 skyhanni-29f8bad3e41c8a0215a8b4f3e971a24a2a1f9758.zip | |
adding support for isOnHypixel, inSkyblock and inDungeons
Diffstat (limited to 'src/main/java/at/lorenz/mod/dungeon')
| -rw-r--r-- | src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt | 5 | ||||
| -rw-r--r-- | src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt | 9 |
2 files changed, 6 insertions, 8 deletions
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 { |