Add nether snapshot support

src/main/java/com/sk89q/worldedit/data/FileMcRegionChunkStore.java

@@ -44,11 +44,14 @@ public class FileMcRegionChunkStore extends McRegionChunkStore {
     @Override
     protected InputStream getInputStream(String name) throws IOException,
             DataException {
-        
+        String fileName = "region" + File.separator + name;
-        String file = "region" + File.separator + name;
+        File file = new File(path, fileName);
+        if (!file.exists()) {
+            file = new File(path, "DIM-1" + File.separator + fileName);
+        }
         
         try {
-            return new FileInputStream(new File(path, file));
+            return new FileInputStream(file);
         } catch (FileNotFoundException e) {
             throw new MissingChunkException();
         }
@@ -56,7 +59,8 @@ public class FileMcRegionChunkStore extends McRegionChunkStore {
 
     @Override
     public boolean isValid() {
-        return new File(path, "region").isDirectory();
+        return new File(path, "region").isDirectory() ||
+                new File(path, "DIM-1" + File.separator + "region").isDirectory();
     }
 
 }

src/main/java/com/sk89q/worldedit/data/TrueZipMcRegionChunkStore.java

@@ -90,52 +90,34 @@ public class TrueZipMcRegionChunkStore extends McRegionChunkStore {
     @SuppressWarnings("unchecked")
     protected InputStream getInputStream(String name)
             throws IOException, DataException {
-        String file = "region/" + name;
 
         // Detect subfolder for the world's files
         if (folder != null) {
             if (!folder.equals("")) {
-                file = folder + "/" + file;
+                name = folder + "/" + name;
             }
         } else {
-            ZipEntry testEntry = zip.getEntry("level.dat");
+            Pattern pattern = Pattern.compile(".*\\.mcr$");
-
-            // So, the data is not in the root directory
-            if (testEntry == null) {
-                // Let's try a world/ sub-directory
-                testEntry = getEntry("world/level.dat");
-                
-                Pattern pattern = Pattern.compile(".*[\\\\/]level\\.dat$");
-
-                // So not there either...
-                if (testEntry == null) {
             for (Enumeration<? extends ZipEntry> e = zip.entries();
                     e.hasMoreElements(); ) {
+                ZipEntry testEntry = (ZipEntry)e.nextElement();
                 
-                        testEntry = e.nextElement();
-
-                        // Whoo, found level.dat!
                 if (pattern.matcher(testEntry.getName()).matches()) {
-                            folder = testEntry.getName().replaceAll("level\\.dat$", "");
+                    folder = testEntry.getName().substring(0, testEntry.getName().lastIndexOf("/"));
-                            folder = folder.substring(0, folder.length() - 1);
+                    name = folder + "/" + name;
-                            file = folder + file;
                     break;
                 }
             }
-                } else {
-                    file = "world/" + file;
-                }
-            }
         }
 
-        ZipEntry entry = getEntry(file);
+        ZipEntry entry = getEntry(name);
         if (entry == null) {
             throw new MissingChunkException();
         }
         try {
             return zip.getInputStream(entry);
         } catch (ZipException e) {
-            throw new IOException("Failed to read " + file + " in ZIP");
+            throw new IOException("Failed to read " + name + " in ZIP");
         }
     }
     

src/main/java/com/sk89q/worldedit/data/ZippedMcRegionChunkStore.java

@@ -87,52 +87,34 @@ public class ZippedMcRegionChunkStore extends McRegionChunkStore {
     @Override
     protected InputStream getInputStream(String name)
             throws IOException, DataException {
-        String file = "region/" + name;
 
         // Detect subfolder for the world's files
         if (folder != null) {
             if (!folder.equals("")) {
-                file = folder + "/" + file;
+                name = folder + "/" + name;
             }
         } else {
-            ZipEntry testEntry = zip.getEntry("level.dat");
+            Pattern pattern = Pattern.compile(".*\\.mcr$");
-
-            // So, the data is not in the root directory
-            if (testEntry == null) {
-                // Let's try a world/ sub-directory
-                testEntry = getEntry("world/level.dat");
-                
-                Pattern pattern = Pattern.compile(".*[\\\\/]level\\.dat$");
-
-                // So not there either...
-                if (testEntry == null) {
             for (Enumeration<? extends ZipEntry> e = zip.entries();
                     e.hasMoreElements(); ) {
+                ZipEntry testEntry = (ZipEntry)e.nextElement();
                 
-                        testEntry = (ZipEntry)e.nextElement();
-
-                        // Whoo, found level.dat!
                 if (pattern.matcher(testEntry.getName()).matches()) {
-                            folder = testEntry.getName().replaceAll("level\\.dat$", "");
+                    folder = testEntry.getName().substring(0, testEntry.getName().lastIndexOf("/"));
-                            folder = folder.substring(0, folder.length() - 1);
+                    name = folder + "/" + name;
-                            file = folder + file;
                     break;
                 }
             }
-                } else {
-                    file = "world/" + file;
-                }
-            }
         }
 
-        ZipEntry entry = getEntry(file);
+        ZipEntry entry = getEntry(name);
         if (entry == null) {
             throw new MissingChunkException();
         }
         try {
             return zip.getInputStream(entry);
         } catch (ZipException e) {
-            throw new IOException("Failed to read " + file + " in ZIP");
+            throw new IOException("Failed to read " + name + " in ZIP");
         }
     }