minerender 1.4.11 → 2.0.0-alpha.1

package/src/assets/AssetKey.d.ts

@@ -0,0 +1,24 @@
+import { Serializable } from "../Serializable";
+export declare type AssetType = "models" | "textures" | "blockstates" | string;
+export declare class BasicAssetKey implements Serializable {
+    readonly namespace: string;
+    readonly path: string;
+    constructor(key: BasicAssetKey);
+    constructor(namespace: string, path: string);
+    toNamespacedString(): string;
+    toString(): string;
+    serialize(): string;
+}
+export declare class AssetKey extends BasicAssetKey {
+    readonly namespace: string;
+    readonly path: string;
+    assetType?: string | undefined;
+    type?: string | undefined;
+    rootType: "assets" | "data" | string;
+    extension: ".json" | ".png" | string;
+    root?: string | undefined;
+    constructor(namespace: string, path: string, assetType?: string | undefined, type?: string | undefined, rootType?: "assets" | "data" | string, extension?: ".json" | ".png" | string, root?: string | undefined);
+    static parse(assetType: AssetType, str: string, origin?: AssetKey): AssetKey;
+    toString(): string;
+    serialize(): string;
+}

package/src/assets/AssetKey.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssetKey = exports.BasicAssetKey = void 0;
+const util_1 = require("../util/util");
+const Assets_1 = require("./Assets");
+class BasicAssetKey {
+    constructor(namespaceOrKey, path) {
+        if (path) {
+            this.namespace = namespaceOrKey;
+            this.path = path;
+        }
+        else {
+            this.namespace = namespaceOrKey.namespace;
+            this.path = namespaceOrKey.path;
+        }
+    }
+    toNamespacedString() {
+        return this.namespace + ":" + this.path;
+    }
+    toString() {
+        return this.toNamespacedString();
+    }
+    serialize() {
+        return this.toString();
+    }
+}
+exports.BasicAssetKey = BasicAssetKey;
+class AssetKey extends BasicAssetKey {
+    constructor(namespace, path, assetType, type, rootType = "assets", extension = ".json", root) {
+        super(namespace, path);
+        this.namespace = namespace;
+        this.path = path;
+        this.assetType = assetType;
+        this.type = type;
+        this.rootType = rootType;
+        this.extension = extension;
+        this.root = root;
+    }
+    static parse(assetType, str, origin) {
+        let namespace = (origin === null || origin === void 0 ? void 0 : origin.namespace) || Assets_1.DEFAULT_NAMESPACE;
+        if (str.includes(":")) {
+            let split = str.split("\:");
+            namespace = split[0];
+            str = split[1];
+        }
+        let split = str.split("\/");
+        let type = split[0];
+        split.shift();
+        let path = split.join("/");
+        let extension = assetType === "models" ? ".json" :
+            assetType === "textures" ? ".png" :
+                (origin === null || origin === void 0 ? void 0 : origin.assetType) || "";
+        return new AssetKey(namespace, path, assetType, type, "assets", extension, origin === null || origin === void 0 ? void 0 : origin.root);
+    }
+    toString() {
+        return [
+            "root" in this ? this.root : "__root__",
+            "rootType" in this ? this.rootType : "__rootType__",
+            "assetType" in this ? this.assetType : "__assetType__",
+            "type" in this ? this.type : "__type__",
+            this.namespace,
+            this.path
+        ].join("/");
+    }
+    serialize() {
+        return util_1.base64encode(this.toString());
+    }
+}
+exports.AssetKey = AssetKey;
+//# sourceMappingURL=AssetKey.js.map

package/src/assets/AssetKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssetKey.js","sourceRoot":"./","sources":["src/assets/AssetKey.ts"],"names":[],"mappings":"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"}

package/src/assets/AssetKey.ts

