minerender 2.0.0-alpha.13 → 2.0.0-alpha.15

package/dist/cjs/assets/AssetLoader.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,38 +31,34 @@ class AssetLoader {
         }
         return undefined;
     }
-    static getAll(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log(this._SOURCES);
-            let promises = [];
-            for (const source of this._SOURCES) {
-                promises.push(source.source.get(key, parser));
-            }
-            return Promise.all(promises).then(results => {
-                return results.filter(r => r != undefined);
-            });
+    static async getAll(key, parser) {
+        console.log(this._SOURCES);
+        let promises = [];
+        for (const source of this._SOURCES) {
+            promises.push(source.source.get(key, parser));
+        }
+        return Promise.all(promises).then(results => {
+            return results.filter(r => r != undefined);
         });
     }
-    static get(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log(this._SOURCES);
-            let promises = [];
-            for (const source of this._SOURCES) {
-                promises.push(source.source.get(key, parser));
-            }
-            return Promise.all(promises).then(results => {
-                const fallback = results[results.length - 1];
-                for (const result of results) {
-                    if (result) {
-                        if (fallback) {
-                            // we have a fallback, so merge it with the result
-                            return (0, ts_deepmerge_1.default)({}, fallback, result);
-                        }
-                        return result;
+    static async get(key, parser) {
+        console.log(this._SOURCES);
+        let promises = [];
+        for (const source of this._SOURCES) {
+            promises.push(source.source.get(key, parser));
+        }
+        return Promise.all(promises).then(results => {
+            const fallback = results[results.length - 1];
+            for (const result of results) {
+                if (result) {
+                    if (fallback) {
+                        // we have a fallback, so merge it with the result
+                        return (0, ts_deepmerge_1.default)({}, fallback, result);
                     }
+                    return result;
                 }
-                return undefined;
-            });
+            }
+            return undefined;
         });
     }
 }

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

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

package/dist/cjs/assets/Assets.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Assets = exports.DEFAULT_NAMESPACE = exports.DEFAULT_ROOT = void 0;
 const Models_1 = require("./Models");
@@ -22,15 +13,11 @@ class Assets {
     static parseAssetKey(assetType, str, origin) {
         return AssetKey_1.AssetKey.parse(assetType, str, origin);
     }
-    static getModel(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Models_1.Models.getMerged(key);
-        });
+    static async getModel(key) {
+        return Models_1.Models.getMerged(key);
     }
-    static getBlockState(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return BlockStates_1.BlockStates.get(key);
-        });
+    static async getBlockState(key) {
+        return BlockStates_1.BlockStates.get(key);
     }
 }
 exports.Assets = Assets;

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

@@ -1 +1 @@
-{"version":3,"file":"Assets.js","sourceRoot":"src/","sources":["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,CAAO,QAAQ,CAAC,GAAa;;YACtC,OAAO,eAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;KAAA;IAEM,MAAM,CAAO,aAAa,CAAC,GAAa;;YAC3C,OAAO,yBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;KAAA;CAEJ;AAjBD,wBAiBC"}
+{"version":3,"file":"Assets.js","sourceRoot":"src/","sources":["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/dist/cjs/assets/BlockStates.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultBlockStates = exports.BlockStates = void 0;
 const Caching_1 = require("../cache/Caching");
@@ -25,45 +16,37 @@ 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.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 async getList() {
+        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 => r?.files ?? []);
     }
-    static getDefaultStates() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = AssetKey_1.AssetKey.parse("blockstates", "minerender:defaultBlockStates");
-            return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.JSON);
-        });
+    static async getDefaultStates() {
+        const key = AssetKey_1.AssetKey.parse("blockstates", "minerender:defaultBlockStates");
+        return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.JSON);
     }
-    static getDefaultState(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const defaultStates = yield this.getDefaultStates();
-            if (!defaultStates) {
-                return undefined;
-            }
-            return defaultStates["minecraft:" + key.path];
-        });
+    static async getDefaultState(key) {
+        const defaultStates = await this.getDefaultStates();
+        if (!defaultStates) {
+            return undefined;
+        }
+        return defaultStates["minecraft:" + key.path];
     }
-    static get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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 this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.BLOCKSTATE);
-                });
-            }).then(asset => {
-                if (asset) {
-                    asset.key = key;
-                }
-                return asset;
+    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 this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
+                return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.BLOCKSTATE);
             });
