minerender 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/cjs/assets/AssetKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssetKey.js","sourceRoot":"src/","sources":["assets/AssetKey.ts"],"names":[],"mappings":";;;AAEA,qCAA2D;AAC3D,+CAA4C;AAI5C,MAAa,aAAa;IAOtB,YAAY,cAAsC,EAAE,IAAa;QAC7D,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,SAAS,GAAG,cAAwB,CAAC;YAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SACpB;aAAM;YACH,IAAI,CAAC,SAAS,GAAI,cAAgC,CAAC,SAAS,CAAC;YAC7D,IAAI,CAAC,IAAI,GAAI,cAAgC,CAAC,IAAI,CAAA;SACrD;IACL,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5C,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACrC,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;CACJ;AA5BD,sCA4BC;AAED,MAAa,QAAS,SAAQ,aAAa;IAEvC,YACa,SAAiB,EAAW,IAAY,EAC1C,SAAqB,EACrB,IAAa,EACb,WAAuC,QAAQ,EAC/C,YAAuC,OAAO,EAC9C,IAAa;QAEpB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAPd,cAAS,GAAT,SAAS,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAQ;QAC1C,cAAS,GAAT,SAAS,CAAY;QACrB,SAAI,GAAJ,IAAI,CAAS;QACb,aAAQ,GAAR,QAAQ,CAAuC;QAC/C,cAAS,GAAT,SAAS,CAAqC;QAC9C,SAAI,GAAJ,IAAI,CAAS;IAGxB,CAAC;IAGM,MAAM,CAAC,KAAK,CAAC,SAAoB,EAAE,GAAW,EAAE,MAAiB;QACpE,IAAI,SAAS,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,0BAAiB,CAAC;QACvD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5B,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;QAED,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,GAAuB,SAAS,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,KAAK,CAAC,KAAK,EAAE,CAAC;SACjB;QACD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,SAAS,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9C,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC/B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,EAAE,CAAC;QAEhC,OAAO,IAAI,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC;IAC7F,CAAC;IAED,QAAQ;;QACJ,IAAI,CAAC,GAAG;YACJ,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,yBAAW,CAAC,IAAI,KAAK,qBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,IAAI,mCAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU;YACtH,MAAA,IAAI,CAAC,QAAQ,mCAAI,cAAc;YAC/B,MAAA,IAAI,CAAC,SAAS,mCAAI,eAAe;YACjC,MAAA,IAAI,CAAC,IAAI,mCAAI,UAAU;YACvB,IAAI,CAAC,SAAS;YACd,IAAI,CAAC,IAAI;SACZ,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;CACJ;AApDD,4BAoDC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACpC,OAAO,WAAW,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;AAC/C,CAAC;AAFD,0CAEC;AAED,SAAgB,UAAU,CAAC,GAAQ;IAC/B,OAAO,eAAe,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,GAAG,CAAC;AAClD,CAAC;AAFD,gCAEC"}
+{"version":3,"file":"AssetKey.js","sourceRoot":"src/","sources":["assets/AssetKey.ts"],"names":[],"mappings":";;;AACA,qCAA2D;AAC3D,+CAA4C;AAI5C,MAAa,aAAa;IAOtB,YAAY,cAAsC,EAAE,IAAa;QAC7D,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,SAAS,GAAG,cAAwB,CAAC;YAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SACpB;aAAM;YACH,IAAI,CAAC,SAAS,GAAI,cAAgC,CAAC,SAAS,CAAC;YAC7D,IAAI,CAAC,IAAI,GAAI,cAAgC,CAAC,IAAI,CAAA;SACrD;IACL,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5C,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACrC,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;CACJ;AA5BD,sCA4BC;AAED,MAAa,QAAS,SAAQ,aAAa;IAEvC,YACa,SAAiB,EAAW,IAAY,EAC1C,SAAqB,EACrB,IAAa,EACb,WAAuC,QAAQ,EAC/C,YAAuC,OAAO,EAC9C,IAAa;QAEpB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAPd,cAAS,GAAT,SAAS,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAQ;QAC1C,cAAS,GAAT,SAAS,CAAY;QACrB,SAAI,GAAJ,IAAI,CAAS;QACb,aAAQ,GAAR,QAAQ,CAAuC;QAC/C,cAAS,GAAT,SAAS,CAAqC;QAC9C,SAAI,GAAJ,IAAI,CAAS;IAGxB,CAAC;IAGM,MAAM,CAAC,KAAK,CAAC,SAAoB,EAAE,GAAW,EAAE,MAAiB;QACpE,IAAI,SAAS,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,0BAAiB,CAAC;QACvD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5B,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;QAED,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,GAAuB,SAAS,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,KAAK,CAAC,KAAK,EAAE,CAAC;SACjB;QACD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,SAAS,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9C,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC/B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,EAAE,CAAC;QAEhC,OAAO,IAAI,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC;IAC7F,CAAC;IAED,QAAQ;;QACJ,IAAI,CAAC,GAAG;YACJ,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,yBAAW,CAAC,IAAI,KAAK,qBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,IAAI,mCAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU;YACtH,MAAA,IAAI,CAAC,QAAQ,mCAAI,cAAc;YAC/B,MAAA,IAAI,CAAC,SAAS,mCAAI,eAAe;YACjC,MAAA,IAAI,CAAC,IAAI,mCAAI,UAAU;YACvB,IAAI,CAAC,SAAS;YACd,IAAI,CAAC,IAAI;SACZ,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;CACJ;AApDD,4BAoDC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACpC,OAAO,WAAW,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;AAC/C,CAAC;AAFD,0CAEC;AAED,SAAgB,UAAU,CAAC,GAAQ;IAC/B,OAAO,eAAe,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,GAAG,CAAC;AAClD,CAAC;AAFD,gCAEC"}

