Skip to content

Commit b007a31

Browse files
catch
1 parent 164281f commit b007a31

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/model/modelFunctions.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { loadBlockState, loadJsonFromPath, loadTextureAsBase64 } from "../functi
22
import merge from "deepmerge";
33

44
import * as debugg from "debug";
5+
56
const debug = debugg("minerender");
67

78
export function parseModel(model, modelOptions, parsedModelList, assetRoot) {
@@ -237,7 +238,7 @@ export function parseModel(model, modelOptions, parsedModelList, assetRoot) {
237238

238239
resolve(parsedModelList);
239240
}
240-
}).catch(()=>{
241+
}).catch(() => {
241242
resolve(parsedModelList);
242243
})
243244
}
@@ -275,7 +276,6 @@ export function loadAndMergeModel(model, assetRoot) {
275276
}
276277

277278

278-
279279
// Utils
280280

281281
export function modelCacheKey(model) {
@@ -358,10 +358,19 @@ export function loadModel(model, type/* block OR item */, assetRoot) {
358358
console.log("model data:", data);
359359
resolve(data);
360360
})
361+
.catch(err => {
362+
console.warn("Failed to load model data from " + model);
363+
console.warn(err);
364+
resolve({});
365+
});
361366
} else {// model name -> use local data
362367
loadJsonFromPath(assetRoot, "/assets/minecraft/models/" + (type || "block") + "/" + model + ".json").then((data) => {
363368
resolve(data);
364-
})
369+
}).catch(err => {
370+
console.warn("Failed to load model data for " + model);
371+
console.warn(err);
372+
resolve({});
373+
});
365374
}
366375
} else if (typeof model === "object") {// JSON object
367376
resolve(model);

0 commit comments

Comments
 (0)