Roomdata update

Add.
Waterfall ed57833a-01ca-4487-b516-6c3690c6221c (CONFIRMED. FIX BAT LOC BEING WRONG) (1x4-8)
End       7dd6596f-c647-4144-9eec-fb4690e12251 (1x1-2)
grand-library   250624ee-bb7a-4330-b698-a78f5e44ba99 (CONFIRMED. LEVER RANDOMNESS STILL NOT SURE) (1X2-4)
long-hall 35fb741d-b0b1-471a-a5b6-8224f99a1133 (1x1-3) (CONFIRMED)
double-diamond 31766264-1004-492f-9d65-cb5deaff82f0 (CONFIRMED. OPTIMIZE PATHFINDER FOR ITEMDROP) (1x1-3)
overgrown-chains 3acb9949-d252-4f16-9983-a1fcdc38a6cf (CONFIRMED) (1x1-2)
grass-ruin 6b0dfb3e-c86c-41d1-8526-a172027dbb8d (1x2-3)

UpdateName
Requires Name Not On DSG -> Basement

1 files changed, 9 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"));