package/dist/cjs/assets/AssetLoader.d.ts

@@ -1,26 +1,11 @@
-import { Model, TextureAsset } from "../model/Model";
 import { Maybe } from "../util/util";
-import { AxiosRequestConfig, AxiosResponse } from "axios";
 import { MinecraftAsset } from "../MinecraftAsset";
-import { MinecraftTextureMeta } from "../MinecraftTextureMeta";
-import { BlockState } from "../model/block/BlockState";
-import { ListAsset } from "../ListAsset";
 import { AssetKey } from "./AssetKey";
-import { NBTAsset } from "../nbt/NBTHelper";
-export interface ResponseParser<T extends MinecraftAsset> {
-    config(request: AxiosRequestConfig): any;
-    parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
-}
+import { AssetSource } from "./source/AssetSource";
+import { AssetParser } from "./source/parser/AssetParsers";
 export declare class AssetLoader {
-    static readonly MODEL: ResponseParser<Model>;
-    static readonly BLOCKSTATE: ResponseParser<BlockState>;
-    static readonly META: ResponseParser<MinecraftTextureMeta>;
-    static readonly NBT: ResponseParser<NBTAsset>;
-    static readonly IMAGE: ResponseParser<TextureAsset>;
-    static readonly LIST: ResponseParser<ListAsset>;
-    static readonly JSON: ResponseParser<any>;
     static ROOT: string;
-    static loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
-    protected static load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
-    static assetBasePath(key: AssetKey): string;
+    private static _SOURCES;
+    static addSource(key: string, source: AssetSource): void;
+    static get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
 }

package/dist/cjs/assets/AssetLoader.js

@@ -8,146 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetLoader = void 0;
-const Requests_1 = require("../request/Requests");
-const ImageLoader_1 = require("../image/ImageLoader");
 const Assets_1 = require("./Assets");
-const AssetKey_1 = require("./AssetKey");
-const NBTHelper_1 = require("../nbt/NBTHelper");
 const log_1 = require("../util/log");