@@ -0,0 +1,98 @@
+import { base64encode, md5 } from "../util/util";
+import { Serializable } from "../Serializable";
+import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "./Assets";
+import { AssetLoader } from "./AssetLoader";
+
+export type AssetType = "models" | "textures" | "blockstates" | string;
+
+export class BasicAssetKey implements Serializable {
+
+    readonly namespace: string;
+    readonly path: string;
+
+    constructor(key: BasicAssetKey);
+    constructor(namespace: string, path: string);
+    constructor(namespaceOrKey: string | BasicAssetKey, path?: string) {
+        if (path) {
+            this.namespace = namespaceOrKey as string;
+            this.path = path;
+        } else {
+            this.namespace = (namespaceOrKey as BasicAssetKey).namespace;
+            this.path = (namespaceOrKey as BasicAssetKey).path
+        }
+    }
+
+    toNamespacedString() {
+        return this.namespace + ":" + this.path;
+    }
+
+    toString() {
+        return this.toNamespacedString();
+    }
+
+    serialize(): string {
+        return this.toString();
+    }
+}
+
+export class AssetKey extends BasicAssetKey {
+
+    constructor(
+        readonly namespace: string, readonly path: string,
+        public assetType?: AssetType,
+        public type?: string,
+        public rootType: "assets" | "data" | string = "assets",
+        public extension: ".json" | ".png" | string = ".json",
+        public root?: string,
+    ) {
+        super(namespace, path);
+    }
+
+
+    public static parse(assetType: AssetType, str: string, origin?: AssetKey): AssetKey {
+        let namespace = origin?.namespace || DEFAULT_NAMESPACE;
+        if (str.includes(":")) {
+            let split = str.split("\:");
+            namespace = split[0];
+            str = split[1];
+        }
+
+        let split = str.split("\/");
+        let type: string | undefined = undefined;
+        if (split.length > 1) {
+            type = split[0];
+            split.shift();
+        }
+        let path = split.join("/");
+
+        let extension = assetType === "models" ? ".json" :
+            assetType === "textures" ? ".png" :
+                origin?.assetType || "";
+
+        return new AssetKey(namespace, path, assetType, type, "assets", extension, origin?.root);
+    }
+
+    toString(): string {
+        let a = [
+            (typeof this.root !== 'undefined' || AssetLoader.ROOT !== DEFAULT_ROOT) ? (this.root ?? AssetLoader.ROOT) : "__root__",
+            this.rootType ?? "__rootType__",
+            this.assetType ?? "__assetType__",
+            this.type ?? "__type__",
+            this.namespace,
+            this.path
+        ];
+        return a.join("/");
+    }
+
+    serialize(): string {
+        return this.toString();
+    }
+}
+
+export function isBasicAssetKey(obj: any): obj is BasicAssetKey {
+    return "namespace" in obj && "path" in obj;
+}
+
+export function isAssetKey(obj: any): obj is AssetKey {
+    return isBasicAssetKey(obj) && "parse" in obj;
+}

package/src/assets/AssetLoader.d.ts

@@ -0,0 +1,25 @@
+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>>;
+}
+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 loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
+    protected static load<T>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
+    static assetBasePath(key: AssetKey): string;
+}

package/src/assets/AssetLoader.js

