fixes based on testing other reference models

Author: mcmonkey4eva

DenizenModelsConverter/BBModel.cs

@@ -61,7 +61,7 @@ public class Face
 
                 public class UV
                 {
-                    public int ULow, UHigh, VLow, VHigh;
+                    public float ULow, UHigh, VLow, VHigh;
                 }
             }
         }

DenizenModelsConverter/BBModelReader.cs

@@ -71,12 +71,12 @@ public static BBModel Interpret(string fileContent)
                         Color = (int)jElement.GetRequired("color"),
                         Rotation = jElement.ContainsKey("rotation") ? ParseDVecFromArr(jElement.GetRequired("rotation")) : new DoubleVector(),
                         Origin = ParseDVecFromArr(jElement.GetRequired("origin")),
-                        North = ParseFaceFromJson(jFaces.GetRequired("north")),
-                        South = ParseFaceFromJson(jFaces.GetRequired("south")),
-                        East = ParseFaceFromJson(jFaces.GetRequired("east")),
-                        West = ParseFaceFromJson(jFaces.GetRequired("west")),
-                        Up = ParseFaceFromJson(jFaces.GetRequired("up")),
-                        Down = ParseFaceFromJson(jFaces.GetRequired("down")),
+                        North = ParseFaceFromJson(jFaces, "north"),
+                        South = ParseFaceFromJson(jFaces, "south"),
+                        East = ParseFaceFromJson(jFaces, "east"),
+                        West = ParseFaceFromJson(jFaces, "west"),
+                        Up = ParseFaceFromJson(jFaces, "up"),
+                        Down = ParseFaceFromJson(jFaces, "down"),
                         Type = type,
                         UUID = id
                     };
@@ -102,6 +102,10 @@ public static BBModel Interpret(string fileContent)
                         // Ignore 'saved'
                         UUID = Guid.Parse((string)jTexture.GetRequired("uuid"))
                     };
+                    if (texture.Name.EndsWith(".png"))
+                    {
+                        texture.Name = texture.Name.BeforeLast(".png");
+                    }
                     string sourceTex = (string)jTexture.GetRequired("source");
                     if (!sourceTex.StartsWith("data:image/png;base64,"))
                     {
@@ -280,19 +284,28 @@ public static DoubleVector ParseDVecFromArr(JToken jVal)
             return new DoubleVector((double)jArr[0], (double)jArr[1], (double)jArr[2]);
         }
 
-        public static BBModel.Element.Face ParseFaceFromJson(JToken jVal)
+        public static BBModel.Element.Face ParseFaceFromJson(JObject faces, string name)
         {
-            JObject jObj = (JObject)jVal;
+            JObject jObj = (JObject)faces.GetRequired(name);
             JArray uv = (JArray)jObj.GetRequired("uv");
+            if (uv.Count < 4)
+            {
+                throw new Exception($"Cannot parse model for face {name}, UV count is {uv.Count}");
+            }
+            JToken tok = jObj.GetRequired("texture");
+            if (tok.Type == JTokenType.Null) // 0 can be misread as null sometimes apparently
+            {
+                tok = 0;
+            }
             return new()
             {
-                TextureID = (int)jObj.GetRequired("texture"),
+                TextureID = (int)tok,
                 TexCoord = new BBModel.Element.Face.UV()
                 {
-                    ULow = (int)uv[0],
-                    VLow = (int)uv[1],
-                    UHigh = (int)uv[2],
-                    VHigh = (int)uv[3]
+                    ULow = (float)uv[0],
+                    VLow = (float)uv[1],
+                    UHigh = (float)uv[2],
+                    VHigh = (float)uv[3]
                 }
             };
         }

DenizenModelsConverter/MinecraftModelMaker.cs

@@ -19,7 +19,14 @@ public static string CreateModelFor(BBModel model, BBModel.Outliner outline)
             JArray childrenList = new();
             foreach (BBModel.Texture texture in model.Textures)
             {
-                textures.Add(texture.ID, texture.CorrectedFullPath);
+                if (texture.ID == "1" && model.Textures.Count == 1)
+                { // Some models have only one texture, labeled '1', which should be #0
+                    textures.Add("0", texture.CorrectedFullPath);
+                }
+                else
+                {
+                    textures.Add(texture.ID, texture.CorrectedFullPath);
+                }
                 if (texture.Particle)
                 {
                     textures.Add("particle", texture.CorrectedFullPath);