+const source_1 = require("./source");
 const p = (0, log_1.prefix)("AssetLoader");
 class AssetLoader {
-    static loadOrRetryWithDefaults(key, parser) {
+    static addSource(key, source) {
+        this._SOURCES.unshift({ key, source });
+        console.log(p, "Added AssetSource", key);
+    }
+    static get(key, parser) {
         return __awaiter(this, void 0, void 0, function* () {
-            const direct = yield this.load(key, parser);
-            if (typeof direct !== "undefined") {
-                return direct;
-            }
-            if (key.namespace !== Assets_1.DEFAULT_NAMESPACE) {
-                console.info(p, "Retrying", key, "with default namespace");
-                // Try on the same host but with default minecraft: namespace
-                const namespaceKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
-                const namespaced = yield this.load(namespaceKey, parser);
-                if (typeof namespaced !== "undefined") {
-                    return namespaced;
-                }
-                if ((typeof key.root !== "undefined" && key.root !== Assets_1.DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== Assets_1.DEFAULT_ROOT)) {
-                    console.info(p, "Retrying", key, "with default root+namespace");
-                    // Try both defaults
-                    const namespacedRootedKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, Assets_1.DEFAULT_ROOT);
-                    const namespacedRooted = yield this.load(namespacedRootedKey, parser);
-                    if (typeof namespacedRooted !== "undefined") {
-                        return namespacedRooted;
-                    }
-                }
-            }
-            else if ((typeof key.root !== "undefined" && key.root !== Assets_1.DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== Assets_1.DEFAULT_ROOT)) {
-                console.info(p, "Retrying", key, "with default root");
-                // Try on default root
-                const rootKey = new AssetKey_1.AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, Assets_1.DEFAULT_ROOT);
-                const rooted = yield this.load(rootKey, parser);
-                if (typeof rooted !== "undefined") {
-                    return rooted;
+            for (const source of this._SOURCES) {
+                const result = yield source.source.get(key, parser);
+                if (result) {
+                    return result;
                 }
             }
             return undefined;
         });
     }
-    static load(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.info(p, "Loading", key);
-            const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
-            console.debug(p, url);
-            let req = {
-                url: url
-            };
-            parser.config(req);
-            return yield Requests_1.Requests.mcAssetRequest(req)
-                .then(response => {
-                if (response && response.data) {
-                    try {
-                        return parser.parse(response);
-                    }
-                    catch (e) {
-                        console.warn("Parser failed to process response", response, e);
-                        throw e;
-                    }
-                }
-                return undefined;
-            })
-                .catch(err => {
-                if (err.response) {
-                    let response = err.response;
-                    if (response.status === 404) {
-                        console.debug(p, key, "not found");
-                        return undefined;
-                    }
-                }
-                console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
-                return undefined;
-            });
-        });
-    }
-    static assetBasePath(key) {
-        var _a;
-        return `${(_a = key.root) !== null && _a !== void 0 ? _a : this.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
-    }
 }
 exports.AssetLoader = AssetLoader;
-AssetLoader.MODEL = {
-    config(request) {
-    },
-    parse(response) {
-        return response.data;
-    }
-};
-AssetLoader.BLOCKSTATE = {
-    config(request) {
-    },
-    parse(response) {
-        return response.data;
-    }
-};
-AssetLoader.META = {
-    config(request) {
-        // request.responseType = "arraybuffer";
-    },
-    parse(response) {
-        return response.data;
-    }
-};
-AssetLoader.NBT = {
-    config(request) {
-        request.responseType = "arraybuffer";
-    },
-    parse(response) {
-        return NBTHelper_1.NBTHelper.fromBuffer(Buffer.from(response.data));
-    }
-};
-AssetLoader.IMAGE = {
-    config(request) {
-        request.responseType = "arraybuffer";
-    },
-    parse(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield ImageLoader_1.ImageLoader.processResponse(response);
-        });
-    }
-};
-AssetLoader.LIST = {
-    config(request) {
-    },
-    parse(response) {
-        return response.data;
-    }
-};
-AssetLoader.JSON = {
-    config(request) {
-    },
-    parse(response) {
-        return response.data;
-    }
-};
+_a = AssetLoader;
 AssetLoader.ROOT = Assets_1.DEFAULT_ROOT;
+AssetLoader._SOURCES = [];
+(() => {
+    _a.addSource("mcassets", new source_1.HostedAssetSource(Assets_1.DEFAULT_ROOT));
+})();
 //# sourceMappingURL=AssetLoader.js.map

package/dist/cjs/assets/AssetLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssetLoader.js","sourceRoot":"src/","sources":["assets/AssetLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,kDAA+C;AAG/C,sDAA8D;AAG9D,qCAA2D;AAE3D,yCAAsC;AACtC,gDAAuD;AACvD,qCAAqC;AAErC,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,aAAa,CAAC,CAAC;AAQhC,MAAa,WAAW;IAyDb,MAAM,CAAO,uBAAuB,CAA2B,GAAa,EAAE,MAAyB;;YAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,GAAG,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;gBAC/B,OAAO,MAAM,CAAC;aACjB;YACD,IAAI,GAAG,CAAC,SAAS,KAAK,0BAAiB,EAAE;gBACrC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,wBAAwB,CAAC,CAAC;gBAC3D,6DAA6D;gBAC7D,MAAM,YAAY,GAAG,IAAI,mBAAQ,CAAC,0BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC/H,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,YAAY,EAAE,MAAM,CAAC,CAAC;gBAC5D,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;oBACnC,OAAO,UAAU,CAAC;iBACrB;gBACD,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAY,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAY,CAAC,EAAE;oBACpI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,6BAA6B,CAAC,CAAC;oBAChE,oBAAoB;oBACpB,MAAM,mBAAmB,GAAG,IAAI,mBAAQ,CAAC,0BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,qBAAY,CAAC,CAAC;oBAC1I,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,mBAAmB,EAAE,MAAM,CAAC,CAAC;oBACzE,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;wBACzC,OAAO,gBAAgB,CAAC;qBAC3B;iBACJ;aACJ;iBAAM,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAY,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAY,CAAC,EAAE;gBAC3I,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,mBAAmB,CAAC,CAAC;gBACtD,sBAAsB;gBACtB,MAAM,OAAO,GAAG,IAAI,mBAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,qBAAY,CAAC,CAAC;gBAC1H,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,OAAO,EAAE,MAAM,CAAC,CAAC;gBACnD,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;oBAC/B,OAAO,MAAM,CAAC;iBACjB;aACJ;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAGS,MAAM,CAAO,IAAI,CAA2B,GAAa,EAAE,MAAyB;;YAC1F,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;YAChC,MAAM,GAAG,GAAG,GAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAE,GAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAG,GAAI,GAAG,CAAC,IAAK,GAAI,GAAG,CAAC,SAAU,EAAE,CAAC;YAC3H,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACtB,IAAI,GAAG,GAAuB;gBAC1B,GAAG,EAAE,GAAG;aACX,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,MAAM,mBAAQ,CAAC,cAAc,CAAC,GAAG,CAAC;iBACpC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACb,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;oBAC3B,IAAI;wBACA,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;qBACjC;oBAAC,OAAO,CAAC,EAAE;wBACR,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;wBAC/D,MAAM,CAAC,CAAC;qBACX;iBACJ;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACT,IAAI,GAAG,CAAC,QAAQ,EAAE;oBACd,IAAI,QAAQ,GAAG,GAAG,CAAC,QAAyB,CAAC;oBAC7C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;wBACzB,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;wBACnC,OAAO,SAAS,CAAC;qBACpB;iBACJ;gBACD,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,CAAC;gBACtD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAA;QACV,CAAC;KAAA;IAEM,MAAM,CAAC,aAAa,CAAC,GAAa;;QACrC,OAAO,GAAI,MAAA,GAAG,CAAC,IAAI,mCAAI,IAAI,CAAC,IAAK,IAAK,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,EAAG,GAAI,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAG,GAAI,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAG,EAAE,CAAC;IACxN,CAAC;;AA/HL,kCAiIC;AA/HmB,iBAAK,GAA0B;IAC3C,MAAM,CAAC,OAA2B;IAClC,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,QAAQ,CAAC,IAAa,CAAC;IAClC,CAAC;CACJ,CAAA;AACe,sBAAU,GAA+B;IACrD,MAAM,CAAC,OAA2B;IAClC,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,QAAQ,CAAC,IAAkB,CAAC;IACvC,CAAC;CACJ,CAAA;AACe,gBAAI,GAAyC;IACzD,MAAM,CAAC,OAA2B;QAC9B,wCAAwC;IAC5C,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,QAAQ,CAAC,IAA4B,CAAC;IACjD,CAAC;CACJ,CAAA;AACe,eAAG,GAA6B;IAC5C,MAAM,CAAC,OAA2B;QAC9B,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,qBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AACe,iBAAK,GAAiC;IAClD,MAAM,CAAC,OAA2B;QAC9B,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC;IACzC,CAAC;IACK,KAAK,CAAC,QAAuB;;YAC/B,OAAO,MAAM,yBAAW,CAAC,eAAe,CAAC,QAAQ,CAAiB,CAAC;QACvE,CAAC;KAAA;CACJ,CAAA;AACe,gBAAI,GAA8B;IAC9C,MAAM,CAAC,OAA2B;IAClC,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,QAAQ,CAAC,IAAiB,CAAC;IACtC,CAAC;CACJ,CAAA;AACe,gBAAI,GAAwB;IACxC,MAAM,CAAC,OAA2B;IAClC,CAAC;IACD,KAAK,CAAC,QAAuB;QACzB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;CACJ,CAAA;AAEM,gBAAI,GAAW,qBAAY,CAAC"}
+{"version":3,"file":"AssetLoader.js","sourceRoot":"src/","sources":["assets/AssetLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAQA,qCAA2D;AAI3D,qCAAqC;AAGrC,qCAA6C;AAE7C,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,aAAa,CAAC,CAAC;AAGhC,MAAa,WAAW;IAMb,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,MAAmB;QACpD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAMM,MAAM,CAAO,GAAG,CAA2B,GAAa,EAAE,MAA4B;;YACzF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAChC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAI,GAAG,EAAE,MAAM,CAAC,CAAC;gBACvD,IAAI,MAAM,EAAE;oBACR,OAAO,MAAM,CAAC;iBACjB;aACJ;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;;AAvBL,kCAyBC;;AAvBU,gBAAI,GAAW,qBAAY,CAAC;AAEpB,oBAAQ,GAA2B,EAAE,CAAC;AAOrD;IACI,EAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,0BAAiB,CAAC,qBAAY,CAAC,CAAC,CAAC;AACpE,CAAC,GAAA,CAAA"}

package/dist/cjs/assets/BlockStates.d.ts

@@ -8,4 +8,5 @@ export declare class BlockStates {
     static getDefaultState(key: AssetKey): Maybe<BlockStatePropertyDefaults>;
     static get(key: AssetKey): Promise<Maybe<BlockState>>;
     static getAll(keys: AssetKey[] | Iterable<AssetKey>): Promise<Maybe<BlockState>[]>;
+    static clearCache(): Promise<void>;
 }

package/dist/cjs/assets/BlockStates.js

@@ -26,11 +26,12 @@ const typescript_memoize_1 = require("typescript-memoize");
 const defaultBlockStates_json_1 = __importDefault(require("../model/defaultBlockStates.json"));
 const AssetKey_1 = require("./AssetKey");
 const PersistentCache_1 = require("../cache/PersistentCache");
+const AssetParsers_1 = require("./source/parser/AssetParsers");
 class BlockStates {
     // BlockState names are hardcoded
     static getList() {
         return __awaiter(this, void 0, void 0, function* () {
-            return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, "_list", "blockstates", undefined, "assets", ".json", Assets_1.DEFAULT_ROOT), AssetLoader_1.AssetLoader.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
+            return AssetLoader_1.AssetLoader.get(new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, "_list", "blockstates", undefined, "assets", ".json", Assets_1.DEFAULT_ROOT), AssetParsers_1.AssetParser.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
         });
     }
     static getDefaultState(key) {
@@ -47,9 +48,7 @@ class BlockStates {
             const keyStr = key.serialize();
             return Caching_1.Caching.blockStateCache.get(keyStr, k => {
                 return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(key, AssetLoader_1.AssetLoader.BLOCKSTATE).then(asset => {
-                        return asset;
-                    });
+                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.BLOCKSTATE);
                 });
             }).then(asset => {
                 if (asset) {
@@ -66,6 +65,11 @@ class BlockStates {
         }
         return Promise.all(promises);
     }
+    static clearCache() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.PERSISTENT_CACHE.clear();
+        });
+    }
 }
 BlockStates.PERSISTENT_CACHE = PersistentCache_1.PersistentCache.open("minerender-blockstates");
 __decorate([

package/dist/cjs/assets/BlockStates.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockStates.js","sourceRoot":"src/","sources":["assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAC5C,qCAA2D;AAC3D,2DAA6C;AAC7C,+FAAkE;AAElE,yCAAsC;AACtC,8DAA2D;AAE3D,MAAa,WAAW;IAIpB,iCAAiC;IAEb,AAAb,MAAM,CAAO,OAAO;;YACvB,OAAO,yBAAW,CAAC,uBAAuB,CAAC,IAAI,mBAAQ,CACnD,0BAAiB,EACjB,OAAO,EACP,aAAa,EACb,SAAS,EACT,QAAQ,EACR,OAAO,EACP,qBAAY,CACf,EAAE,yBAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnD,CAAC;KAAA;IAEM,MAAM,CAAC,eAAe,CAAC,GAAa;QACvC,OAAO,iCAAkB,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IACrF,CAAC;IAEM,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;aACjC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBAChD,OAAO,yBAAW,CAAC,uBAAuB,CAAC,GAAG,EAAE,yBAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBACjF,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAC,MAAM,CAAC,IAAqC;QACtD,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;;AAhDc,4BAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,IAAA,4BAAO,GAAE;gCAWT;AAhBL,kCAoDC"}
+{"version":3,"file":"BlockStates.js","sourceRoot":"src/","sources":["assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAC5C,qCAA2D;AAC3D,2DAA6C;AAC7C,+FAAkE;AAElE,yCAAsC;AACtC,8DAA2D;AAC3D,+DAA2D;AAG3D,MAAa,WAAW;IAIpB,iCAAiC;IAEb,AAAb,MAAM,CAAO,OAAO;;YACvB,OAAO,yBAAW,CAAC,GAAG,CAAY,IAAI,mBAAQ,CAC1C,0BAAiB,EACjB,OAAO,EACP,aAAa,EACb,SAAS,EACT,QAAQ,EACR,OAAO,EACP,qBAAY,CACf,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnD,CAAC;KAAA;IAEM,MAAM,CAAC,eAAe,CAAC,GAAa;QACvC,OAAO,iCAAkB,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IACrF,CAAC;IAEM,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;aACjC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBAChD,OAAO,yBAAW,CAAC,GAAG,CAAa,GAAG,EAAE,0BAAW,CAAC,UAAU,CAAC,CAAC;gBACpE,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAC,MAAM,CAAC,IAAqC;QACtD,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACxC,CAAC;KAAA;;AAlDc,4BAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,IAAA,4BAAO,GAAE;gCAWT;AAhBL,kCAsDC"}

package/dist/cjs/assets/ModelTextures.js

@@ -15,6 +15,7 @@ const AssetLoader_1 = require("./AssetLoader");
 const ImageLoader_1 = require("../image/ImageLoader");
 const PersistentCache_1 = require("../cache/PersistentCache");
 const AssetKey_1 = require("./AssetKey");
+const AssetParsers_1 = require("./source/parser/AssetParsers");
 class ModelTextures {
     static get(key) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -29,7 +30,7 @@ class ModelTextures {
         return __awaiter(this, void 0, void 0, function* () {
             const keyStr = key.serialize();
             return Caching_1.Caching.textureAssetCache.get(keyStr, k => {
-                return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(key, AssetLoader_1.AssetLoader.IMAGE).then(asset => {
+                return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.IMAGE).then(asset => {
                     if (asset)
                         asset.key = key;
                     return asset;
@@ -46,7 +47,7 @@ class ModelTextures {
             const keyStr = key.serialize();
             return Caching_1.Caching.textureMetaCache.get(keyStr, k => {
                 return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(key, AssetLoader_1.AssetLoader.META).then(asset => {
+                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.META).then(asset => {
                         if (asset)
                             asset.key = key;
                         return asset;

package/dist/cjs/assets/ModelTextures.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAE5C,sDAAmD;AAGnD,8DAA2D;AAE3D,yCAAsC;AAEtC,MAAa,aAAa;IAIf,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACP,OAAO,yBAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC7C,OAAO,yBAAW,CAAC,uBAAuB,CAAe,GAAG,EAAE,yBAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC1F,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,mBAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;aAC9B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAE/B,OAAO,iBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBACrD,OAAO,yBAAW,CAAC,uBAAuB,CAAuB,GAAG,EAAE,yBAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBACjG,IAAI,KAAK;4BACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;wBACpB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC7C,CAAC;KAAA;;AA3CL,sCA6CC;AA3CkB,mCAAqB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAE5C,sDAAmD;AAGnD,8DAA2D;AAE3D,yCAAsC;AACtC,+DAA2D;AAE3D,MAAa,aAAa;IAIf,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACP,OAAO,yBAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC7C,OAAO,yBAAW,CAAC,GAAG,CAAe,GAAG,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBACtE,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,mBAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;aAC9B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAE/B,OAAO,iBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBACrD,OAAO,yBAAW,CAAC,GAAG,CAAuB,GAAG,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAC7E,IAAI,KAAK;4BACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;wBACpB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC7C,CAAC;KAAA;;AA3CL,sCA6CC;AA3CkB,mCAAqB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}

package/dist/cjs/assets/Models.js

@@ -23,10 +23,11 @@ const typescript_memoize_1 = require("typescript-memoize");
 const Assets_1 = require("./Assets");
 const PersistentCache_1 = require("../cache/PersistentCache");
 const AssetKey_1 = require("./AssetKey");
+const AssetParsers_1 = require("./source/parser/AssetParsers");
 class Models {
     static getItemList() {
         return __awaiter(this, void 0, void 0, function* () {
-            return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", Assets_1.DEFAULT_ROOT), AssetLoader_1.AssetLoader.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
+            return AssetLoader_1.AssetLoader.get(new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", Assets_1.DEFAULT_ROOT), AssetParsers_1.AssetParser.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
         });
     }
     static loadAndMerge(key) {
@@ -49,9 +50,7 @@ class Models {
             const keyStr = key.serialize();
             return Caching_1.Caching.rawModelCache.get(keyStr, k => {
                 return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(key, AssetLoader_1.AssetLoader.MODEL).then(asset => {
-                        return asset;
-                    });
+                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.MODEL);
                 });
             }).then(asset => {
                 if (asset) {

package/dist/cjs/assets/Models.js.map

@@ -1 +1 @@
-{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,8CAA2C;AAG3C,sDAAmD;AACnD,+CAA4C;AAC5C,2DAA6C;AAC7C,qCAA2D;AAC3D,8DAA2D;AAC3D,yCAAsC;AAEtC,+DAA2D;AAE3D,MAAa,MAAM;IAKK,AAAb,MAAM,CAAO,WAAW;;YAC3B,OAAO,yBAAW,CAAC,GAAG,CAAY,IAAI,mBAAQ,CAC1C,0BAAiB,EACjB,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,qBAAY,CACf,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnD,CAAC;KAAA;IAEM,MAAM,CAAO,YAAY,CAAC,GAAa;;YAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,EAAE;gBACR,OAAO,SAAS,CAAC;aACpB;YACD,OAAO,yBAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;KAAA;IAEM,MAAM,CAAO,MAAM,CAAC,GAAa;;YACpC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;aAC5B;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBACzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBAChD,OAAO,yBAAW,CAAC,GAAG,CAAQ,GAAG,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC;gBAC1D,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,SAAS,CAAC,GAAa;;YACvC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;aAC5B;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,iBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,wBAAwB;gBACxB,OAAO,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;KAAA;;AA/Dc,uBAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;AAGxD;IADnB,IAAA,4BAAO,GAAE;+BAWT;AAfL,wBAmEC"}

package/dist/cjs/assets/index.d.ts

@@ -0,0 +1,8 @@
+export * from './AssetKey';
+export * from './AssetLoader';
+export * from './Assets';
+export * from './BlockStates';
+export * from './Entities';
+export * from './ModelTextures';
+export * from './Models';
+export * from './source';

package/dist/cjs/assets/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// autogenerated
+__exportStar(require("./AssetKey"), exports);
+__exportStar(require("./AssetLoader"), exports);
+__exportStar(require("./Assets"), exports);
+__exportStar(require("./BlockStates"), exports);
+__exportStar(require("./Entities"), exports);
+__exportStar(require("./ModelTextures"), exports);
+__exportStar(require("./Models"), exports);
+__exportStar(require("./source"), exports);
+//# sourceMappingURL=index.js.map

package/dist/cjs/assets/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gBAAgB;AAChB,6CAA2B;AAC3B,gDAA8B;AAC9B,2CAAyB;AACzB,gDAA8B;AAC9B,6CAA2B;AAC3B,kDAAgC;AAChC,2CAAyB;AACzB,2CAAyB"}

package/dist/cjs/assets/source/AssetSource.d.ts

@@ -0,0 +1,8 @@
+import { MinecraftAsset } from "../../MinecraftAsset";
+import { AssetKey } from "../AssetKey";
+import { Maybe } from "../../util";
+import { AssetParser } from "./parser/AssetParsers";
+export declare abstract class AssetSource {
+    protected constructor();
+    abstract get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
+}

package/dist/cjs/assets/source/AssetSource.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssetSource = void 0;
+class AssetSource {
+    constructor() {
+    }
+}
+exports.AssetSource = AssetSource;
+//# sourceMappingURL=AssetSource.js.map

package/dist/cjs/assets/source/AssetSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssetSource.js","sourceRoot":"src/","sources":["assets/source/AssetSource.ts"],"names":[],"mappings":";;;AAKA,MAAsB,WAAW;IAE7B;IACA,CAAC;CAIJ;AAPD,kCAOC"}

package/dist/cjs/assets/source/HostedAssetSource.d.ts

@@ -0,0 +1,33 @@
+import { AssetSource } from ".";
+import { BlockState, Model, TextureAsset } from "../../model";
+import { Maybe } from "../../util";
+import { MinecraftTextureMeta } from "../../MinecraftTextureMeta";
+import { NBTAsset } from "../../nbt";
+import { ListAsset } from "../../ListAsset";
+import { MinecraftAsset } from "../../MinecraftAsset";
+import { AssetKey } from "../AssetKey";
+import { AssetParser } from "./parser";
+import { ResponseParser } from "./parser";
+export declare class HostedAssetSource extends AssetSource {
+    static readonly MODEL: ResponseParser<Model>;
+    static readonly BLOCKSTATE: ResponseParser<BlockState>;
+    static readonly META: ResponseParser<MinecraftTextureMeta>;
+    static readonly NBT: ResponseParser<NBTAsset>;
+    static readonly IMAGE: ResponseParser<TextureAsset>;
+    static readonly LIST: ResponseParser<ListAsset>;
+    static readonly JSON: ResponseParser<any>;
+    static readonly PARSER_MAP: Map<AssetParser, ResponseParser<any>>;
+    loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
+    protected load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
+    assetBasePath(key: AssetKey): string;
+    private readonly _root;
+    private readonly _options;
+    constructor(root: string, options?: Partial<HostedAssetSourceOptions>);
+    get root(): string;
+    get options(): HostedAssetSourceOptions;
+    get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser): Promise<Maybe<T>>;
+}
+interface HostedAssetSourceOptions {
+    retryDefaults: boolean;
+}
+export {};