aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide/dungeon
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-02-15 16:02:52 +0900
committersyeyoung <cyong06@naver.com>2021-02-15 16:02:52 +0900
commitac68bb00dc062b9c4f3f1fd4a2ac4ff8678275b5 (patch)
tree3908fa3dd09935c541ea87ee8e7300fa969d5477 /src/main/java/kr/syeyoung/dungeonsguide/dungeon
parent4cdd6e46fcdff39e8924f81f37fcfb4575fb3ffd (diff)
downloadSkyblock-Dungeons-Guide-ac68bb00dc062b9c4f3f1fd4a2ac4ff8678275b5.tar.gz
Skyblock-Dungeons-Guide-ac68bb00dc062b9c4f3f1fd4a2ac4ff8678275b5.tar.bz2
Skyblock-Dungeons-Guide-ac68bb00dc062b9c4f3f1fd4a2ac4ff8678275b5.zip
remove weird things, fix offsetpoints
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/dungeon')
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java2
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java1
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java4
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java1
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java4
5 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
index 0852ef79..2515698f 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
@@ -226,7 +226,7 @@ public class MapProcessor {
DungeonRoom rooms = buildRoom(mapData, new Point(x,y));
if (rooms == null) continue;
e.sendDebugChat(new ChatComponentText("New Map discovered! shape: "+rooms.getShape()+ " color: "+rooms.getColor()+" unitPos: "+x+","+y));
- e.sendDebugChat(new ChatComponentText("New Map discovered! mapMin: "+rooms.getMin()));
+ e.sendDebugChat(new ChatComponentText("New Map discovered! mapMin: "+rooms.getMin() + " mapMx: "+rooms.getMax()));
StringBuilder builder = new StringBuilder();
for (int dy =0;dy<4;dy++) {
builder.append("\n");
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java
index 2d1912c5..b9508ae4 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionInteract.java
@@ -40,7 +40,6 @@ public class ActionInteract extends AbstractAction {
private boolean interacted = false;
@Override
public void onLivingInteract(DungeonRoom dungeonRoom, PlayerInteractEntityEvent event) {
- System.out.println("eve");
if (interacted) return;
Vec3 spawnLoc = DungeonActionManager.getSpawnLocation().get(event.getEntity().getEntityId());
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java
index 78ae7ab9..284a9590 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/data/OffsetPoint.java
@@ -50,9 +50,9 @@ public class OffsetPoint implements Cloneable, Serializable {
for (int i = 0; i < dungeonRoom.getRoomMatcher().getRotation(); i++) {
rot2 = VectorUtils.rotateCounterClockwise(rot2);
if (i % 2 == 0) {
- rot2.y += dungeonRoom.getMax().getX() - dungeonRoom.getMin().getX() + 1;
- } else {
rot2.y += dungeonRoom.getMax().getZ() - dungeonRoom.getMin().getZ() + 1;
+ } else {
+ rot2.y += dungeonRoom.getMax().getX() - dungeonRoom.getMin().getX() + 1;
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java
index 1bd708d3..19f2fd3c 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java
@@ -61,7 +61,6 @@ public class DungeonRoomInfoRegistry {
public static void saveAll(File dir) {
dir.mkdirs();
boolean isDev = Minecraft.getMinecraft().getSession().getPlayerID().replace("-","").equals("e686fe0aab804a71ac7011dc8c2b534c");
- System.out.println(isDev);
String nameidstring = "name,uuid,processsor,secrets";
String ids = "";
for (DungeonRoomInfo dungeonRoomInfo : registered) {
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 c4bc596c..d8b7c47b 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java
@@ -35,6 +35,7 @@ public class RoomMatcher {
for (int x = 0; x < xx; x++) {
if (x % 8 == 0 && z % 8 == 0 && dungeonRoom.getContext().getWorld().getChunkFromBlockCoords(dungeonRoom.getRelativeBlockPosAt(x, 0, z)).isEmpty()) {
throw new IllegalStateException("chunk is not loaded");
+
}
}
}
@@ -61,8 +62,6 @@ public class RoomMatcher {
private boolean tryMatching(DungeonRoomInfo dungeonRoomInfo, int rotation) {
if (dungeonRoomInfo.getColor() != dungeonRoom.getColor()) return false;
- System.out.println("Matching "+dungeonRoomInfo.getName()+" At "+rotation);
-
int[][] res = dungeonRoomInfo.getBlocks();
for (int i = 0; i < rotation; i++)
res = ArrayUtils.rotateCounterClockwise(res);
@@ -74,7 +73,6 @@ public class RoomMatcher {
Block b = dungeonRoom.getRelativeBlockAt(x,0,z);
if (b == null || Block.getIdFromBlock(b) != data) {
- System.out.println("Failed At "+x+"."+z + " "+data+" found " + Block.getIdFromBlock(b) +" found");
return false;
}
}