Texture parsing is wrong apparently

Author: mcmonkey4eva

DenizenModelsConverter/BBModel.cs

@@ -18,6 +18,8 @@ public class BBModel
 
         public string FormatVersion;
 
+        public int ResolutionX, ResolutionY;
+
         public DateTimeOffset CreationTime;
 
         public List<Element> Elements = new();
@@ -77,8 +79,6 @@ public class Texture
             public byte[] RawImageBytes;
 
             public string CorrectedFullPath;
-
-            public int Width, Height;
         }
 
         public class Outliner

DenizenModelsConverter/BBModelReader.cs

@@ -25,13 +25,16 @@ public static BBModel Interpret(string fileContent)
             Debug("Start read...");
             JObject data = JObject.Parse(fileContent);
             Debug("Parsed! Start proc...");
-            JObject meta = data["meta"] as JObject;
+            JObject meta = data.GetRequired("meta") as JObject;
+            JObject resolution = data.GetRequired("resolution") as JObject;
             BBModel result = new()
             {
                 JsonRoot = data,
                 Name = (string)data.GetRequired("name"),
                 FormatVersion = (string)meta.GetRequired("format_version"),
-                CreationTime = DateTimeOffset.FromUnixTimeSeconds((long)meta.GetRequired("creation_time")).ToLocalTime()
+                CreationTime = DateTimeOffset.FromUnixTimeSeconds((long)meta.GetRequired("creation_time")).ToLocalTime(),
+                ResolutionX = (int)resolution.GetRequired("width"),
+                ResolutionY = (int)resolution.GetRequired("height")
             };
             Debug("Core read, start body...");
             JArray elements = (JArray)data["elements"];
@@ -112,13 +115,6 @@ public static BBModel Interpret(string fileContent)
                         throw new Exception($"Cannot read model - texture {texture.Name} contains source data that isn't the expected base64 png.");
                     }
                     texture.RawImageBytes = Convert.FromBase64String(sourceTex.After("data:image/png;base64,"));
-#pragma warning disable CA1416 // Validate platform compatibility
-                    using (Image image = Image.FromStream(new MemoryStream(texture.RawImageBytes)))
-                    {
-                        texture.Width = image.Width;
-                        texture.Height = image.Height;
-                    }
-#pragma warning restore CA1416 // Validate platform compatibility
                     Debug($"Read texture {texture.Name}");
                     result.Textures.Add(texture);
                 }

DenizenModelsConverter/DenizenModelsConverter.csproj

@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

DenizenModelsConverter/MinecraftModelMaker.cs

@@ -88,9 +88,8 @@ public static string CreateModelFor(BBModel model, BBModel.Outliner outline)
 
         public static JObject FaceToJObj(BBModel.Element.Face face, BBModel model)
         {
-            BBModel.Texture texture = model.Textures[face.TextureID];
-            float relativeU = 16f / texture.Width;
-            float relativeV = 16f / texture.Height;
+            float relativeU = 16f / model.ResolutionX;
+            float relativeV = 16f / model.ResolutionY;
             JObject output = new();
             output.Add("uv", new JArray(face.TexCoord.ULow * relativeU, face.TexCoord.VLow * relativeV, face.TexCoord.UHigh * relativeU, face.TexCoord.VHigh * relativeV));
             output.Add("texture", $"#{face.TextureID}");