@@ -0,0 +1,132 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssetLoader = void 0;
+const Requests_1 = require("../request/Requests");
+const debug_1 = require("../util/debug");
+const ImageLoader_1 = require("../image/ImageLoader");
+const debug_2 = __importDefault(require("debug"));
+const Assets_1 = require("./Assets");
+const AssetKey_1 = require("./AssetKey");
+const NBTHelper_1 = require("../nbt/NBTHelper");
+const d = debug_2.default(`${debug_1.DEBUG_NAMESPACE}:AssetLoader`);
+class AssetLoader {
+    static async loadOrRetryWithDefaults(key, parser) {
+        const direct = await this.load(key, parser);
+        if (direct) {
+            return direct;
+        }
+        if (key.namespace !== Assets_1.DEFAULT_NAMESPACE) {
+            d("Retrying %j with default namespace", key);
+            // 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.extension, key.root);
+            const namespaced = await this.load(namespaceKey, parser);
+            if (namespaced) {
+                return namespaced;
+            }
+            if (key.root !== undefined && key.root !== Assets_1.DEFAULT_ROOT) {
+                d("Retrying %j with default root+namespace", key);
+                // Try both defaults
+                const namespacedRootedKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.extension, Assets_1.DEFAULT_ROOT);
+                const namespacedRooted = await this.load(namespacedRootedKey, parser);
+                if (namespacedRooted) {
+                    return namespacedRooted;
+                }
+            }
+        }
+        else if (key.root !== undefined && key.root !== Assets_1.DEFAULT_ROOT) {
+            d("Retrying %j with default root", key);
+            // Try on default root
+            const rootKey = new AssetKey_1.AssetKey(key.namespace, key.path, key.assetType, key.type, key.extension, Assets_1.DEFAULT_ROOT);
+            const rooted = await this.load(rootKey, parser);
+            if (rooted) {
+                return rooted;
+            }
+        }
+        return undefined;
+    }
+    static async load(key, parser) {
+        d("Loading %j", key);
+        let req = {
+            url: `${this.assetBasePath(key)}${key.type ? '/' + key.type : ''}/${key.path}${key.extension}`
+        };
+        parser.config(req);
+        return await Requests_1.Requests.mcAssetRequest(req)
+            .then(response => {
+            if (response && response.data) {
+                return parser.parse(response);
+            }
+            return undefined;
+        })
+            .catch(err => {
+            if (err.response) {
+                let response = err.response;
+                if (response.status === 404) {
+                    d("%j not found", key);
+                    return undefined;
+                }
+            }
+            d("Failed to load %j: %s", key, err === null || err === void 0 ? void 0 : err.message);
+            return undefined;
+        });
+    }
+    static assetBasePath(key) {
+        return `${key.root || Assets_1.DEFAULT_ROOT}/${key.rootType || 'assets'}/${key.namespace || Assets_1.DEFAULT_NAMESPACE}/${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";
+    },
+    async parse(response) {
+        return await ImageLoader_1.ImageLoader.processResponse(response);
+    }
+};
+AssetLoader.LIST = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+AssetLoader.JSON = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+//# sourceMappingURL=AssetLoader.js.map

package/src/assets/AssetLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssetLoader.js","sourceRoot":"./","sources":["src/assets/AssetLoader.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA+C;AAE/C,yCAAgD;AAEhD,sDAA8D;AAC9D,kDAA0B;AAG1B,qCAA2D;AAE3D,yCAAsC;AAEtC,gDAAuD;AAEvD,MAAM,CAAC,GAAG,eAAK,CAAC,GAAI,uBAAgB,cAAc,CAAC,CAAC;AAQpD,MAAa,WAAW;IAuDb,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAA2B,GAAa,EAAE,MAAyB;QAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,GAAG,CAAC,SAAS,KAAK,0BAAiB,EAAE;YACrC,CAAC,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;YAC7C,6DAA6D;YAC7D,MAAM,YAAY,GAAG,IAAI,mBAAQ,CAAC,0BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACjH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,YAAY,EAAE,MAAM,CAAC,CAAC;YAC5D,IAAI,UAAU,EAAE;gBACZ,OAAO,UAAU,CAAC;aACrB;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAY,EAAE;gBACrD,CAAC,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAC;gBAClD,oBAAoB;gBACpB,MAAM,mBAAmB,GAAG,IAAI,mBAAQ,CAAC,0BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,qBAAY,CAAC,CAAC;gBAC5H,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,mBAAmB,EAAE,MAAM,CAAC,CAAC;gBACzE,IAAI,gBAAgB,EAAE;oBAClB,OAAO,gBAAgB,CAAC;iBAC3B;aACJ;SACJ;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAY,EAAE;YAC5D,CAAC,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;YACxC,sBAAsB;YACtB,MAAM,OAAO,GAAG,IAAI,mBAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,qBAAY,CAAC,CAAC;YAC5G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAI,OAAO,EAAE,MAAM,CAAC,CAAC;YACnD,IAAI,MAAM,EAAE;gBACR,OAAO,MAAM,CAAC;aACjB;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAGS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAI,GAAa,EAAE,MAAyB;QACnE,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACrB,IAAI,GAAG,GAAuB;YAC1B,GAAG,EAAE,GAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAE,GAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAG,IAAK,GAAG,CAAC,IAAK,GAAI,GAAG,CAAC,SAAU,EAAE;SACzG,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,MAAM,mBAAQ,CAAC,cAAc,CAAC,GAAG,CAAC;aACpC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACb,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;gBAC3B,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aACjC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,QAAQ,GAAG,GAAG,CAAC,QAAyB,CAAC;gBAC7C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;oBACzB,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;oBACvB,OAAO,SAAS,CAAC;iBACpB;aACJ;YACD,CAAC,CAAC,uBAAuB,EAAE,GAAG,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAA;IACV,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,GAAa;QACrC,OAAO,GAAI,GAAG,CAAC,IAAI,IAAI,qBAAa,IAAK,GAAG,CAAC,QAAQ,IAAI,QAAS,IAAK,GAAG,CAAC,SAAS,IAAI,0BAAkB,IAAK,GAAG,CAAC,SAAU,EAAE,CAAC;IACpI,CAAC;;AAtHL,kCAwHC;AAtHmB,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,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC;IACzC,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;IACD,KAAK,CAAC,KAAK,CAAC,QAAuB;QAC/B,OAAO,MAAM,yBAAW,CAAC,eAAe,CAAC,QAAQ,CAAiB,CAAC;IACvE,CAAC;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"}

package/src/assets/AssetLoader.ts

@@ -0,0 +1,152 @@
+import { Model, TextureAsset } from "../model/Model";
+import { Maybe } from "../util/util";
+import { Requests } from "../request/Requests";
+import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { MinecraftAsset } from "../MinecraftAsset";
+import { ImageInfo, ImageLoader } from "../image/ImageLoader";
+import { MinecraftTextureMeta } from "../MinecraftTextureMeta";
+import { BlockState } from "../model/block/BlockState";
+import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "./Assets";
+import { ListAsset } from "../ListAsset";
+import { AssetKey } from "./AssetKey";
+import { NBTAsset, NBTHelper } from "../nbt/NBTHelper";
+import { prefix } from "../util/log";
+
+const p = prefix("AssetLoader");
+
+export interface ResponseParser<T extends MinecraftAsset> {
+    config(request: AxiosRequestConfig);
+
+    parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
+}
+
+export class AssetLoader {
+
+    static readonly MODEL: ResponseParser<Model> = {
+        config(request: AxiosRequestConfig) {
+        },
+        parse(response: AxiosResponse): Maybe<Model> {
+            return response.data as Model;
+        }
+    }
+    static readonly BLOCKSTATE: ResponseParser<BlockState> = {
+        config(request: AxiosRequestConfig) {
+        },
+        parse(response: AxiosResponse): Maybe<BlockState> {
+            return response.data as BlockState;
+        }
+    }
+    static readonly META: ResponseParser<MinecraftTextureMeta> = {
+        config(request: AxiosRequestConfig) {
+            // request.responseType = "arraybuffer";
+        },
+        parse(response: AxiosResponse): Maybe<MinecraftTextureMeta> {
+            return response.data as MinecraftTextureMeta;
+        }
+    }
+    static readonly NBT: ResponseParser<NBTAsset> = {
+        config(request: AxiosRequestConfig) {
+            request.responseType = "arraybuffer";
+        },
+        parse(response: AxiosResponse): Promise<Maybe<NBTAsset>> {
+            return NBTHelper.fromBuffer(Buffer.from(response.data));
+        }
+    }
+    static readonly IMAGE: ResponseParser<TextureAsset> = {
+        config(request: AxiosRequestConfig) {
+            request.responseType = "arraybuffer";
+        },
+        async parse(response: AxiosResponse): Promise<Maybe<TextureAsset>> {
+            return await ImageLoader.processResponse(response) as TextureAsset;
+        }
+    }
+    static readonly LIST: ResponseParser<ListAsset> = {
+        config(request: AxiosRequestConfig) {
+        },
+        parse(response: AxiosResponse): Maybe<ListAsset> {
+            return response.data as ListAsset;
+        }
+    }
+    static readonly JSON: ResponseParser<any> = {
+        config(request: AxiosRequestConfig) {
+        },
+        parse(response: AxiosResponse): Maybe<any> {
+            return response.data;
+        }
+    }
+
+    static ROOT: string = DEFAULT_ROOT;
+
+    public static async loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>> {
+        const direct = await this.load<T>(key, parser);
+        if (typeof direct !== "undefined") {
+            return direct;
+        }
+        if (key.namespace !== DEFAULT_NAMESPACE) {
+            console.info(p, "Retrying", key, "with default namespace");
+            // Try on the same host but with default minecraft: namespace
+            const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
+            const namespaced = await this.load<T>(namespaceKey, parser);
+            if (typeof namespaced !== "undefined") {
+                return namespaced;
+            }
+            if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== DEFAULT_ROOT)) {
+                console.info(p, "Retrying", key, "with default root+namespace");
+                // Try both defaults
+                const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+                const namespacedRooted = await this.load<T>(namespacedRootedKey, parser);
+                if (typeof namespacedRooted !== "undefined") {
+                    return namespacedRooted;
+                }
+            }
+        } else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== DEFAULT_ROOT)) {
+            console.info(p, "Retrying", key, "with default root");
+            // Try on default root
+            const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+            const rooted = await this.load<T>(rootKey, parser);
+            if (typeof rooted !== "undefined") {
+                return rooted;
+            }
+        }
+        return undefined;
+    }
+
+
+    protected static async load<T>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>> {
+        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: AxiosRequestConfig = {
+            url: url
+        };
+        parser.config(req);
+        return await 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 as AxiosResponse;
+                    if (response.status === 404) {
+                        console.debug(p, key, "not found");
+                        return undefined;
+                    }
+                }
+                console.debug(p, "Failed to load", key, err?.message);
+                return undefined;
+            })
+    }
+
+    public static assetBasePath(key: AssetKey) {
+        return `${ key.root ?? this.ROOT }/${ key.rootType !== undefined ? key.rootType + '/' : '' }${ key.namespace !== undefined ? key.namespace + '/' : '' }${ key.assetType !== undefined ? key.assetType + '/' : '' }`;
+    }
+
+}

package/src/assets/Assets.d.ts

@@ -0,0 +1,14 @@
+import { Model } from "../model/Model";
+import { Maybe } from "../util/util";
+import { BlockState } from "../model/block/BlockState";
+import { AssetKey, AssetType } from "./AssetKey";
+export declare const DEFAULT_ROOT = "https://cdn.mcasset.cloud/file/minecraft-assets/1.16.5";
+export declare const DEFAULT_NAMESPACE = "minecraft";
+export declare class Assets {
+    /**
+     * @deprecated
+     */
+    static parseAssetKey(assetType: AssetType, str: string, origin?: AssetKey): AssetKey;
+    static getModel(key: AssetKey): Promise<Maybe<Model>>;
+    static getBlockState(key: AssetKey): Promise<Maybe<BlockState>>;
+}

package/src/assets/Assets.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Assets = exports.DEFAULT_NAMESPACE = exports.DEFAULT_ROOT = void 0;
+const Models_1 = require("./Models");
+const BlockStates_1 = require("./BlockStates");
+const AssetKey_1 = require("./AssetKey");
+exports.DEFAULT_ROOT = "https://cdn.mcasset.cloud/file/minecraft-assets/1.16.5";
+exports.DEFAULT_NAMESPACE = "minecraft";
+class Assets {
+    /**
+     * @deprecated
+     */
+    static parseAssetKey(assetType, str, origin) {
+        return AssetKey_1.AssetKey.parse(assetType, str, origin);
+    }
+    static async getModel(key) {
+        return Models_1.Models.getMerged(key);
+    }
+    static async getBlockState(key) {
+        return BlockStates_1.BlockStates.get(key);
+    }
+}
+exports.Assets = Assets;
+//# sourceMappingURL=Assets.js.map

package/src/assets/Assets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Assets.js","sourceRoot":"./","sources":["src/assets/Assets.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAIlC,+CAA4C;AAC5C,yCAAiD;AAEpC,QAAA,YAAY,GAAG,wDAAwD,CAAC;AACxE,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAE7C,MAAa,MAAM;IAEf;;OAEG;IACI,MAAM,CAAC,aAAa,CAAC,SAAoB,EAAE,GAAW,EAAE,MAAiB;QAC5E,OAAO,mBAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAa;QACtC,OAAO,eAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAa;QAC3C,OAAO,yBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CAEJ;AAjBD,wBAiBC"}

package/src/assets/Assets.ts

@@ -0,0 +1,28 @@
+import { Models } from "./Models";
+import { Model } from "../model/Model";
+import { Maybe } from "../util/util";
+import { BlockState } from "../model/block/BlockState";
+import { BlockStates } from "./BlockStates";
+import { AssetKey, AssetType } from "./AssetKey";
+
+export const DEFAULT_ROOT = "https://cdn.mcasset.cloud/file/minecraft-assets/1.17.1";
+export const DEFAULT_NAMESPACE = "minecraft";
+
+export class Assets {
+
+    /**
+     * @deprecated
+     */
+    public static parseAssetKey(assetType: AssetType, str: string, origin?: AssetKey): AssetKey {
+        return AssetKey.parse(assetType, str, origin);
+    }
+
+    public static async getModel(key: AssetKey): Promise<Maybe<Model>> {
+        return Models.getMerged(key);
+    }
+
+    public static async getBlockState(key: AssetKey): Promise<Maybe<BlockState>> {
+        return BlockStates.get(key);
+    }
+
+}

package/src/assets/BlockStates.d.ts

@@ -0,0 +1,9 @@
+import { Maybe } from "../util/util";
+import { BlockState } from "../model/block/BlockState";
+import { BlockStatePropertyDefaults } from "../model/block/BlockStateProperties";
+import { AssetKey } from "./AssetKey";
+export declare class BlockStates {
+    static getList(): Promise<string[]>;
+    static getDefaultState(key: AssetKey): Maybe<BlockStatePropertyDefaults>;
+    static get(key: AssetKey): Promise<Maybe<BlockState>>;
+}

package/src/assets/BlockStates.js

@@ -0,0 +1,51 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockStates = void 0;
+const Caching_1 = require("../cache/Caching");
+const AssetLoader_1 = require("./AssetLoader");
+const Assets_1 = require("./Assets");
+const typscript_memoize_1 = require("typscript-memoize");
+const defaultBlockStates_json_1 = __importDefault(require("../model/defaultBlockStates.json"));
+const AssetKey_1 = require("./AssetKey");
+class BlockStates {
+    // BlockState names are hardcoded
+    static async getList() {
+        return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, "_list", "blockstates", undefined, ".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 : []; });
+    }
+    static getDefaultState(key) {
+        return defaultBlockStates_json_1.default["minecraft:" + key.path];
+    }
+    static async get(key) {
+        if (!key.assetType) {
+            key.assetType = "blockstates";
+        }
+        if (!key.extension) {
+            key.extension = ".json";
+        }
+        const keyStr = key.serialize();
+        return Caching_1.Caching.blockStateCache.get(keyStr, k => {
+            return AssetLoader_1.AssetLoader.loadOrRetryWithDefaults(key, AssetLoader_1.AssetLoader.BLOCKSTATE).then(asset => {
+                return asset;
+            });
+        }).then(asset => {
+            if (asset) {
+                asset.key = key;
+            }
+            return asset;
+        });
+    }
+}
+__decorate([
+    typscript_memoize_1.Memoize()
+], BlockStates, "getList", null);
+exports.BlockStates = BlockStates;
+//# sourceMappingURL=BlockStates.js.map

package/src/assets/BlockStates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockStates.js","sourceRoot":"./","sources":["src/assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAC5C,qCAA2D;AAC3D,yDAA4C;AAC5C,+FAAkE;AAElE,yCAAsC;AAEtC,MAAa,WAAW;IAEpB,iCAAiC;IAE1B,MAAM,CAAC,KAAK,CAAC,OAAO;QACvB,OAAO,yBAAW,CAAC,uBAAuB,CAAC,IAAI,mBAAQ,CACnD,0BAAiB,EACjB,OAAO,EACP,aAAa,EACb,SAAS,EACT,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;IACnD,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,GAAa;QACvC,OAAO,iCAAkB,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IACrF,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAa;QACjC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;SACjC;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;SAC3B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,iBAAO,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC3C,OAAO,yBAAW,CAAC,uBAAuB,CAAC,GAAG,EAAE,yBAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACjF,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACZ,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;aACnB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AAnCG;IADC,2BAAO,EAAE;gCAUT;AAbL,kCAuCC"}