Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

1 files changed, 23 insertions, 11 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
index f2986ec0..7a6cdcd0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -1,25 +1,32 @@
 package de.hysky.skyblocker.skyblock.dungeon;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.events.HudRenderEvents;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
+import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.MapRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.MapIdComponent;
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.item.map.MapState;
 
 public class DungeonMap {
-    private static final int DEFAULT_MAP_ID = 1024;
-    private static Integer cachedMapId = null;
+    private static final MapIdComponent DEFAULT_MAP_ID_COMPONENT = new MapIdComponent(1024);
+    private static MapIdComponent cachedMapIdComponent = null;
 
     public static void init() {
+    	HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> render(context));
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
                 .then(ClientCommandManager.literal("hud")
                         .then(ClientCommandManager.literal("dungeon")
@@ -34,7 +41,7 @@ public class DungeonMap {
         MinecraftClient client = MinecraftClient.getInstance();
         if (client.player == null || client.world == null) return;
 
-        int mapId = getMapId(client.player.getInventory().main.get(8));
+        MapIdComponent mapId = getMapIdComponent(client.player.getInventory().main.get(8));
 
         MapState state = FilledMapItem.getMapState(mapId, client.world);
         if (state == null) return;
@@ -53,16 +60,21 @@ public class DungeonMap {
         matrices.pop();
     }
 
-    public static int getMapId(ItemStack stack) {
-        if (stack.isOf(Items.FILLED_MAP)) {
-            @SuppressWarnings("DataFlowIssue")
-            int mapId = FilledMapItem.getMapId(stack);
-            cachedMapId = mapId;
-            return mapId;
-        } else return cachedMapId != null ? cachedMapId : DEFAULT_MAP_ID;
+    public static MapIdComponent getMapIdComponent(ItemStack stack) {
+        if (stack.isOf(Items.FILLED_MAP) && stack.contains(DataComponentTypes.MAP_ID)) {
+            MapIdComponent mapIdComponent = stack.get(DataComponentTypes.MAP_ID);
+            cachedMapIdComponent = mapIdComponent;
+            return mapIdComponent;
+        } else return cachedMapIdComponent != null ? cachedMapIdComponent : DEFAULT_MAP_ID_COMPONENT;
+    }
+
+    private static void render(DrawContext context) {
+        if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && !DungeonManager.isInBoss() && SkyblockerConfigManager.get().locations.dungeons.enableMap) {
+            render(context.getMatrices());
+        }
     }
 
     private static void reset() {
-        cachedMapId = null;
+        cachedMapIdComponent = null;
     }
 }