Merge pull request #2 from KpoxaPy/master

Fix nether export bug & add dimId to wp filename

Author: Techlone

src/org/prank/MainFrame.java

@@ -139,23 +139,37 @@ private void export() {
 
     private void writeWayPoint(Coord coord, String name) {
         String upName = name.substring(0, 1).toUpperCase() + name.substring(1, name.length());
-        String fn = upName + "_" + coord.x + "," + coord.y + "," + coord.z;
+        String wpName = upName + "_" + coord.x + "," + coord.y + "," + coord.z;
+        String fileName = "waypoints/" + wpName + "." + getCurrentDimID() + ".json";
+        
+        // Translate chunk coords to block coords
+        int x = coord.x * 16 + 8;
+        int y = coord.y;
+        int z = coord.z * 16 + 8;
+
+        // Stretch coords if nether dimension due to JourneyMap squeezing
+        if (getCurrentDimID() == -1)
+        {
+            x *= 8;
+            z *= 8;
+        }
+
         int hash = name.hashCode();
         StringBuilder sb = new StringBuilder("{")
-                .append("\"id\": \"").append(fn).append("\", ")
+                .append("\"id\": \"").append(wpName).append("\", ")
                 .append("\"name\": \"").append(upName).append("\", ")
                 .append("\"icon\": \"waypoint-normal.png\", ")
-                .append("\"x\": ").append(coord.x * 16 + 8).append(", ")
-                .append("\"y\": ").append(coord.y).append(", ")
-                .append("\"z\": ").append(coord.z * 16 + 8).append(", ")
+                .append("\"x\": ").append(x).append(", ")
+                .append("\"y\": ").append(y).append(", ")
+                .append("\"z\": ").append(z).append(", ")
                 .append("\"r\": ").append((hash) & 0xff).append(", ")
                 .append("\"g\": ").append((hash >> 8) & 0xff).append(", ")
                 .append("\"b\": ").append((hash >> 16) & 0xff).append(", ")
                 .append("\"enable\": true, ")
                 .append("\"type\": \"Normal\", ")
                 .append("\"origin\": \"JourneyMap\", ")
                 .append("\"dimensions\": [").append(getCurrentDimID()).append("]}");
-        try (FileWriter file = new FileWriter("waypoints/" + fn + ".json")) {
+        try (FileWriter file = new FileWriter(fileName)) {
             file.write(sb.toString());
             file.flush();
         } catch (Exception e) {