+        }).then(asset => {
+            if (asset) {
+                asset.key = key;
+            }
+            return asset;
         });
     }
     static getAll(keys) {
@@ -73,10 +56,8 @@ class BlockStates {
         }
         return Promise.all(promises);
     }
-    static clearCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.PERSISTENT_CACHE.clear();
-        });
+    static async clearCache() {
+        await this.PERSISTENT_CACHE.clear();
     }
 }
 BlockStates.PERSISTENT_CACHE = PersistentCache_1.PersistentCache.open("minerender-blockstates");

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;AAE7C,yCAAsC;AACtC,8DAA2D;AAC3D,+DAA2D;AAI3D,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;IAGmB,AAAb,MAAM,CAAO,gBAAgB;;YAChC,MAAM,GAAG,GAAG,mBAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,+BAA+B,CAAC,CAAC;YAC3E,OAAO,yBAAW,CAAC,GAAG,CAAqB,GAAG,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC;QACtE,CAAC;KAAA;IAEM,MAAM,CAAO,eAAe,CAAC,GAAa;;YAC7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpD,IAAI,CAAC,aAAa,EAAE;gBAChB,OAAO,SAAS,CAAC;aACpB;YACD,OAAO,aAAa,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;QAChF,CAAC;KAAA;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;;AA5Dc,4BAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,IAAA,4BAAO,GAAE;gCAWT;AAGmB;IADnB,IAAA,4BAAO,GAAE;yCAIT;AAtBL,kCAgEC;AAED,MAAa,kBAAkB;CAE9B;AAFD,gDAEC"}
+{"version":3,"file":"BlockStates.js","sourceRoot":"src/","sources":["assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;AAEA,8CAA2C;AAC3C,+CAA4C;AAC5C,qCAA2D;AAC3D,2DAA6C;AAE7C,yCAAsC;AACtC,8DAA2D;AAC3D,+DAA2D;AAI3D,MAAa,WAAW;IAIpB,iCAAiC;IAEb,AAAb,MAAM,CAAC,KAAK,CAAC,OAAO;QACvB,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,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,gBAAgB;QAChC,MAAM,GAAG,GAAG,mBAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,+BAA+B,CAAC,CAAC;QAC3E,OAAO,yBAAW,CAAC,GAAG,CAAqB,GAAG,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,GAAa;QAC7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,IAAI,CAAC,aAAa,EAAE;YAChB,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,aAAa,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IAChF,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,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;gBAChD,OAAO,yBAAW,CAAC,GAAG,CAAa,GAAG,EAAE,0BAAW,CAAC,UAAU,CAAC,CAAC;YACpE,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;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,CAAC,KAAK,CAAC,UAAU;QAC1B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACxC,CAAC;;AA5Dc,4BAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,IAAA,4BAAO,GAAE;gCAWT;AAGmB;IADnB,IAAA,4BAAO,GAAE;yCAIT;AAtBL,kCAgEC;AAED,MAAa,kBAAkB;CAE9B;AAFD,gDAEC"}

package/dist/cjs/assets/Entities.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockEntityModels = exports.EntityModels = exports.Entities = void 0;
 const AssetKey_1 = require("./AssetKey");
@@ -21,70 +12,58 @@ const AssetLoader_1 = require("./AssetLoader");
 const source_1 = require("./source");
 const typescript_memoize_1 = require("typescript-memoize");
 class Entities {
-    static getBlockEntityModels() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = AssetKey_1.AssetKey.parse("models", "minerender:blockEntityModels");
-            console.log(key);
-            return AssetLoader_1.AssetLoader.get(key, source_1.AssetParser.JSON);
-        });
+    static async getBlockEntityModels() {
+        const key = AssetKey_1.AssetKey.parse("models", "minerender:blockEntityModels");
+        console.log(key);
+        return AssetLoader_1.AssetLoader.get(key, source_1.AssetParser.JSON);
     }
-    static getEntityModels() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = AssetKey_1.AssetKey.parse("models", "minerender:entityModels");
-            console.log(key);
-            return AssetLoader_1.AssetLoader.get(key, source_1.AssetParser.JSON);
-        });
+    static async getEntityModels() {
+        const key = AssetKey_1.AssetKey.parse("models", "minerender:entityModels");
+        console.log(key);
+        return AssetLoader_1.AssetLoader.get(key, source_1.AssetParser.JSON);
     }
     // BlockEntity names are hardcoded
