minerender 2.1.0-alpha.116 → 2.1.0-alpha.118

package/dist/bundle.js

@@ -43235,7 +43235,8 @@ void main() {
         }
         /**
          * Uses the exact version when published. Otherwise, selects the nearest patch in the same
-         * release line (older on ties), then the latest earlier release. Unpublished snapshots reject.
+         * release line (older on ties), then the latest earlier release or the oldest published release.
+         * Unpublished snapshots reject.
          */
         static async resolve(root) {
           const requestRoot = root?.replace(/\/+$/, "");
@@ -43244,11 +43245,11 @@ void main() {
           const scope = AssetLoader.persistentScope;
           return this.cached(`resolve:${requestRoot === void 0 ? "sources" : "explicit"}:${root}`, scope, defaultRoot, async () => {
             const requestedVersion = root.slice(root.lastIndexOf("/") + 1);
-            let manifest = await this.manifest(root, release(requestedVersion) ? requestedVersion : void 0, requestRoot);
+            let manifest = await this.manifest(root, requestRoot !== void 0 && release(requestedVersion) ? requestedVersion : void 0, requestRoot);
             if (manifest) return { requestedVersion, version: manifest.minecraftVersion, root, manifest };
             const requested = release(requestedVersion);
-            if (!requested || compare(requested, [1, 16, 5]) < 0) {
-              throw new Error(`No MineRender data is published for ${requestedVersion}; automatic fallback requires a release from 1.16.5 onward`);
+            if (!requested) {
+              throw new Error(`No MineRender data is published for ${requestedVersion}; automatic fallback requires a release`);
             }
             const base = root.slice(0, root.lastIndexOf("/"));
             const index = await this.cached(`versions:${base}`, scope, defaultRoot, async () => {
@@ -43258,9 +43259,9 @@ void main() {
               }
               return value.versions;
             });
-            const versions2 = index.map((entry) => ({ name: entry.name, number: release(entry.name) })).filter((entry) => !!entry.number && compare(entry.number, [1, 16, 5]) >= 0).sort((left, right) => compare(left.number, right.number));
+            const versions2 = index.map((entry) => ({ name: entry.name, number: release(entry.name) })).filter((entry) => !!entry.number).sort((left, right) => compare(left.number, right.number));
             const sameLine = versions2.filter((entry) => entry.number[0] === requested[0] && entry.number[1] === requested[1]);
-            const selected = sameLine.sort((left, right) => Math.abs((left.number[2] ?? 0) - (requested[2] ?? 0)) - Math.abs((right.number[2] ?? 0) - (requested[2] ?? 0)) || compare(left.number, right.number))[0] ?? versions2.filter((entry) => compare(entry.number, requested) <= 0).pop();
+            const selected = sameLine.sort((left, right) => Math.abs((left.number[2] ?? 0) - (requested[2] ?? 0)) - Math.abs((right.number[2] ?? 0) - (requested[2] ?? 0)) || compare(left.number, right.number))[0] ?? versions2.filter((entry) => compare(entry.number, requested) <= 0).pop() ?? versions2[0];
             if (!selected) throw new Error(`No compatible MineRender data is published for ${requestedVersion}`);
             const resolvedRoot = `${base}/${selected.name}`;
             manifest = await this.manifest(resolvedRoot, selected.name, resolvedRoot);
@@ -43379,12 +43380,7 @@ ${key}` : key, async () => {
         static async getLayers(value, target, root) {
           if (value === void 0) return [];
           if (!Array.isArray(value)) throw new Error("banner_patterns must be an array");
-          const activeRoot = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
-          const checkSources = () => {
-            if (activeRoot !== AssetLoader.ROOT || scope !== AssetLoader.persistentScope) throw new Error("Asset sources changed while loading banner patterns; retry the request");
-          };
           const colors = value.length ? await this.getColors(root) : void 0;
-          checkSources();
           return Promise.all(value.slice(0, 16).map(async (layer) => {
             if (!layer || typeof layer !== "object" || Array.isArray(layer)) throw new Error("Each banner pattern requires a pattern and dye color");
             if (typeof layer.color !== "string" || !Object.prototype.hasOwnProperty.call(colors, layer.color)) throw new Error(`Unsupported dye color ${layer.color}`);
@@ -43394,7 +43390,6 @@ ${key}` : key, async () => {
               const id = this.identifier(pattern2);
               const key = new AssetKey(id.namespace, id.getFullPath(), "banner_pattern", void 0, "data", ".json", root);
               pattern2 = await Caching.bannerPatternCache.get(key.serialize(), () => AssetLoader.get(key, "json" /* JSON */));
-              checkSources();
               if (!pattern2) throw new Error(`Missing banner pattern ${layer.pattern}`);
             }
             if (!pattern2 || typeof pattern2 !== "object" || Array.isArray(pattern2) || typeof pattern2.translation_key !== "string") throw new Error("Banner patterns require asset_id and translation_key");
@@ -43694,30 +43689,24 @@ ${key}` : key, async () => {
           }).then((r5) => r5?.files ?? []);
         }
         static async loadAndMerge(key, context = {}) {
-          const checkSources = this.sourceCheck();
           const model = key.type === "item" ? await this.getItemModel(key, context) : await this.getRaw(key);
           if (!model) {
             return void 0;
           }
           const merged = await ModelMerger.mergeWithParents(model);
-          checkSources();
           return merged;
         }
         static async getItemModel(key, context = {}) {
-          const checkSources = this.sourceCheck();
           const preview = this.snapshotContext(key, context);
           const dataKey = await this.applyDefaults(key, preview);
-          checkSources();
           return this.getPreparedItemModel(key, preview, dataKey);
         }
         static async getPreparedItemModel(key, preview, dataKey) {
-          const checkSources = this.sourceCheck();
           const itemId = `${key.namespace}:${key.path}`;
           const itemKey2 = new AssetKey(key.namespace, key.path, "items", void 0, key.rootType, ".json", key.root);
           const cacheKey = itemKey2.serialize() + this.contextKey(preview) + dataKey;
           const model = await this.PERSISTENT_CACHE.getOrLoad(`${this.ITEM_CACHE_VERSION}:${AssetLoader.persistentKey(cacheKey)}`, async () => {
             const result = await AssetLoader.getFirst([itemKey2, key], "json" /* JSON */);
-            checkSources();
             if (!result) return void 0;
             if (result.key.assetType !== "items") return { ...result.asset, key, itemId, components: preview.components };
             const load = async (selected) => {
@@ -43736,10 +43725,8 @@ ${key}` : key, async () => {
               return { ...model3, itemId, components: preview.components, ...selected.special && { special: selected.special }, ...selected.tints && { tints: selected.tints } };
             };
             const model2 = await load(this.selectItemModel(result.asset.model, key, preview));
-            checkSources();
             return model2;
           });
-          checkSources();
           const restore = (model2) => ({
             ...model2,
             key: Object.assign(new AssetKey("", ""), model2.key),
@@ -43803,22 +43790,14 @@ ${key}` : key, async () => {
         }
         static async applyDefaults(key, preview) {
           if (key.type !== "item") return "";
-          const root = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
           const resolved = await MineRenderData.resolve(key.root);
           const defaults = await ItemDefaults.get(`${key.namespace}:${key.path}`, key.root);
           preview.components = { ...defaults, ...preview.components };
           if (resolved.manifest.dataVersion < 3337 && key.namespace === DEFAULT_NAMESPACE && ["potion", "splash_potion", "lingering_potion"].includes(key.path) && !Object.prototype.hasOwnProperty.call(preview.components, "minecraft:enchantment_glint_override") && await ItemTints.hasPotionEffects(preview.components["minecraft:potion_contents"], key.root)) {
             preview.components["minecraft:enchantment_glint_override"] = true;
           }
-          if (AssetLoader.ROOT !== root || AssetLoader.persistentScope !== scope) throw new Error("Asset sources changed while loading item defaults; retry the request");
           return `|data:${resolved.root}:${resolved.manifest.datasets.itemDefaults?.sha256}:${resolved.manifest.datasets.potionColors?.sha256}`;
         }
-        static sourceCheck() {
-          const root = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
-          return () => {
-            if (AssetLoader.ROOT !== root || AssetLoader.persistentScope !== scope) throw new Error("Asset sources changed while loading item models; retry the request");
-          };
-        }
         static contextKey(context) {
           const itemReferences = Object.fromEntries(Object.entries(context.itemReferences).map(([id, key]) => [id, key.serialize()]));
           return `|${this.ITEM_CACHE_VERSION}:${JSON.stringify(this.snapshotJson({ ...context, itemReferences }))}`;
@@ -44005,7 +43984,6 @@ ${key}` : key, async () => {
          * @param key - Model key, for example `AssetKey.parse("models", "minecraft:item/diamond_sword")`.
          */
         static async getMerged(key, context = {}) {
-          const checkSources = this.sourceCheck();
           if (!key.assetType) {
             key.assetType = "models";
           }
@@ -44014,15 +43992,12 @@ ${key}` : key, async () => {
           }
           const preview = this.snapshotContext(key, context);
           const dataKey = await this.applyDefaults(key, preview);
-          checkSources();
           const keyStr = AssetLoader.persistentKey(key.serialize() + (key.type === "item" ? this.contextKey(preview) + dataKey : ""));
           const model = await Caching.mergedModelCache.get(keyStr, async () => {
             const raw = key.type === "item" ? await this.getPreparedItemModel(key, preview, dataKey) : await this.getRaw(key);
             const merged = raw ? await ModelMerger.mergeWithParents(raw) : void 0;
-            checkSources();
             return merged;
           });
-          checkSources();
           return model;
         }
         /** Alias for {@link getMerged}. */
@@ -100647,7 +100622,6 @@ property list uchar int vertex_index
   init_ModelCulling();
   init_FluidGeometry();
   init_MineRenderData();
-  init_AssetLoader();
   init_Entities();
   var _BlockObject = class _BlockObject extends SceneObject {
     constructor(blockState3, options) {
@@ -100672,19 +100646,12 @@ property list uchar int vertex_index
       this.biomePosition = options?.biomePosition ? [...options.biomePosition] : void 0;
     }
     async init() {
-      const root = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
-      const checkSources = () => {
-        if (root !== AssetLoader.ROOT || scope !== AssetLoader.persistentScope) throw new Error("Asset sources changed while loading a block; retry the request");
-      };
       this._fluidRules = await MineRenderData.get("fluids", this.blockState.key?.root);
-      checkSources();
       if (this.options.applyDefaultState) {
         this._setState(await BlockStateResolver.defaults(this.blockState));
-        checkSources();
       }
       if (this.options.initialState !== void 0) this._setState(this.options.initialState);
       await this.recreateModels();
-      checkSources();
     }
     dispose() {
       this.clearModels();
@@ -101575,6 +101542,8 @@ property list uchar int vertex_index
   var VANILLA_FLY_SPEED = 10.89;
   var PITCH_LIMIT = Math.PI / 2;
   var MOVE_EPSILON = 1e-6;
+  var MAX_STEP_SECONDS = 0.1;
+  var CLICK_SLOP_PIXELS = 4;
   var _euler = new Euler(0, 0, 0, "YXZ");
   var _forward = new Vector3();
   var _right = new Vector3();
@@ -101609,7 +101578,8 @@ property list uchar int vertex_index
         right: ["KeyD", "ArrowRight"],
         up: ["Space"],
         down: ["ShiftLeft", "ShiftRight"],
-        sprint: ["ControlLeft", "ControlRight"]
+        // Not Control: Ctrl+W closes the browser tab on Windows and Linux, and a page cannot block it.
+        sprint: ["KeyR"]
       };
       this._pressed = /* @__PURE__ */ new Set();
       this._velocity = new Vector3();
@@ -101617,8 +101587,12 @@ property list uchar int vertex_index
       this._lastQuaternion = new Quaternion();
       this._position0 = new Vector3();
       this._quaternion0 = new Quaternion();
+      this._dragX = 0;
+      this._dragY = 0;
       this._dragMoved = false;
+      this._dragTravel = 0;
       this._locked = false;
+      this._madeFocusable = false;
       this._onKeyDown = (event) => this.handleKey(event, true);
       this._onKeyUp = (event) => this.handleKey(event, false);
       this._onPointerDown = (event) => this.handlePointerDown(event);
@@ -101648,7 +101622,10 @@ property list uchar int vertex_index
       element.addEventListener("wheel", this._onWheel, { passive: false });
       element.addEventListener("blur", this._onBlur);
       element.style.touchAction = "none";
-      if (element.tabIndex < 0) element.tabIndex = 0;
+      if (element.tabIndex < 0) {
+        element.tabIndex = 0;
+        this._madeFocusable = true;
+      }
     }
     disconnect() {
       const element = this.domElement;
@@ -101666,6 +101643,10 @@ property list uchar int vertex_index
       element.removeEventListener("wheel", this._onWheel);
       element.removeEventListener("blur", this._onBlur);
       element.style.touchAction = "auto";
+      if (this._madeFocusable) {
+        element.removeAttribute("tabindex");
+        this._madeFocusable = false;
+      }
       this.unlock();
       this._locked = false;
       this.releaseKeys();
@@ -101736,6 +101717,7 @@ property list uchar int vertex_index
     /**
      * Advances movement by `delta` seconds (measured since the previous call when omitted)
      * and dispatches `change` when the camera moved.
+     * A step longer than 0.1 s is applied as 0.1 s.
      */
     update(delta) {
       if (delta === void 0) {
@@ -101747,7 +101729,7 @@ property list uchar int vertex_index
         this._velocity.set(0, 0, 0);
         return;
       }
-      if (delta > 0) this.move(delta);
+      if (delta > 0) this.move(Math.min(delta, MAX_STEP_SECONDS));
       this.notifyChange();
     }
     move(delta) {
@@ -101794,15 +101776,21 @@ property list uchar int vertex_index
       this._pressed.clear();
     }
     handleKey(event, down) {
+      if (event.code === "MetaLeft" || event.code === "MetaRight") this.releaseKeys();
       const action = this.actionFor(event.code);
       if (!action) return;
       const ownsInput = this.enabled && (this._locked || event.target === this.domElement);
-      if (down && !ownsInput) return;
+      if (down && (!ownsInput || this.isBrowserShortcut(event))) return;
       const pressed = this._pressed.has(action);
       if (down) this._pressed.add(action);
       else this._pressed.delete(action);
       if (ownsInput || this.enabled && pressed) event.preventDefault();
     }
+    /** A key pressed with Control, Alt, or Command stays a browser shortcut unless that modifier is bound to an action. */
+    isBrowserShortcut(event) {
+      const bound = (modifier) => Object.values(this.keys).some((codes2) => codes2.some((code2) => code2.startsWith(modifier)));
+      return event.ctrlKey && !bound("Control") || event.altKey && !bound("Alt") || event.metaKey && !bound("Meta");
+    }
     actionFor(code2) {
       for (const action in this.keys) {
         if (this.keys[action].includes(code2)) return action;
@@ -101822,7 +101810,10 @@ property list uchar int vertex_index
       if (this._dragPointer !== void 0) return;
       if (event.pointerType === "mouse" && event.button !== 0 && event.button !== 2) return;
       this._dragPointer = event.pointerId;
+      this._dragX = event.clientX;
+      this._dragY = event.clientY;
       this._dragMoved = false;
+      this._dragTravel = 0;
       element.setPointerCapture?.(event.pointerId);
     }
     onJoystickSide(event) {
@@ -101838,8 +101829,20 @@ property list uchar int vertex_index
         return;
       }
       if (!this._locked && event.pointerId !== this._dragPointer) return;
-      const dx = event.movementX ?? 0;
-      const dy = event.movementY ?? 0;
+      let dx, dy;
+      if (this._locked) {
+        dx = event.movementX ?? 0;
+        dy = event.movementY ?? 0;
+      } else {
+        dx = event.clientX - this._dragX;
+        dy = event.clientY - this._dragY;
+        this._dragX = event.clientX;
+        this._dragY = event.clientY;
+        if (!this._dragMoved) {
+          this._dragTravel += Math.hypot(dx, dy);
+          if (this._dragTravel <= CLICK_SLOP_PIXELS) return;
+        }
+      }
       if (!dx && !dy) return;
       this._dragMoved = true;
       this.turn(dx, dy);
@@ -105752,6 +105755,7 @@ gl_FragDepth=readDepth(vUv);
     /**
      * Replaces renderer-owned controls with the selected mode, keeping the camera where it is.
      * Switching to orbit controls targets the point the camera looks at, at the previous orbit distance.
+     * The previous controls object is disposed, so its listeners and settings do not carry over.
      * Returns the new controls, or undefined when controls were disabled at construction or after disposal.
      */
     setControlsMode(mode2) {
@@ -106679,7 +106683,6 @@ gl_FragDepth=readDepth(vUv);
   init_process2();
   init_MineRenderError();
   init_MineRenderData();
-  init_AssetLoader();
   init_NBTHelper();
 
   // src/world/ChunkData.ts
@@ -106956,14 +106959,12 @@ gl_FragDepth=readDepth(vUv);
     /** Decodes all stored chunks. Gzip, zlib, LZ4, and uncompressed payloads are supported. */
     static async parse(data, options = {}) {
       options = { ...options };
-      const checkSources = this.assetGuard();
       options.signal?.throwIfAborted();
       const bytes = this.bytes(data);
       const chunks = [];
       for (const location of this.locations(bytes)) {
         chunks.push(await this.abortable(this.readChunk(bytes, location, options), options.signal));
       }
-      checkSources();
       return { chunks };
     }
     /**
@@ -106974,22 +106975,12 @@ gl_FragDepth=readDepth(vUv);
      */
     static async parseChunk(data, localX, localZ, options = {}) {
       options = { ...options };
-      const checkSources = this.assetGuard();
       options.signal?.throwIfAborted();
       const bytes = this.bytes(data);
       const location = this.location(bytes, localX, localZ);
       const chunk = location ? await this.abortable(this.readChunk(bytes, location, options), options.signal) : void 0;
-      checkSources();
       return chunk;
     }
-    static assetGuard() {
-      const root = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
-      return () => {
-        if (AssetLoader.ROOT !== root || AssetLoader.persistentScope !== scope) {
-          throw new MineRenderError("Asset sources changed while parsing Anvil data; retry the request");
-        }
-      };
-    }
     /**
      * Decodes one chunk from an `entities/r.x.z.mca` file without migrating its NBT.
      * @param localX - Chunk x within the region, from 0 to 31.
@@ -107733,7 +107724,6 @@ gl_FragDepth=readDepth(vUv);
 
   // src/world/_entities/WorldEntities.ts
   init_BannerPatterns();
-  init_AssetLoader();
   var WorldEntities = class {
     constructor(scene) {
       this.scene = scene;
@@ -107741,10 +107731,6 @@ gl_FragDepth=readDepth(vUv);
     }
     /** Captures column ownership before asynchronous block or asset loading starts. */
     prepare(entities = [], column) {
-      const root = AssetLoader.ROOT, scope = AssetLoader.persistentScope;
-      const checkSources = () => {
-        if (root !== AssetLoader.ROOT || scope !== AssetLoader.persistentScope) throw new Error("Asset sources changed while loading saved entities; retry the request");
-      };
       const placements = entities.flatMap((entity) => {
         const resolved = resolveSavedEntity(entity);
         if (!resolved) return [];
@@ -107760,17 +107746,13 @@ gl_FragDepth=readDepth(vUv);
           let object4;
           try {
             if (!current()) return;
-            checkSources();
             const models = await Entities.getEntityList();
-            checkSources();
             if (!models.includes(placement.key.path) || !current()) return;
             const model = await Entities.getEntity(placement.key, placement.texture, { when: placement.when });
-            checkSources();
             if (!model || !current()) return;
             let tints = placement.tints;
             if (placement.woolDye) {
               const dye = (await BannerPatterns.getColors(placement.key.root))[placement.woolDye];
-              checkSources();
               const tint = placement.woolDye === "white" ? 15132390 : Math.floor((dye >> 16 & 255) * 0.75) << 16 | Math.floor((dye >> 8 & 255) * 0.75) << 8 | Math.floor((dye & 255) * 0.75);
               tints = { ...tints, wool_color: tint };
             }
@@ -107780,7 +107762,6 @@ gl_FragDepth=readDepth(vUv);
             object4.position.fromArray(placement.position).multiplyScalar(16).addScalar(-8);
             object4.rotation.y = placement.yaw;
             await object4.init();
-            checkSources();
             if (!current()) return;
             placement.owner.add(object4);
             this.scene.add(object4);