Merge branch 'leveldb-format-testing'

.gitmodules

@@ -1,6 +1,12 @@
 [submodule "zlib"]
 	path = zlib
+   url = https://github.com/tryashtar/zlib-win-build
 [submodule "leveldb-mcpe"]
+   url = https://github.com/tryashtar/leveldb-mcpe
 	path = leveldb-mcpe
 [submodule "fNbt"]
+   url = https://github.com/tryashtar/fNbt
 	path = fNbt
+[submodule "LevelDBWrapper"]
+	path = LevelDBWrapper
+	url = https://github.com/tryashtar/LevelDBWrapper

Image Map 3/JavaDefinitions/JavaVersions.cs

@@ -426,4 +426,28 @@ public override IEnumerable<Color> GetBaseColors()
 
         public override string ToString() => "1.16+";
     }
+
+    // 21w15a+
+    public class Java1p17Version : AbstractJavaVersion
+    {
+        public static Java1p17Version Instance = new Java1p17Version();
+        private Java1p17Version() { }
+
+        public override NbtCompound CreateMapItem(byte slot, long mapid) => Java1p14Version.Instance.CreateMapItem(slot, mapid);
+        public override NbtCompound CreateMapCompound(long mapid, byte[] colors) => Java1p16Version.Instance.CreateMapCompound(mapid, colors);
+
+        public override IEnumerable<Color> GetAlternateColors(Color color) => Java1p8Version.Instance.GetAlternateColors(color);
+        public override IEnumerable<Color> GetBaseColors()
+        {
+            var old_colors = Java1p16Version.Instance.GetBaseColors();
+            var new_colors = FixShading(new List<Color>
+            {
+                Color.FromArgb(100, 100, 100),
+                Color.FromArgb(216, 175, 147)
+            });
+            return old_colors.Concat(new_colors);
+        }
+
+        public override string ToString() => "1.17+";
+    }
 }

Image Map 3/JavaDefinitions/JavaWorld.cs

@@ -38,6 +38,8 @@ private static IJavaVersion DetermineVersionFromLevelDat(NbtCompound leveldat)
             var dataversion = leveldat["DataVersion"];
             if (dataversion is NbtInt intversion)
             {
+                if (intversion.Value >= 2709)
+                    return Java1p17Version.Instance;
                 if (intversion.Value >= 2562) // 1.16 pre-6
                     return Java1p16Version.Instance;
                 if (intversion.Value >= 1128) // 17w17a

Image Map 3/UI/TheForm.cs

@@ -47,6 +47,9 @@ private void OpenWorld(Func<MinecraftWorld> getworld)
             if (!WorldView.HasUnsavedChanges() || MessageBox.Show("You have unsaved maps waiting to be imported! If you select a new world, these will be lost!\n\nDiscard unsaved maps?", "Wait a minute!", MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
                 MinecraftWorld world = null;
+#if DEBUG
+                world = getworld();
+#else
                 try
                 {
                     world = getworld();
@@ -55,6 +58,7 @@ private void OpenWorld(Func<MinecraftWorld> getworld)
                 {
                     MessageBox.Show($"Error opening that world:\n\n{Util.ExceptionMessage(ex)}", "World error!");
                 }
+#endif
                 if (world != null)
                     DoOpenWorld(world);
             }