Migrate dungeon rooms data to resource system

124 files changed, 55 insertions, 79 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
index 0a4ab9d8..5f3e9258 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
@@ -1,5 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import it.unimi.dsi.fastutil.objects.Object2ByteMap;
 import it.unimi.dsi.fastutil.objects.Object2ByteOpenHashMap;
@@ -18,6 +20,7 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.item.map.MapState;
+import net.minecraft.resource.Resource;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
@@ -34,24 +37,13 @@ import org.slf4j.LoggerFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.zip.InflaterInputStream;
 
 public class DungeonSecrets {
     protected static final Logger LOGGER = LoggerFactory.getLogger(DungeonSecrets.class);
-    /**
-     * Block data for dungeon rooms. See {@link me.xmrvizzy.skyblocker.skyblock.dungeon.secrets.DungeonRoomsDFU DungeonRoomsDFU} for format details and how it's generated.
-     * All access to this map must check {@link #isRoomsLoaded()} to prevent concurrent modification.
-     */
-    @SuppressWarnings("JavadocReference")
-    protected static final HashMap<String, Map<String, Map<String, int[]>>> ROOMS_DATA = new HashMap<>();
+    private static final String DUNGEONS_PATH = "dungeons";
     /**
      * Maps the block identifier string to a custom numeric block id used in dungeon rooms data.
      *
@@ -81,11 +73,16 @@ public class DungeonSecrets {
             Map.entry("minecraft:cyan_terracotta", (byte) 20),
             Map.entry("minecraft:black_terracotta", (byte) 21)
     ));
-    private static final String DUNGEONS_DATA_DIR = "/assets/skyblocker/dungeons";
+    /**
+     * Block data for dungeon rooms. See {@link me.xmrvizzy.skyblocker.skyblock.dungeon.secrets.DungeonRoomsDFU DungeonRoomsDFU} for format details and how it's generated.
+     * All access to this map must check {@link #isRoomsLoaded()} to prevent concurrent modification.
+     */
+    @SuppressWarnings("JavadocReference")
+    protected static final HashMap<String, Map<String, Map<String, int[]>>> ROOMS_DATA = new HashMap<>();
     @NotNull
     private static final Map<Vector2ic, Room> rooms = new HashMap<>();
-    private static JsonObject roomsJson;
-    private static JsonObject waypointsJson;
+    private static final Map<String, JsonElement> roomsJson = new HashMap<>();
+    private static final Map<String, JsonElement> waypointsJson = new HashMap<>();
     @Nullable
     private static CompletableFuture<Void> roomsLoaded;
     /**
@@ -109,12 +106,12 @@ public class DungeonSecrets {
     }
 
     @SuppressWarnings("unused")
-    public static JsonObject getRoomsJson() {
-        return roomsJson;
+    public static JsonObject getRoomMetadata(String room) {
+        return roomsJson.get(room).getAsJsonObject();
     }
 
-    public static JsonObject getWaypointsJson() {
-        return waypointsJson;
+    public static JsonArray getRoomWaypoints(String room) {
+        return waypointsJson.get(room).getAsJsonArray();
     }
 
     /**
@@ -125,7 +122,8 @@ public class DungeonSecrets {
         if (SkyblockerConfig.get().locations.dungeons.noInitSecretWaypoints) {
             return;
         }
-        CompletableFuture.runAsync(DungeonSecrets::load).exceptionally(e -> {
+        // Execute with MinecraftClient as executor since we need to wait for MinecraftClient#resourceManager to be set
+        CompletableFuture.runAsync(DungeonSecrets::load, MinecraftClient.getInstance()).exceptionally(e -> {
             LOGGER.error("[Skyblocker] Failed to load dungeon secrets", e);
             return null;
         });
@@ -133,78 +131,56 @@ public class DungeonSecrets {
         WorldRenderEvents.AFTER_TRANSLUCENT.register(DungeonSecrets::render);
         ClientReceiveMessageEvents.GAME.register(DungeonSecrets::onChatMessage);
         ClientReceiveMessageEvents.GAME_CANCELED.register(DungeonSecrets::onChatMessage);
-        UseBlockCallback.EVENT.register((world, hand, hitResult, hitResult2) -> onUseBlock(hand, hitResult2));
+        UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> onUseBlock(world, hitResult));
     }
 
     private static void load() {
+        long startTime = System.currentTimeMillis();
         List<CompletableFuture<Void>> dungeonFutures = new ArrayList<>();
-        URL dungeonsURL = SkyblockerMod.class.getResource(DUNGEONS_DATA_DIR);
-        if (dungeonsURL == null) {
-            LOGGER.error("[Skyblocker] Failed to load dungeon secrets, unable to find dungeon rooms data directory");
-            return;
-        }
-        Path dungeonsDir = Path.of(dungeonsURL.getPath());
-        if ("jar".equals(dungeonsURL.getProtocol())) {
-            try {
-                dungeonsDir = FileSystems.getFileSystem(dungeonsURL.toURI()).getPath(DUNGEONS_DATA_DIR);
-            } catch (URISyntaxException e) {
-                LOGGER.error("[Skyblocker] Failed to load dungeon secrets, unable to open dungeon rooms data directory", e);
-                return;
+        for (Map.Entry<Identifier, Resource> resourceEntry : MinecraftClient.getInstance().getResourceManager().findResources(DUNGEONS_PATH, id -> id.getPath().endsWith(".skeleton")).entrySet()) {
+            String[] path = resourceEntry.getKey().getPath().split("/");
+            if (path.length != 4) {
+                LOGGER.error("[Skyblocker] Failed to load dungeon secrets, invalid resource identifier {}", resourceEntry.getKey());
+                break;
             }
-        }
-        int resourcePathIndex = dungeonsDir.toString().indexOf(DUNGEONS_DATA_DIR);
-        try (DirectoryStream<Path> dungeons = Files.newDirectoryStream(dungeonsDir, Files::isDirectory)) {
-            for (Path dungeon : dungeons) {
-                try (DirectoryStream<Path> roomShapes = Files.newDirectoryStream(dungeon, Files::isDirectory)) {
-                    List<CompletableFuture<Void>> roomShapeFutures = new ArrayList<>();
-                    HashMap<String, Map<String, int[]>> roomShapesMap = new HashMap<>();
-                    for (Path roomShape : roomShapes) {
-                        roomShapeFutures.add(CompletableFuture.supplyAsync(() -> readRooms(roomShape, resourcePathIndex)).thenAccept(rooms -> roomShapesMap.put(roomShape.getFileName().toString(), rooms)));
-                    }
-                    ROOMS_DATA.put(dungeon.getFileName().toString(), roomShapesMap);
-                    dungeonFutures.add(CompletableFuture.allOf(roomShapeFutures.toArray(CompletableFuture[]::new)).thenRun(() -> LOGGER.info("[Skyblocker] Loaded dungeon secrets for dungeon {} with {} room shapes and {} rooms total", dungeon.getFileName(), roomShapesMap.size(), roomShapesMap.values().stream().mapToInt(Map::size).sum()))); // TODO Change back to debug
-                } catch (IOException e) {
-                    LOGGER.error("[Skyblocker] Failed to load dungeon secrets for dungeon " + dungeon.getFileName(), e);
+            String dungeon = path[1];
+            String roomShape = path[2];
+            String room = path[3].substring(0, path[3].length() - ".skeleton".length());
+            ROOMS_DATA.computeIfAbsent(dungeon, dungeonKey -> new HashMap<>());
+            ROOMS_DATA.get(dungeon).computeIfAbsent(roomShape, roomShapeKey -> new HashMap<>());
+            dungeonFutures.add(CompletableFuture.supplyAsync(() -> readRoom(resourceEntry.getValue())).thenAcceptAsync(rooms -> {
+                Map<String, int[]> roomsMap = ROOMS_DATA.get(dungeon).get(roomShape);
+                synchronized (roomsMap) {
+                    roomsMap.put(room, rooms);
                 }
-            }
-        } catch (IOException e) {
-            LOGGER.error("[Skyblocker] Failed to load dungeon secrets", e);
+                LOGGER.debug("[Skyblocker] Loaded dungeon secrets dungeon {} room shape {} room {}", dungeon, roomShape, room);
+            }).exceptionally(e -> {
+                LOGGER.error("[Skyblocker] Failed to load dungeon secrets dungeon {} room shape {} room {}", dungeon, roomShape, room, e);
+                return null;
+            }));
         }
-        // Execute with MinecraftClient as executor since we need to wait for MinecraftClient#resourceManager to be set
         dungeonFutures.add(CompletableFuture.runAsync(() -> {
             try (BufferedReader roomsReader = MinecraftClient.getInstance().getResourceManager().openAsReader(new Identifier(SkyblockerMod.NAMESPACE, "dungeons/dungeonrooms.json")); BufferedReader waypointsReader = MinecraftClient.getInstance().getResourceManager().openAsReader(new Identifier(SkyblockerMod.NAMESPACE, "dungeons/secretlocations.json"))) {
-                roomsJson = SkyblockerMod.GSON.fromJson(roomsReader, JsonObject.class);
-                waypointsJson = SkyblockerMod.GSON.fromJson(waypointsReader, JsonObject.class);
-                LOGGER.info("[Skyblocker] Loaded dungeon secrets json"); // TODO Change back to debug
+                SkyblockerMod.GSON.fromJson(roomsReader, JsonObject.class).asMap().forEach((room, jsonElement) -> roomsJson.put(room.toLowerCase(), jsonElement));
+                SkyblockerMod.GSON.fromJson(waypointsReader, JsonObject.class).asMap().forEach((room, jsonElement) -> waypointsJson.put(room.toLowerCase(), jsonElement));
+                LOGGER.debug("[Skyblocker] Loaded dungeon secrets json");
             } catch (Exception e) {
                 LOGGER.error("[Skyblocker] Failed to load dungeon secrets json", e);
             }
-        }, MinecraftClient.getInstance()));
-        roomsLoaded = CompletableFuture.allOf(dungeonFutures.toArray(CompletableFuture[]::new)).thenRun(() -> LOGGER.info("[Skyblocker] Loaded dungeon secrets for {} dungeon(s), {} room shapes, and {} rooms total", ROOMS_DATA.size(), ROOMS_DATA.values().stream().mapToInt(Map::size).sum(), ROOMS_DATA.values().stream().map(Map::values).flatMap(Collection::stream).mapToInt(Map::size).sum())).exceptionally(e -> {
+        }));
+        roomsLoaded = CompletableFuture.allOf(dungeonFutures.toArray(CompletableFuture[]::new)).thenRun(() -> LOGGER.info("[Skyblocker] Loaded dungeon secrets for {} dungeon(s), {} room shapes, and {} rooms total in {} ms", ROOMS_DATA.size(), ROOMS_DATA.values().stream().mapToInt(Map::size).sum(), ROOMS_DATA.values().stream().map(Map::values).flatMap(Collection::stream).mapToInt(Map::size).sum(), System.currentTimeMillis() - startTime)).exceptionally(e -> {
             LOGGER.error("[Skyblocker] Failed to load dungeon secrets", e);
             return null;
         });
+        LOGGER.info("[Skyblocker] Started loading dungeon secrets in (blocked main thread for) {} ms", System.currentTimeMillis() - startTime);
     }
 
-    private static HashMap<String, int[]> readRooms(Path roomShape, int resourcePathIndex) {
-        try (DirectoryStream<Path> rooms = Files.newDirectoryStream(roomShape, Files::isRegularFile)) {
-            HashMap<String, int[]> roomsData = new HashMap<>();
-            for (Path room : rooms) {
-                String name = room.getFileName().toString();
-                //noinspection DataFlowIssue
-                try (ObjectInputStream in = new ObjectInputStream(new InflaterInputStream(SkyblockerMod.class.getResourceAsStream(room.toString().substring(resourcePathIndex))))) {
-                    roomsData.put(name.substring(0, name.length() - 9), (int[]) in.readObject());
-                    LOGGER.info("[Skyblocker] Loaded dungeon secrets room {}", name); // TODO Change back to debug
-                } catch (NullPointerException | IOException | ClassNotFoundException e) {
-                    LOGGER.error("[Skyblocker] Failed to load dungeon secrets room " + name, e);
-                }
-            }
-            LOGGER.info("[Skyblocker] Loaded dungeon secrets room shape {} with {} rooms", roomShape.getFileName(), roomsData.size()); // TODO Change back to debug
-            return roomsData;
-        } catch (IOException e) {
-            LOGGER.error("[Skyblocker] Failed to load dungeon secrets room shape " + roomShape.getFileName(), e);
+    private static int[] readRoom(Resource resource) throws RuntimeException {
+        try (ObjectInputStream in = new ObjectInputStream(new InflaterInputStream(resource.getInputStream()))) {
+            return (int[]) in.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
         }
-        return null;
     }
 
     /**
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
index d4956d9c..0904a7f1 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
@@ -77,7 +77,7 @@ public class Room {
         IntSortedSet segmentsX = IntSortedSets.unmodifiable(new IntRBTreeSet(segments.stream().mapToInt(Vector2ic::x).toArray()));
         IntSortedSet segmentsY = IntSortedSets.unmodifiable(new IntRBTreeSet(segments.stream().mapToInt(Vector2ic::y).toArray()));
         shape = getShape(segmentsX, segmentsY);
-        roomsData = DungeonSecrets.ROOMS_DATA.getOrDefault("catacombs", Collections.emptyMap()).getOrDefault(shape.shape, Collections.emptyMap());
+        roomsData = DungeonSecrets.ROOMS_DATA.getOrDefault("catacombs", Collections.emptyMap()).getOrDefault(shape.shape.toLowerCase(), Collections.emptyMap());
         possibleRooms = getPossibleRooms(segmentsX, segmentsY);
     }
 
@@ -287,7 +287,7 @@ public class Room {
     private void roomMatched(Triple<Direction, Vector2ic, List<String>> directionRooms) {
         Table<Integer, BlockPos, SecretWaypoint> secretWaypointsMutable = HashBasedTable.create();
         String name = directionRooms.getRight().get(0);
-        for (JsonElement waypointElement : DungeonSecrets.getWaypointsJson().get(name).getAsJsonArray()) {
+        for (JsonElement waypointElement : DungeonSecrets.getRoomWaypoints(name)) {
             JsonObject waypoint = waypointElement.getAsJsonObject();
             String secretName = waypoint.get("secretName").getAsString();
             int secretIndex = Integer.parseInt(secretName.substring(0, Character.isDigit(secretName.charAt(1)) ? 2 : 1));
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Admin-0.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/admin-0.skeleton
index 4a6e7b6d..4a6e7b6d 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Admin-0.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/admin-0.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Andesite-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/andesite-2.skeleton
index cae377ea..cae377ea 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Andesite-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/andesite-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Arrow-Trap-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/arrow-trap-1.skeleton
index 36db1b7b..36db1b7b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Arrow-Trap-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/arrow-trap-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Banners-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/banners-1.skeleton
index 079636fb..079636fb 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Banners-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/banners-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Basement-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/basement-1.skeleton
index 5a2f67f6..5a2f67f6 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Basement-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/basement-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Beams-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/beams-2.skeleton
index 4c20b922..4c20b922 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Beams-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/beams-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Big-Red-Flag-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/big-red-flag-2.skeleton
index e37bc261..e37bc261 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Big-Red-Flag-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/big-red-flag-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Black-Flag-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/black-flag-3.skeleton
index 83ba9611..83ba9611 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Black-Flag-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/black-flag-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Blue-Skulls-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/blue-skulls-1.skeleton
index 5c7ac64b..5c7ac64b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Blue-Skulls-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/blue-skulls-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cage-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cage-1.skeleton
index cfb44319..cfb44319 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cage-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cage-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cages-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cages-2.skeleton
index da571dee..da571dee 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cages-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cages-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Carpets-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/carpets-1.skeleton
index ffaee635..ffaee635 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Carpets-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/carpets-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cell-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cell-1.skeleton
index 52bea510..52bea510 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cell-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cell-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Chains-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/chains-2.skeleton
index a3eedd3b..a3eedd3b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Chains-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/chains-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cobble-Wall-Pillar-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cobble-wall-pillar-2.skeleton
index 2ac65faf..2ac65faf 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Cobble-Wall-Pillar-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/cobble-wall-pillar-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dip-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dip-2.skeleton
index 64d5fe51..64d5fe51 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dip-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dip-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dome-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dome-2.skeleton
index a4f6fd54..a4f6fd54 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dome-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dome-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Double-Diamond-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/double-diamond-3.skeleton
index c154b59a..c154b59a 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Double-Diamond-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/double-diamond-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Drop-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/drop-2.skeleton
index 989267fc..989267fc 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Drop-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/drop-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dueces-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dueces-3.skeleton
index bf29380c..bf29380c 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Dueces-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/dueces-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Duncan-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/duncan-1.skeleton
index 42521028..42521028 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Duncan-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/duncan-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/End-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/end-2.skeleton
index e47cf4b3..e47cf4b3 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/End-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/end-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Golden-Oasis-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/golden-oasis-1.skeleton
index f0086a61..f0086a61 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Golden-Oasis-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/golden-oasis-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Granite-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/granite-2.skeleton
index a65ead2e..a65ead2e 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Granite-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/granite-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Hall-0.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/hall-0.skeleton
index 05acbc62..05acbc62 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Hall-0.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/hall-0.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Hanging-Vines-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/hanging-vines-1.skeleton
index a396353f..a396353f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Hanging-Vines-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/hanging-vines-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Jumping-Skulls-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/jumping-skulls-1.skeleton
index 48f49a64..48f49a64 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Jumping-Skulls-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/jumping-skulls-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Knight-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/knight-3.skeleton
index 485a5cfa..485a5cfa 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Knight-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/knight-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Lava-Pool-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/lava-pool-3.skeleton
index 501c637b..501c637b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Lava-Pool-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/lava-pool-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Leaves-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/leaves-1.skeleton
index 9985deb2..9985deb2 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Leaves-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/leaves-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Locked-Away-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/locked-away-1.skeleton
index 8a2115fb..8a2115fb 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Locked-Away-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/locked-away-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Logs-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/logs-4.skeleton
index 5447af64..5447af64 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Logs-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/logs-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Long-Hall-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/long-hall-3.skeleton
index 92d9c2a8..92d9c2a8 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Long-Hall-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/long-hall-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Lots-Of-Floors-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/lots-of-floors-3.skeleton
index 0d687f02..0d687f02 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Lots-Of-Floors-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/lots-of-floors-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mini-Rail-Track-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mini-rail-track-3.skeleton
index 246b6fef..246b6fef 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mini-Rail-Track-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mini-rail-track-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mirror-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mirror-1.skeleton
index b14209fe..b14209fe 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mirror-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mirror-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Multicolored-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/multicolored-1.skeleton
index 9ccd204f..9ccd204f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Multicolored-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/multicolored-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mural-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mural-1.skeleton
index 199016ea..199016ea 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mural-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mural-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mushroom-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mushroom-1.skeleton
index f68daba8..f68daba8 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Mushroom-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/mushroom-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Overgrown-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/overgrown-3.skeleton
index ab959d50..ab959d50 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Overgrown-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/overgrown-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Overgrown-Chains-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/overgrown-chains-2.skeleton
index 58ecaa82..58ecaa82 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Overgrown-Chains-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/overgrown-chains-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Painting-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/painting-2.skeleton
index c3dfe2a9..c3dfe2a9 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Painting-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/painting-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Perch-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/perch-2.skeleton
index 60591e3e..60591e3e 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Perch-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/perch-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Pillars-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/pillars-1.skeleton
index c541a5f2..c541a5f2 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Pillars-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/pillars-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Prison-Cell-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/prison-cell-1.skeleton
index b74d3c54..b74d3c54 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Prison-Cell-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/prison-cell-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Quad-Lava-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/quad-lava-2.skeleton
index 3cfcbc75..3cfcbc75 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Quad-Lava-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/quad-lava-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Raccoon-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/raccoon-4.skeleton
index c6519f21..c6519f21 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Raccoon-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/raccoon-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Red-Green-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/red-green-3.skeleton
index 8f809da9..8f809da9 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Red-Green-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/red-green-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Redstone-Key-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/redstone-key-3.skeleton
index 26335d52..26335d52 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Redstone-Key-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/redstone-key-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sand-Dragon-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sand-dragon-1.skeleton
index 8a52d17c..8a52d17c 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sand-Dragon-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sand-dragon-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sarcophagus-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sarcophagus-3.skeleton
index 8baf911d..8baf911d 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sarcophagus-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sarcophagus-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Scaffolding-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/scaffolding-2.skeleton
index e4c78ca4..e4c78ca4 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Scaffolding-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/scaffolding-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Silvers-Sword-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/silvers-sword-1.skeleton
index 70831a58..70831a58 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Silvers-Sword-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/silvers-sword-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Slabs-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/slabs-2.skeleton
index 23ada193..23ada193 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Slabs-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/slabs-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sloth-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sloth-1.skeleton
index cf2d4bb9..cf2d4bb9 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Sloth-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/sloth-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Small-Stairs-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/small-stairs-2.skeleton
index 18582004..18582004 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Small-Stairs-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/small-stairs-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Spikes-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/spikes-3.skeleton
index 3d911440..3d911440 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Spikes-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/spikes-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Steps-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/steps-1.skeleton
index 35a883b5..35a883b5 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Steps-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/steps-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Stone-Window-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/stone-window-2.skeleton
index cd056d91..cd056d91 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Stone-Window-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/stone-window-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Temple-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton
index be716268..be716268 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Temple-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Tombstone-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/tombstone-2.skeleton
index 689bcab6..689bcab6 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Tombstone-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/tombstone-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Tomioka-0.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/tomioka-0.skeleton
index a6bdd9f4..a6bdd9f4 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Tomioka-0.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/tomioka-0.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Water-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/water-2.skeleton
index f2fa3908..f2fa3908 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Water-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/water-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Waterfall-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/waterfall-2.skeleton
index f341fa86..f341fa86 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/Waterfall-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/waterfall-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Archway-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/archway-3.skeleton
index 7e69d80e..7e69d80e 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Archway-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/archway-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Balcony-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/balcony-4.skeleton
index 303578cc..303578cc 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Balcony-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/balcony-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Bridges-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/bridges-6.skeleton
index 5e19fb64..5e19fb64 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Bridges-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/bridges-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Crypt-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/crypt-5.skeleton
index bb58349a..bb58349a 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Crypt-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/crypt-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Doors-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/doors-5.skeleton
index 8ca2df3c..8ca2df3c 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Doors-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/doors-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Gold-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/gold-1.skeleton
index b971e5a1..b971e5a1 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Gold-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/gold-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Grand-Library-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/grand-library-4.skeleton
index 4df68f94..4df68f94 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Grand-Library-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/grand-library-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Grass-Ruin-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/grass-ruin-3.skeleton
index bf0d41ca..bf0d41ca 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Grass-Ruin-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/grass-ruin-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Mage-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/mage-4.skeleton
index b34e6d59..b34e6d59 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Mage-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/mage-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Pedestal-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/pedestal-5.skeleton
index 333829e8..333829e8 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Pedestal-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/pedestal-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Pressure-Plates-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/pressure-plates-6.skeleton
index e0a778af..e0a778af 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Pressure-Plates-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/pressure-plates-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Purple-Flags-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/purple-flags-5.skeleton
index e2e94b92..e2e94b92 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Purple-Flags-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/purple-flags-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Redstone-Warrior-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/redstone-warrior-3.skeleton
index e85b8d82..e85b8d82 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Redstone-Warrior-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/redstone-warrior-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Skull-2.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/skull-2.skeleton
index 10ba8905..10ba8905 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/Skull-2.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x2/skull-2.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Catwalk-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/catwalk-6.skeleton
index 9762e8f6..9762e8f6 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Catwalk-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/catwalk-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Deathmite-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/deathmite-6.skeleton
index ad7b9b6d..ad7b9b6d 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Deathmite-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/deathmite-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Diagonal-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/diagonal-4.skeleton
index 39413108..39413108 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Diagonal-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/diagonal-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Gravel-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/gravel-6.skeleton
index 7d775d97..7d775d97 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Gravel-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/gravel-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Red-Blue-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/red-blue-4.skeleton
index 4480dd9e..4480dd9e 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Red-Blue-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/red-blue-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Wizard-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/wizard-4.skeleton
index 963bc22b..963bc22b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/Wizard-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x3/wizard-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Hallway-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/hallway-3.skeleton
index 02c763d8..02c763d8 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Hallway-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/hallway-3.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Mossy-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/mossy-4.skeleton
index 0cec4adb..0cec4adb 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Mossy-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/mossy-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Pit-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/pit-5.skeleton
index 3e8b16f2..3e8b16f2 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Pit-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/pit-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Quartz-Knight-7.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/quartz-knight-7.skeleton
index 64031038..64031038 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Quartz-Knight-7.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/quartz-knight-7.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Waterfall-8.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/waterfall-8.skeleton
index 3f8ac340..3f8ac340 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/Waterfall-8.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x4/waterfall-8.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Atlas-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/atlas-6.skeleton
index 88f4f999..88f4f999 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Atlas-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/atlas-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Buttons-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/buttons-5.skeleton
index f6a9fd11..f6a9fd11 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Buttons-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/buttons-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Cathedral-8.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/cathedral-8.skeleton
index a232314f..a232314f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Cathedral-8.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/cathedral-8.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Flags-7.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/flags-7.skeleton
index 0166dde1..0166dde1 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Flags-7.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/flags-7.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Mithril-Cave-10.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/mithril-cave-10.skeleton
index 2b8e7bfa..2b8e7bfa 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Mithril-Cave-10.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/mithril-cave-10.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Museum-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/museum-5.skeleton
index 92c569db..92c569db 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Museum-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/museum-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Rail-Track-9.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/rail-track-9.skeleton
index 23488270..23488270 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Rail-Track-9.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/rail-track-9.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Stairs-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/stairs-4.skeleton
index a418889b..a418889b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Stairs-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/stairs-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Super-Tall-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/super-tall-6.skeleton
index 2dd15841..2dd15841 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/Super-Tall-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/2x2/super-tall-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Chambers-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/chambers-5.skeleton
index ceba8118..ceba8118 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Chambers-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/chambers-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Dino-Dig-Site-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/dino-dig-site-4.skeleton
index d3ef733c..d3ef733c 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Dino-Dig-Site-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/dino-dig-site-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Lava-Ravine-6.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/lava-ravine-6.skeleton
index e5d5e2c9..e5d5e2c9 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Lava-Ravine-6.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/lava-ravine-6.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Layers-8.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/layers-8.skeleton
index 20e13788..20e13788 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Layers-8.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/layers-8.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Market-5.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/market-5.skeleton
index 956f3b43..956f3b43 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Market-5.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/market-5.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Melon-7.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/melon-7.skeleton
index 52ccb0b4..52ccb0b4 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Melon-7.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/melon-7.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Spider-9.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/spider-9.skeleton
index 8585fa4f..8585fa4f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Spider-9.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/spider-9.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Well-7.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/well-7.skeleton
index 9aec080b..9aec080b 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Well-7.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/well-7.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Withermancers-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/withermancers-4.skeleton
index 2a4a4be7..2a4a4be7 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/L-shape/Withermancers-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/l-shape/withermancers-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Blaze-Room-1-High.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/blaze-room-1-high.skeleton
index 5b675d2a..5b675d2a 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Blaze-Room-1-High.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/blaze-room-1-high.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Blaze-Room-1-Low.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/blaze-room-1-low.skeleton
index e202a07e..e202a07e 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Blaze-Room-1-Low.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/blaze-room-1-low.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Boxes-Room.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/boxes-room.skeleton
index 08d13545..08d13545 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Boxes-Room.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/boxes-room.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Creeper-Room.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/creeper-room.skeleton
index 19dce9dc..19dce9dc 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Creeper-Room.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/creeper-room.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Defusal.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/defusal.skeleton
index 62f17590..62f17590 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Defusal.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/defusal.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Ice-Path.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/ice-path.skeleton
index cacf34fb..cacf34fb 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Ice-Path.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/ice-path.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Ice-Silverfish-Room.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/ice-silverfish-room.skeleton
index 373b67a0..373b67a0 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Ice-Silverfish-Room.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/ice-silverfish-room.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Teleport-Pad-Room.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/teleport-pad-room.skeleton
index ebd42e78..ebd42e78 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Teleport-Pad-Room.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/teleport-pad-room.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Three-Chests.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/three-chests.skeleton
index 53d7fabc..53d7fabc 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Three-Chests.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/three-chests.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Tic-Tac-Toe-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/tic-tac-toe-1.skeleton
index c6505f28..c6505f28 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Tic-Tac-Toe-1.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/tic-tac-toe-1.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Trivia-Room.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/trivia-room.skeleton
index d29f2617..d29f2617 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Trivia-Room.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/trivia-room.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Water Puzzle.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/water-puzzle.skeleton
index 01b75e71..01b75e71 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Puzzle/Water Puzzle.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/puzzle/water-puzzle.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Trap/Trap-Hard-4.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/trap/trap-hard-4.skeleton
index d835c800..d835c800 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Trap/Trap-Hard-4.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/trap/trap-hard-4.skeleton
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/Trap/Trap-Very-Hard-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/trap/trap-very-hard-3.skeleton
index 54afc16f..54afc16f 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/Trap/Trap-Very-Hard-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/trap/trap-very-hard-3.skeleton
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
index 7260bff8..c103bb3d 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
@@ -50,9 +50,9 @@ public class DungeonRoomsDFU {
                     List<CompletableFuture<Void>> roomShapeFutures = new ArrayList<>();
                     HashMap<String, HashMap<String, long[]>> roomShapesMap = new HashMap<>();
                     for (Path roomShape : roomShapes) {
-                        roomShapeFutures.add(CompletableFuture.supplyAsync(() -> readRooms(roomShape, resourcePathIndex)).thenAccept(rooms -> roomShapesMap.put(roomShape.getFileName().toString(), rooms)));
+                        roomShapeFutures.add(CompletableFuture.supplyAsync(() -> readRooms(roomShape, resourcePathIndex)).thenAccept(rooms -> roomShapesMap.put(roomShape.getFileName().toString().toLowerCase(), rooms)));
                     }
-                    OLD_ROOMS.put(dungeon.getFileName().toString(), roomShapesMap);
+                    OLD_ROOMS.put(dungeon.getFileName().toString().toLowerCase(), roomShapesMap);
                     dungeonFutures.add(CompletableFuture.allOf(roomShapeFutures.toArray(CompletableFuture[]::new)).thenRun(() -> LOGGER.info("Loaded dungeon secrets for dungeon {} with {} room shapes and {} rooms total", dungeon.getFileName(), roomShapesMap.size(), roomShapesMap.values().stream().mapToInt(HashMap::size).sum())));
                 } catch (IOException e) {
                     LOGGER.error("Failed to load dungeon secrets for dungeon " + dungeon.getFileName(), e);
@@ -71,7 +71,7 @@ public class DungeonRoomsDFU {
                 String name = room.getFileName().toString();
                 //noinspection DataFlowIssue
                 try (ObjectInputStream in = new ObjectInputStream(new InflaterInputStream(DungeonRoomsDFU.class.getResourceAsStream(room.toString().substring(resourcePathIndex))))) {
-                    roomsData.put(name.substring(0, name.length() - 9), (long[]) in.readObject());
+                    roomsData.put(name.substring(0, name.length() - 9).toLowerCase(), (long[]) in.readObject());
                     LOGGER.info("Loaded dungeon secrets room {}", name);
                 } catch (NullPointerException | IOException | ClassNotFoundException e) {
                     LOGGER.error("Failed to load dungeon secrets room " + name, e);