diff options
| author | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2020-11-24 23:57:48 +0900 |
|---|---|---|
| committer | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2020-11-24 23:57:48 +0900 |
| commit | bbec09457a7de298834aaa6caac0c24b5fe5917d (patch) | |
| tree | f460ff152841f58c5fa8e283ce634d9d00016268 /src/main | |
| parent | 6f5c9e48ca18f6eb428284711f4ed5ce5419fb12 (diff) | |
| download | Skyblock-Dungeons-Guide-bbec09457a7de298834aaa6caac0c24b5fe5917d.tar.gz Skyblock-Dungeons-Guide-bbec09457a7de298834aaa6caac0c24b5fe5917d.tar.bz2 Skyblock-Dungeons-Guide-bbec09457a7de298834aaa6caac0c24b5fe5917d.zip | |
blah blah
Diffstat (limited to 'src/main')
3 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java index cd99b1d0..15929c2e 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java @@ -47,7 +47,7 @@ public class DungeonsGuide @EventHandler public void pre(FMLPreInitializationEvent event) { - configDir = event.getModConfigurationDirectory(); + configDir = new File(event.getModConfigurationDirectory(),"pog"); } public SkyblockStatus getSkyblockStatus() { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java index 2a2e402c..7dc25774 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java @@ -259,7 +259,7 @@ public class MapProcessor { } if (lastMapData == null && mapData != null) buildMap(mapData); - processMap(mapData); + else if (mapData != null) processMap(mapData); lastMapData = mapData; } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java index b31193c7..c64d15f1 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java @@ -49,14 +49,18 @@ public class RoomMatcher { for (int i = 0; i < rotation; i++) res = ArrayUtils.rotateCounterClockwise(res); + System.out.println("Trying to match "+dungeonRoomInfo.getUuid().toString()+" / "+dungeonRoomInfo.getName()+"... at rotation "+rotation); + int y = dungeonRoom.getMin().getY(); for (int z = 0; z < res.length; z ++) { for (int x = 0; x < res[0].length; x++) { - int data = res[y][x]; + int data = res[z][x]; if (data == -1) continue; Block b = dungeonRoom.getRelativeBlockAt(x,y,z); - if (b == null) return false; - if (Block.getIdFromBlock(b) != data) return false; + if (b == null || Block.getIdFromBlock(b) != data) { + System.out.println("Match failed at offset X"+x+" / Z"+z+". expected "+data+" but found "+b +" ("+Block.getIdFromBlock(b)+")"); + return false; + } } } return true; |