stuff

Author: InventivetalentDev

src/model/modelConverter.js

@@ -229,6 +229,10 @@ function parseSchematicData(data, idToNameMap) {
 
         let convertLegacy = function (id, data) {
             let mapped = idToNameMap.blocks[id + ":" + data];
+            if (!mapped) {
+                // try to bypass data
+                mapped = idToNameMap.blocks[id + ":" + 0];
+            }
             if (!mapped) {
                 console.warn("Missing legacy mapping for " + id + ":" + data);
                 return "minecraft:air";

src/model/modelFunctions.js

@@ -70,8 +70,7 @@ export function parseModel(model, modelOptions, parsedModelList, assetRoot) {
                             let variant = blockstate.variants[variantKey];
                             if (!variant) {
                                 console.warn("Missing variant for " + model.blockstate + ": " + model.variant);
-                                resolve(null);
-                                return;
+                                variant = blockstate.variants[Object.keys(blockstate.variants)[0]];
                             }
 
                             let variants = [];
@@ -394,11 +393,16 @@ export function loadTextures(textureNames, assetRoot) {
                 continue;
             }
             filteredNames.push(name);
-            promises.push(loadTextureAsBase64(assetRoot, "minecraft", "/", texture));
+            promises.push(loadTextureAsBase64(assetRoot, "minecraft", "/", texture).catch(err => {
+                console.warn("Failed to load texture " + texture);
+                console.warn(err);
+                return undefined;
+            }));
         }
         Promise.all(promises).then((textures) => {
             let mappedTextures = {};
             for (let i = 0; i < textures.length; i++) {
+                if (!textures[i]) continue;
                 mappedTextures[filteredNames[i]] = textures[i];
             }