diff options
author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-08-18 14:09:05 +0800 |
---|---|---|
committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-08-30 22:49:55 -0400 |
commit | 6567b0d3819b3e2bbc0b272cbfc2858acc96fb50 (patch) | |
tree | d341786d637e0da77fca2c04e60391fea6190d57 /src/test/java/me/xmrvizzy/skyblocker/skyblock | |
parent | 8c3811c28c8d11f107a3129d866cc2908f1e2389 (diff) | |
download | Skyblocker-6567b0d3819b3e2bbc0b272cbfc2858acc96fb50.tar.gz Skyblocker-6567b0d3819b3e2bbc0b272cbfc2858acc96fb50.tar.bz2 Skyblocker-6567b0d3819b3e2bbc0b272cbfc2858acc96fb50.zip |
Migrate dungeon rooms data to resource system
Diffstat (limited to 'src/test/java/me/xmrvizzy/skyblocker/skyblock')
-rw-r--r-- | src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java | 6 |
1 files changed, 3 insertions, 3 deletions
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); |