-    static getBlockList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const models = yield this.getBlockEntityModels();
-            if (!models) {
-                return [];
-            }
-            return Object.keys(models);
-        });
+    static async getBlockList() {
+        const models = await this.getBlockEntityModels();
+        if (!models) {
+            return [];
+        }
+        return Object.keys(models);
     }
-    static getEntityList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const models = yield this.getEntityModels();
-            if (!models) {
-                return [];
-            }
-            return Object.keys(models);
-        });
+    static async getEntityList() {
+        const models = await this.getEntityModels();
+        if (!models) {
+            return [];
+        }
+        return Object.keys(models);
     }
-    static getBlock(modelKey, textureKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const models = yield this.getBlockEntityModels();
-            if (!models) {
-                return undefined;
-            }
-            if (!textureKey) {
-                textureKey = modelKey;
-            }
-            const baseKey = modelKey.path.includes("/") ? new AssetKey_1.BasicAssetKey(modelKey.namespace, modelKey.path.split("\/")[0]) : modelKey;
-            return {
-                key: textureKey,
-                parts: models[baseKey.toNamespacedString()]
-            };
-        });
+    static async getBlock(modelKey, textureKey) {
+        const models = await this.getBlockEntityModels();
+        if (!models) {
+            return undefined;
+        }
+        if (!textureKey) {
+            textureKey = modelKey;
+        }
+        const baseKey = modelKey.path.includes("/") ? new AssetKey_1.BasicAssetKey(modelKey.namespace, modelKey.path.split("\/")[0]) : modelKey;
+        return {
+            key: textureKey,
+            parts: models[baseKey.toNamespacedString()]
+        };
     }
-    static getEntity(modelKey, textureKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const models = yield this.getEntityModels();
-            if (!models) {
-                return undefined;
-            }
-            if (!textureKey) {
-                textureKey = modelKey;
-            }
-            const baseKey = modelKey.path.includes("/") ? new AssetKey_1.BasicAssetKey(modelKey.namespace, modelKey.path.split("\/")[0]) : modelKey;
-            return {
-                key: textureKey,
-                parts: models[baseKey.toNamespacedString()]
-            };
-        });
+    static async getEntity(modelKey, textureKey) {
+        const models = await this.getEntityModels();
+        if (!models) {
+            return undefined;
+        }
+        if (!textureKey) {
+            textureKey = modelKey;
+        }
+        const baseKey = modelKey.path.includes("/") ? new AssetKey_1.BasicAssetKey(modelKey.namespace, modelKey.path.split("\/")[0]) : modelKey;
+        return {
+            key: textureKey,
+            parts: models[baseKey.toNamespacedString()]
+        };
     }
 }
 __decorate([

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

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

package/dist/cjs/assets/ModelTextures.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelTextures = void 0;
 const Caching_1 = require("../cache/Caching");
@@ -17,20 +8,32 @@ 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* () {
-            const asset = yield this.preload(key);
-            if (asset) {
-                return ImageLoader_1.ImageLoader.infoToCanvasData(asset);
-            }
-            return undefined;
+    static async get(key) {
+        const asset = await this.preload(key);
+        if (asset) {
+            return ImageLoader_1.ImageLoader.infoToCanvasData(asset);
+        }
+        return undefined;
+    }
+    static async preload(key) {
+        const keyStr = key.serialize();
+        return Caching_1.Caching.textureAssetCache.get(keyStr, k => {
+            return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.IMAGE).then(asset => {
+                if (asset)
+                    asset.key = key;
+                return asset;
+            });
         });
     }
-    static preload(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyStr = key.serialize();
-            return Caching_1.Caching.textureAssetCache.get(keyStr, k => {
-                return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.IMAGE).then(asset => {
+    static async getMeta(key) {
+        if (!key.extension || !key.extension.endsWith(".mcmeta")) {
+            key = Object.assign(new AssetKey_1.AssetKey("", ""), key);
+            key.extension += ".mcmeta";
+        }
+        const keyStr = key.serialize();
+        return Caching_1.Caching.textureMetaCache.get(keyStr, k => {
+            return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
+                return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.META).then(asset => {
                     if (asset)
                         asset.key = key;
                     return asset;
@@ -38,28 +41,8 @@ class ModelTextures {
             });
         });
     }
-    static getMeta(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.extension || !key.extension.endsWith(".mcmeta")) {
-                key = Object.assign(new AssetKey_1.AssetKey("", ""), key);
-                key.extension += ".mcmeta";
-            }
-            const keyStr = key.serialize();
-            return Caching_1.Caching.textureMetaCache.get(keyStr, k => {
-                return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.META).then(asset => {
-                        if (asset)
-                            asset.key = key;
-                        return asset;
-                    });
-                });
-            });
-        });
-    }
-    static clearCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.PERSISTENT_META_CACHE.clear();
-        });
+    static async clearCache() {
+        await this.PERSISTENT_META_CACHE.clear();
     }
 }
 exports.ModelTextures = ModelTextures;

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;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"}
+{"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,CAAC,KAAK,CAAC,GAAG,CAAC,GAAa;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,KAAK,EAAE;YACP,OAAO,yBAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC9C;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAa;QACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,iBAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC7C,OAAO,yBAAW,CAAC,GAAG,CAAe,GAAG,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtE,IAAI,KAAK;oBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;gBACpB,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAa;QACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,mBAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;YAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;SAC9B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAE/B,OAAO,iBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;gBACrD,OAAO,yBAAW,CAAC,GAAG,CAAuB,GAAG,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC7E,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU;QAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAC7C,CAAC;;AA3CL,sCA6CC;AA3CkB,mCAAqB,GAAG,iCAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}

package/dist/cjs/assets/Models.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Models = void 0;
 const Caching_1 = require("../cache/Caching");
@@ -25,66 +16,54 @@ 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.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 async getItemList() {
+        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 => r?.files ?? []);
     }
