feat: change mimic detector to CataclysmicMap

Modified version of upstream

Author: My-Name-Is-Jeff

src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt

@@ -33,13 +33,11 @@ import gg.skytils.skytilsmod.utils.*
 import gg.skytils.skytilsmod.utils.graphics.ScreenRenderer
 import gg.skytils.skytilsmod.utils.graphics.SmartFontRenderer.TextAlignment
 import gg.skytils.skytilsmod.utils.graphics.colors.CommonColors
-import net.minecraft.entity.monster.EntityZombie
 import net.minecraft.network.play.server.S38PacketPlayerListItem
 import net.minecraft.network.play.server.S3EPacketTeams
 import net.minecraft.network.play.server.S45PacketTitle
 import net.minecraft.util.ChatComponentText
 import net.minecraftforge.client.event.ClientChatReceivedEvent
-import net.minecraftforge.event.entity.living.LivingDeathEvent
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -471,25 +469,6 @@ object ScoreCalculation {
         }
     }
 
-    @SubscribeEvent
-    fun onEntityDeath(event: LivingDeathEvent) {
-        if (!Utils.inDungeons) return
-        if (event.entity is EntityZombie) {
-            val entity = event.entity as EntityZombie
-            if (entity.isChild && entity.getCurrentArmor(0) == null && entity.getCurrentArmor(1) == null && entity.getCurrentArmor(
-                    2
-                ) == null && entity.getCurrentArmor(3) == null
-            ) {
-                if (!mimicKilled.get()) {
-                    mimicKilled.set(true)
-                    if (Skytils.config.scoreCalculationAssist) {
-                        Skytils.sendMessageQueue.add("/pc \$SKYTILS-DUNGEON-SCORE-MIMIC$")
-                    }
-                }
-            }
-        }
-    }
-
     @SubscribeEvent
     fun clearScore(event: WorldEvent.Unload) {
         mimicKilled.set(false)

src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/cataclysmicmap/CataclysmicMap.kt

@@ -22,6 +22,7 @@ import gg.essential.elementa.utils.withAlpha
 import gg.essential.universal.UGraphics
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils.Companion.mc
+import gg.skytils.skytilsmod.features.impl.dungeons.DungeonFeatures
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonTimer
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.core.CataclysmicMapConfig
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.core.CataclysmicMapElement
@@ -31,12 +32,14 @@ import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.core.map.Room
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.handlers.DungeonInfo
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.handlers.DungeonScanner
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.handlers.MapUpdater
+import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.handlers.MimicDetector
 import gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.utils.MapUtils
 import gg.skytils.skytilsmod.utils.RenderUtil
 import gg.skytils.skytilsmod.utils.TabListUtils
 import gg.skytils.skytilsmod.utils.Utils
 import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -64,6 +67,10 @@ object CataclysmicMap {
                 MapUpdater.updateRooms(it)
                 MapUpdater.updatePlayers(it)
             }
+
+            if ((DungeonFeatures.dungeonFloorNumber ?: 0) >= 6) {
+                MimicDetector.checkMimicDead()
+            }
         }
 
         if (DungeonScanner.shouldScan) {
@@ -109,5 +116,9 @@ object CataclysmicMap {
 
     init {
         CataclysmicMapElement
+
+        arrayOf(
+            MimicDetector,
+        ).forEach(MinecraftForge.EVENT_BUS::register)
     }
 }

src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/cataclysmicmap/handlers/MimicDetector.kt

@@ -0,0 +1,75 @@
+/*
+ * Skytils - Hypixel Skyblock Quality of Life Mod
+ * Copyright (C) 2020-2024 Skytils
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package gg.skytils.skytilsmod.features.impl.dungeons.cataclysmicmap.handlers
+
+import gg.skytils.skytilsmod.Skytils
+import gg.skytils.skytilsmod.Skytils.Companion.mc
+import gg.skytils.skytilsmod.events.impl.BlockChangeEvent
+import gg.skytils.skytilsmod.features.impl.dungeons.ScoreCalculation
+import gg.skytils.skytilsmod.utils.Utils
+import net.minecraft.entity.monster.EntityZombie
+import net.minecraft.init.Blocks
+import net.minecraft.util.BlockPos
+import net.minecraftforge.event.entity.living.LivingDeathEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+object MimicDetector {
+    var mimicOpenTime = 0L
+    var mimicPos: BlockPos? = null
+
+    @SubscribeEvent
+    fun onBlockChange(event: BlockChangeEvent) {
+        if (Utils.inDungeons && event.old.block == Blocks.trapped_chest && event.update.block == Blocks.air) {
+            mimicOpenTime = System.currentTimeMillis()
+            mimicPos = event.pos
+        }
+    }
+
+    @SubscribeEvent
+    fun onEntityDeath(event: LivingDeathEvent) {
+        if (!Utils.inDungeons) return
+        val entity = event.entity as? EntityZombie ?: return
+        if (entity.isChild && (0..3).all { entity.getCurrentArmor(it) == null }) {
+            if (!ScoreCalculation.mimicKilled.get()) {
+                ScoreCalculation.mimicKilled.set(true)
+                if (Skytils.config.scoreCalculationAssist) {
+                    Skytils.sendMessageQueue.add("/pc \$SKYTILS-DUNGEON-SCORE-MIMIC$")
+                }
+            }
+        }
+    }
+
+    fun checkMimicDead() {
+        if (ScoreCalculation.mimicKilled.get()) return
+        if (mimicOpenTime == 0L) return
+        if (System.currentTimeMillis() - mimicOpenTime < 750) return
+        if (mc.thePlayer.getDistanceSq(mimicPos) < 400) {
+            if (mc.theWorld.loadedEntityList.none {
+                    it is EntityZombie && it.isChild && it.getCurrentArmor(3)
+                        ?.getSubCompound("SkullOwner", false)
+                        ?.getString("Id") == "bcb486a4-0cb5-35db-93f0-039fbdde03f0"
+                }) {
+                ScoreCalculation.mimicKilled.set(true)
+                if (Skytils.config.scoreCalculationAssist) {
+                    Skytils.sendMessageQueue.add("/pc \$SKYTILS-DUNGEON-SCORE-MIMIC$")
+                }
+            }
+        }
+    }
+}