Actually use the new version data

tryashtar · Sep 13, 2022 · 668b380 · 668b380
1 parent 66710ce
commit 668b380
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/ImageMap4.CMD/Models/BedrockWorld.cs b/ImageMap4.CMD/Models/BedrockWorld.cs
@@ -58,16 +58,12 @@ public override void AddStructures(IEnumerable<StructureGrid> structures, IInven
                     long? id = mapids[x, structure.GridHeight - y - 1];
                     if (id.HasValue)
                     {
+                        var mapitem = Version.CreateMapItem(id.Value);
+                        mapitem.Name = "Item";
                         blockdata.Add(new NbtCompound((y * structure.GridWidth + x).ToString()) {
                             new NbtCompound("block_entity_data") {
                                 new NbtString("id", structure.GlowingFrames ? "GlowItemFrame" : "ItemFrame"),
-                                new NbtCompound("Item") {
-                                    new NbtString("Name", "minecraft:filled_map"),
-                                    new NbtByte("Count", 1),
-                                    new NbtCompound("tag") {
-                                        new NbtLong("map_uuid", id.Value)
-                                    }
-                                }
+                                mapitem
                             }
                         });
                     }

diff --git a/ImageMap4.CMD/Resources/versions.yaml b/ImageMap4.CMD/Resources/versions.yaml
@@ -24,15 +24,15 @@ bedrock:
   check:
     version: [1,6]
   map_item:
-    id: 'minecraft:map'
+    Name: 'minecraft:map'
     Count: 1b
     tag:
       map_uuid: '@id'
 - name: "1.16+"
   check:
     version: [1,16,100]
   map_item:
-    id: 'minecraft:filled_map'
+    Name: 'minecraft:filled_map'
     Count: 1b
     tag:
       map_uuid: '@id'