-    static loadAndMerge(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const model = yield this.getRaw(key);
-            if (!model) {
-                return undefined;
-            }
-            return ModelMerger_1.ModelMerger.mergeWithParents(model);
-        });
+    static async loadAndMerge(key) {
+        const model = await this.getRaw(key);
+        if (!model) {
+            return undefined;
+        }
+        return ModelMerger_1.ModelMerger.mergeWithParents(model);
     }
-    static getRaw(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.assetType) {
-                key.assetType = "models";
-            }
-            if (!key.extension) {
-                key.extension = ".json";
-            }
-            const keyStr = key.serialize();
-            //TODO: maybe add the asset source to the key
-            return Caching_1.Caching.rawModelCache.get(keyStr, k => {
-                return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.MODEL);
-                });
-            }).then(asset => {
-                if (asset) {
-                    asset.key = key;
-                }
-                return asset;
+    static async getRaw(key) {
+        if (!key.assetType) {
+            key.assetType = "models";
+        }
+        if (!key.extension) {
+            key.extension = ".json";
+        }
+        const keyStr = key.serialize();
+        //TODO: maybe add the asset source to the key
+        return Caching_1.Caching.rawModelCache.get(keyStr, k => {
+            return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
+                return AssetLoader_1.AssetLoader.get(key, AssetParsers_1.AssetParser.MODEL);
             });
-        });
-    }
-    static getMerged(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.assetType) {
-                key.assetType = "models";
-            }
-            if (!key.extension) {
-                key.extension = ".json";
+        }).then(asset => {
+            if (asset) {
+                asset.key = key;
             }
-            const keyStr = key.serialize();
-            return Caching_1.Caching.mergedModelCache.get(keyStr, k => {
-                //TODO: persistent cache
-                return Models.loadAndMerge(key);
-            });
+            return asset;
         });
     }
-    static get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getMerged(key);
+    static async getMerged(key) {
+        if (!key.assetType) {
+            key.assetType = "models";
+        }
+        if (!key.extension) {
+            key.extension = ".json";
+        }
+        const keyStr = key.serialize();
+        return Caching_1.Caching.mergedModelCache.get(keyStr, k => {
+            //TODO: persistent cache
+            return Models.loadAndMerge(key);
         });
     }
-    static clearCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.PERSISTENT_CACHE.clear();
-        });
+    static async get(key) {
+        return this.getMerged(key);
+    }
+    static async clearCache() {
+        return this.PERSISTENT_CACHE.clear();
     }
 }
 Models.PERSISTENT_CACHE = PersistentCache_1.PersistentCache.open("minerender-models");