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

package/dist/node/index.mjs

@@ -1662,7 +1662,8 @@ var init_MineRenderData = __esm({
       }
       /**
        * 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(/\/+$/, "");
@@ -1671,11 +1672,11 @@ var init_MineRenderData = __esm({
         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 () => {
@@ -1685,9 +1686,9 @@ var init_MineRenderData = __esm({
             }
             return value.versions;
           });
-          const versions = 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 versions = index.map((entry) => ({ name: entry.name, number: release(entry.name) })).filter((entry) => !!entry.number).sort((left, right) => compare(left.number, right.number));
           const sameLine = versions.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] ?? versions.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] ?? versions.filter((entry) => compare(entry.number, requested) <= 0).pop() ?? versions[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);
@@ -1803,12 +1804,7 @@ var init_BannerPatterns = __esm({
       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}`);
@@ -1818,7 +1814,6 @@ var init_BannerPatterns = __esm({
             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");
@@ -2107,30 +2102,24 @@ var init_Models = __esm({
         }).then((r) => r?.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) => {
@@ -2149,10 +2138,8 @@ var init_Models = __esm({
             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),
@@ -2216,22 +2203,14 @@ var init_Models = __esm({
       }
       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 }))}`;
@@ -2418,7 +2397,6 @@ var init_Models = __esm({
        * @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";
         }
@@ -2427,15 +2405,12 @@ var init_Models = __esm({
         }
         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}. */
@@ -12419,7 +12394,6 @@ import { Euler as Euler10, Matrix4 as Matrix411, Quaternion as Quaternion5, Vect
 init_ModelCulling();
 init_FluidGeometry();
 init_MineRenderData();
-init_AssetLoader();
 init_Entities();
 var BlockObject = class _BlockObject extends SceneObject {
   constructor(blockState3, options) {
@@ -12449,19 +12423,12 @@ var BlockObject = class _BlockObject extends SceneObject {
     });
   }
   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();
@@ -13309,6 +13276,8 @@ import { Controls, Euler as Euler11, MathUtils as MathUtils2, Quaternion as Quat
 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 Euler11(0, 0, 0, "YXZ");
 var _forward = new Vector313();
 var _right = new Vector313();
@@ -13343,7 +13312,8 @@ var FlyControls = class extends Controls {
       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 Vector313();
@@ -13351,8 +13321,12 @@ var FlyControls = class extends Controls {
     this._lastQuaternion = new Quaternion6();
     this._position0 = new Vector313();
     this._quaternion0 = new Quaternion6();
+    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);
@@ -13382,7 +13356,10 @@ var FlyControls = class extends Controls {
     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;
@@ -13400,6 +13377,10 @@ var FlyControls = class extends Controls {
     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();
@@ -13470,6 +13451,7 @@ var FlyControls = class extends Controls {
   /**
    * 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) {
@@ -13481,7 +13463,7 @@ var FlyControls = class extends Controls {
       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) {
@@ -13528,15 +13510,21 @@ var FlyControls = class extends Controls {
     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((codes) => codes.some((code) => code.startsWith(modifier)));
+    return event.ctrlKey && !bound("Control") || event.altKey && !bound("Alt") || event.metaKey && !bound("Meta");
+  }
   actionFor(code) {
     for (const action in this.keys) {
       if (this.keys[action].includes(code)) return action;
@@ -13556,7 +13544,10 @@ var FlyControls = class extends Controls {
     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) {
@@ -13572,8 +13563,20 @@ var FlyControls = class extends Controls {
       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);
@@ -15533,6 +15536,7 @@ var Renderer = class _Renderer {
   /**
    * 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(mode) {
@@ -16382,7 +16386,6 @@ init_util2();
 // src/world/AnvilParser.ts
 init_MineRenderError();
 init_MineRenderData();
-init_AssetLoader();
 init_NBTHelper();
 
 // src/world/ChunkData.ts
@@ -16653,14 +16656,12 @@ var AnvilParser = class {
   /** 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 };
   }
   /**
@@ -16671,22 +16672,12 @@ var AnvilParser = class {
    */
   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.
@@ -17407,7 +17398,6 @@ function resolveSavedEntity(entity) {
 
 // src/world/_entities/WorldEntities.ts
 init_BannerPatterns();
-init_AssetLoader();
 var WorldEntities = class {
   constructor(scene) {
     this.scene = scene;
@@ -17415,10 +17405,6 @@ var WorldEntities = class {
   }
   /** 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 [];
@@ -17434,17 +17420,13 @@ var WorldEntities = class {
         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 };
           }
@@ -17454,7 +17436,6 @@ var WorldEntities = class {
           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);