Update map data from packet

Harry282 · Aug 13, 2024 · 29c9b0e · 29c9b0e
1 parent 7053554
commit 29c9b0e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/src/main/kotlin/funnymap/features/dungeon/Dungeon.kt b/src/main/kotlin/funnymap/features/dungeon/Dungeon.kt
@@ -102,6 +102,7 @@ object Dungeon {
         espDoors.clear()
         PlayerTracker.roomClears.clear()
         MapUtils.calibrated = false
+        MapUtils.mapData = null
         DungeonScan.hasScanned = false
         RunInformation.reset()
     }

diff --git a/src/main/kotlin/funnymap/features/dungeon/MapUpdate.kt b/src/main/kotlin/funnymap/features/dungeon/MapUpdate.kt
@@ -81,7 +81,7 @@ object MapUpdate {
             }
         }
 
-        val decor = MapUtils.getMapData()?.mapDecorations ?: return
+        val decor = MapUtils.mapData?.mapDecorations ?: return
         Dungeon.dungeonTeammates.forEach { (name, player) ->
             decor.entries.find { (icon, _) -> icon == player.icon }?.let { (_, vec4b) ->
                 player.isPlayer = vec4b.func_176110_a().toInt() == 1
@@ -100,7 +100,7 @@ object MapUpdate {
     }
 
     fun updateRooms() {
-        val map = DungeonMap(MapUtils.getMapData()?.colors ?: return)
+        val map = DungeonMap(MapUtils.mapData?.colors ?: return)
         Dungeon.espDoors.clear()
 
         for (x in 0..10) {

diff --git a/src/main/kotlin/funnymap/utils/MapUtils.kt b/src/main/kotlin/funnymap/utils/MapUtils.kt
@@ -2,13 +2,15 @@ package funnymap.utils
 
 import funnymap.FunnyMap.mc
 import funnymap.features.dungeon.DungeonScan
+import funnymap.utils.Location.inDungeons
 import funnymap.utils.Utils.equalsOneOf
 import net.minecraft.item.ItemMap
+import net.minecraft.item.ItemStack
+import net.minecraft.network.play.server.S34PacketMaps
 import net.minecraft.util.Vec4b
 import net.minecraft.world.storage.MapData
 
 object MapUtils {
-
     val Vec4b.mapX
         get() = (this.func_176112_b() + 128) shr 1
 
@@ -18,15 +20,28 @@ object MapUtils {
     val Vec4b.yaw
         get() = this.func_176111_d() * 22.5f
 
+    var mapData: MapData? = null
     var startCorner = Pair(5, 5)
     var mapRoomSize = 16
     var coordMultiplier = 0.625
     var calibrated = false
 
-    fun getMapData(): MapData? {
+    private fun getMapItem(): ItemStack? {
         val map = mc.thePlayer?.inventory?.getStackInSlot(8) ?: return null
         if (map.item !is ItemMap || !map.displayName.contains("Magical Map")) return null
-        return (map.item as ItemMap).getMapData(map, mc.theWorld)
+        return map
+    }
+
+    fun updateMapData(packet: S34PacketMaps) {
+        if (!inDungeons) return
+        val map = getMapItem()
+        if (map != null) {
+            mapData = (map.item as ItemMap).getMapData(map, mc.theWorld)
+        }
+        if (mapData == null) {
+            mapData = MapData("map_${packet.mapId}")
+        }
+        packet.setMapdataTo(mapData)
     }
 
     /**
@@ -58,7 +73,7 @@ object MapUtils {
     private fun findEntranceCorner(): Pair<Int, Int> {
         var start = 0
         var currLength = 0
-        getMapData()?.colors?.forEachIndexed { index, byte ->
+        mapData?.colors?.forEachIndexed { index, byte ->
             if (byte.toInt() == 30) {
                 if (currLength == 0) start = index
                 currLength++

diff --git a/src/main/kotlin/funnymap/utils/PacketHandler.kt b/src/main/kotlin/funnymap/utils/PacketHandler.kt
@@ -4,9 +4,7 @@ import funnymap.events.ChatEvent
 import funnymap.events.ScoreboardEvent
 import funnymap.events.TabListEvent
 import net.minecraft.network.Packet
-import net.minecraft.network.play.server.S02PacketChat
-import net.minecraft.network.play.server.S38PacketPlayerListItem
-import net.minecraft.network.play.server.S3EPacketTeams
+import net.minecraft.network.play.server.*
 import net.minecraftforge.common.MinecraftForge
 
 object PacketHandler {
@@ -25,6 +23,10 @@ object PacketHandler {
             is S38PacketPlayerListItem -> {
                 MinecraftForge.EVENT_BUS.post(TabListEvent(packet))
             }
+
+            is S34PacketMaps -> {
+                MapUtils.updateMapData(packet)
+            }
         }
     }
 }