Fix maps with no DataVersion not loading in 1.20.2

tryashtar · Sep 28, 2023 · 8880282 · 8880282
1 parent c407173
commit 8880282
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/ImageMap4.CMD/Models/JavaWorld.cs b/ImageMap4.CMD/Models/JavaWorld.cs
@@ -96,7 +96,13 @@ public override void AddMaps(IEnumerable<Map> maps)
         foreach (var map in maps)
         {
             var nbt = new NbtFile { BigEndian = true };
-            var data = map.Data.FullData ?? Version.CreateMapCompound(map.Data);
+            var data = map.Data.FullData;
+            if (data == null)
+            {
+                data = Version.CreateMapCompound(map.Data);
+                if (Version.DataVersion != null)
+                    data.Add(new NbtInt("DataVersion", Version.DataVersion.Value));
+            }
             data.Name = "";
             nbt.RootTag = data;
             var folder = Path.Combine(Folder, "data");

diff --git a/ImageMap4.CMD/Versions/JavaVersion.cs b/ImageMap4.CMD/Versions/JavaVersion.cs
@@ -21,6 +21,7 @@ public interface IJavaVersion
     bool StructuresSupported { get; }
     NbtCompound CreateStructureFile(StructureGrid structure);
     string StructureFileLocation(string world_folder, string identifier);
+    int? DataVersion { get; }
 }
 
 public class JavaVersionBuilder
@@ -34,7 +35,8 @@ public class JavaVersionBuilder
     public bool StructuresSupported = false;
     public string? StructureFolder;
     public string? Name;
-    public void Add(JavaUpdate update)
+    public int? DataVersion;
+    public void Add(JavaUpdate update, int? data_version)
     {
         if (update.SetBaseColors != null)
         {
@@ -55,6 +57,8 @@ public void Add(JavaUpdate update)
         this.Name = update.Name ?? this.Name;
         this.StructureFolder = update.StructureFolder ?? this.StructureFolder;
         this.StructuresSupported |= update.StructuresSupported ?? false;
+        if (data_version != null)
+            this.DataVersion = data_version;
     }
     public IJavaVersion Build()
     {
@@ -65,7 +69,8 @@ public IJavaVersion Build()
             DataMaker = MapData,
             StructureMaker = StructureItem,
             StructureFolder = StructureFolder,
-            StructuresSupported = StructuresSupported
+            StructuresSupported = StructuresSupported,
+            DataVersion = DataVersion
         };
     }
 
@@ -104,6 +109,7 @@ public class JavaVersion : IJavaVersion
     public string StructureFolder { get; init; }
     public string Name { get; init; }
     public bool StructuresSupported { get; init; }
+    public int? DataVersion { get; init; }
     public JavaVersion(string name, IEnumerable<Color> palette)
     {
         Name = name;

diff --git a/ImageMap4.CMD/Versions/VersionManager.cs b/ImageMap4.CMD/Versions/VersionManager.cs
@@ -30,7 +30,7 @@ static VersionManager()
         var java = new JavaVersionBuilder();
         foreach (var update in updates.Java)
         {
-            java.Add(update);
+            java.Add(update, update.Check.DataVersion);
             JavaVersions.Add((update.Check, java.Build()));
         }
         var bedrock = new BedrockVersionBuilder();

diff --git a/ImageMap4/ImageMap4.csproj b/ImageMap4/ImageMap4.csproj
@@ -19,9 +19,9 @@
 		<Copyright>Copyright © 2022 tryashtar</Copyright>
 		<PackageProjectUrl>https://github.com/tryashtar/image-map</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/tryashtar/image-map</RepositoryUrl>
-		<AssemblyVersion>4.2.3.0</AssemblyVersion>
-		<FileVersion>4.2.3.0</FileVersion>
-		<Version>4.2.3</Version>
+		<AssemblyVersion>4.2.5.0</AssemblyVersion>
+		<FileVersion>4.2.5.0</FileVersion>
+		<Version>4.2.5</Version>
 		<SignAssembly>false</SignAssembly>
 		<PlatformTarget>x64</PlatformTarget>
 	</PropertyGroup>