diff options
11 files changed, 16 insertions, 21 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java index 6e30de54..7e27c584 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java @@ -180,7 +180,6 @@ public class CommandDungeonsGuide extends CommandBase { } else if (args[0].equals("process") && Minecraft.getMinecraft().getSession().getPlayerID().replace("-", "").equals("e686fe0aab804a71ac7011dc8c2b534c")) { File root = DungeonsGuide.getDungeonsGuide().getConfigDir(); File dir = new File(root, "processorinput"); - File outpuzzle = new File(root, "processoroutpuzzle"); File outsecret = new File(root, "processoroutsecret"); for (File f : dir.listFiles()) { if (!f.getName().endsWith(".roomdata")) continue; @@ -197,14 +196,6 @@ public class CommandDungeonsGuide extends CommandBase { oos.writeObject(dri); oos.flush(); oos.close(); - - dri.getMechanics().clear(); - - fos = new FileOutputStream(new File(outpuzzle, dri.getUuid().toString() + ".roomdata")); - oos = new ObjectOutputStream(fos); - oos.writeObject(dri); - oos.flush(); - oos.close(); } catch (Exception e) { e.printStackTrace(); } @@ -225,34 +216,36 @@ public class CommandDungeonsGuide extends CommandBase { if (value instanceof DungeonSecret && (((DungeonSecret) value).getSecretType() == DungeonSecret.SecretType.BAT || ((DungeonSecret) value).getSecretType() == DungeonSecret.SecretType.CHEST) - && ((DungeonSecret) value).getSecretPoint().getY() == 0) { + && ((DungeonSecret) value).getSecretPoint().getY() == 0 ) { OffsetPoint offsetPoint = ((DungeonSecret) value).getSecretPoint(); - dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; - System.out.println("Fixing " + value2.getKey() + " - as secret " + ((DungeonSecret) value).getSecretType() + " - at " + ((DungeonSecret) value).getSecretPoint()); + if (dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] != -1) { + dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; + System.out.println("Fixing " + value2.getKey() + " - as secret " + ((DungeonSecret) value).getSecretType() + " - at " + ((DungeonSecret) value).getSecretPoint()); + } } else if (value instanceof DungeonOnewayDoor) { for (OffsetPoint offsetPoint : ((DungeonOnewayDoor) value).getSecretPoint().getOffsetPointList()) { - if (offsetPoint.getY() == 0) { + if (offsetPoint.getY() == 0&& dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] != -1) { dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; System.out.println("Fixing " + value2.getKey() + " - o-door - at " + offsetPoint); } } } else if (value instanceof DungeonDoor) { for (OffsetPoint offsetPoint : ((DungeonDoor) value).getSecretPoint().getOffsetPointList()) { - if (offsetPoint.getY() == 0) { + if (offsetPoint.getY() == 0&& dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] != -1) { dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; System.out.println("Fixing " + value2.getKey() + " - door - at " + offsetPoint); } } } else if (value instanceof DungeonBreakableWall) { for (OffsetPoint offsetPoint : ((DungeonBreakableWall) value).getSecretPoint().getOffsetPointList()) { - if (offsetPoint.getY() == 0) { + if (offsetPoint.getY() == 0&& dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] != -1) { dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; System.out.println("Fixing " + value2.getKey() + " - wall - at " + offsetPoint); } } } else if (value instanceof DungeonTomb) { for (OffsetPoint offsetPoint : ((DungeonTomb) value).getSecretPoint().getOffsetPointList()) { - if (offsetPoint.getY() == 0) { + if (offsetPoint.getY() == 0 && dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] != -1) { dri.getBlocks()[offsetPoint.getZ()][offsetPoint.getX()] = -1; System.out.println("Fixing " + value2.getKey() + " - crypt - at " + offsetPoint); } @@ -541,11 +534,6 @@ public class CommandDungeonsGuide extends CommandBase { } System.out.println(stringBuilder.toString()); System.out.println(stringBuilder2.toString()); - } else if (args[0].equals("IDKTEST")) { - IDiscordOverlayManager iDiscordOverlayManager = RichPresenceManager.INSTANCE.getIDiscordCore().GetOverlayManager.getOverlayManager(RichPresenceManager.INSTANCE.getIDiscordCore()); - iDiscordOverlayManager.OpenActivityInvite.openActivityInvite(iDiscordOverlayManager, EDiscordActivityActionType.DiscordActivityActionType_Join, Pointer.NULL, (callbackData, result) -> { - - }); } else{ sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg §7-§fOpens configuration gui")); sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg gui §7-§fOpens configuration gui")); diff --git a/src/main/resources/roomdata/250624ee-bb7a-4330-b698-a78f5e44ba99.roomdata b/src/main/resources/roomdata/250624ee-bb7a-4330-b698-a78f5e44ba99.roomdata Binary files differnew file mode 100644 index 00000000..e08121e6 --- /dev/null +++ b/src/main/resources/roomdata/250624ee-bb7a-4330-b698-a78f5e44ba99.roomdata diff --git a/src/main/resources/roomdata/31766264-1004-492f-9d65-cb5deaff82f0.roomdata b/src/main/resources/roomdata/31766264-1004-492f-9d65-cb5deaff82f0.roomdata Binary files differnew file mode 100644 index 00000000..9d62b205 --- /dev/null +++ b/src/main/resources/roomdata/31766264-1004-492f-9d65-cb5deaff82f0.roomdata diff --git a/src/main/resources/roomdata/35fb741d-b0b1-471a-a5b6-8224f99a1133.roomdata b/src/main/resources/roomdata/35fb741d-b0b1-471a-a5b6-8224f99a1133.roomdata Binary files differnew file mode 100644 index 00000000..02235155 --- /dev/null +++ b/src/main/resources/roomdata/35fb741d-b0b1-471a-a5b6-8224f99a1133.roomdata diff --git a/src/main/resources/roomdata/3acb9949-d252-4f16-9983-a1fcdc38a6cf.roomdata b/src/main/resources/roomdata/3acb9949-d252-4f16-9983-a1fcdc38a6cf.roomdata Binary files differnew file mode 100644 index 00000000..b1b9bbee --- /dev/null +++ b/src/main/resources/roomdata/3acb9949-d252-4f16-9983-a1fcdc38a6cf.roomdata diff --git a/src/main/resources/roomdata/54aaf168-7039-48dc-99a3-8d1f02d79097.roomdata b/src/main/resources/roomdata/54aaf168-7039-48dc-99a3-8d1f02d79097.roomdata Binary files differindex 8e78ac6c..aa1998ab 100644 --- a/src/main/resources/roomdata/54aaf168-7039-48dc-99a3-8d1f02d79097.roomdata +++ b/src/main/resources/roomdata/54aaf168-7039-48dc-99a3-8d1f02d79097.roomdata diff --git a/src/main/resources/roomdata/6b0dfb3e-c86c-41d1-8526-a172027dbb8d.roomdata b/src/main/resources/roomdata/6b0dfb3e-c86c-41d1-8526-a172027dbb8d.roomdata Binary files differnew file mode 100644 index 00000000..56d45d12 --- /dev/null +++ b/src/main/resources/roomdata/6b0dfb3e-c86c-41d1-8526-a172027dbb8d.roomdata diff --git a/src/main/resources/roomdata/7dd6596f-c647-4144-9eec-fb4690e12251.roomdata b/src/main/resources/roomdata/7dd6596f-c647-4144-9eec-fb4690e12251.roomdata Binary files differnew file mode 100644 index 00000000..ad1da134 --- /dev/null +++ b/src/main/resources/roomdata/7dd6596f-c647-4144-9eec-fb4690e12251.roomdata diff --git a/src/main/resources/roomdata/9fa09d68-c483-4320-872e-9e07b049ee37.roomdata b/src/main/resources/roomdata/9fa09d68-c483-4320-872e-9e07b049ee37.roomdata Binary files differindex fc2d8d4b..1ff815b7 100644 --- a/src/main/resources/roomdata/9fa09d68-c483-4320-872e-9e07b049ee37.roomdata +++ b/src/main/resources/roomdata/9fa09d68-c483-4320-872e-9e07b049ee37.roomdata diff --git a/src/main/resources/roomdata/datas.txt b/src/main/resources/roomdata/datas.txt index a4e2082f..3c85ccb8 100644 --- a/src/main/resources/roomdata/datas.txt +++ b/src/main/resources/roomdata/datas.txt @@ -105,3 +105,10 @@ roomdata/c6ebcdb2-4ea8-4387-b997-031bd56f7e3b.roomdata roomdata/11982f7f-703e-4d98-9d27-4e07ba3fef71.roomdata roomdata/4538898f-8e79-4d53-aae6-08e4df6abb61.roomdata roomdata/41086d97-5e36-41a5-88ff-d3fb296791ce.roomdata +roomdata/ed57833a-01ca-4487-b516-6c3690c6221c.roomdata +roomdata/7dd6596f-c647-4144-9eec-fb4690e12251.roomdata +roomdata/250624ee-bb7a-4330-b698-a78f5e44ba99.roomdata +roomdata/35fb741d-b0b1-471a-a5b6-8224f99a1133.roomdata +roomdata/31766264-1004-492f-9d65-cb5deaff82f0.roomdata +roomdata/3acb9949-d252-4f16-9983-a1fcdc38a6cf.roomdata +roomdata/6b0dfb3e-c86c-41d1-8526-a172027dbb8d.roomdata diff --git a/src/main/resources/roomdata/ed57833a-01ca-4487-b516-6c3690c6221c.roomdata b/src/main/resources/roomdata/ed57833a-01ca-4487-b516-6c3690c6221c.roomdata Binary files differnew file mode 100644 index 00000000..d787e6ab --- /dev/null +++ b/src/main/resources/roomdata/ed57833a-01ca-4487-b516-6c3690c6221c.roomdata |