minerender 2.1.0-alpha.44 → 2.1.0-alpha.45

package/dist/node/index.d.mts

@@ -1113,7 +1113,7 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
 declare function isSceneObject(obj: any): obj is SceneObject;
 
 type FluidKind = "water" | "lava";
-declare function getFluidKind(key?: AssetKey): FluidKind | undefined;
+declare function getFluidKind(key?: AssetKey, state?: BlockStateProperties): FluidKind | undefined;
 interface FluidSample {
     fluid?: FluidKind;
     level?: number;
@@ -1139,6 +1139,7 @@ declare class BlockObject extends SceneObject {
     private _cullMask;
     private _fluidKey?;
     private _fluidSampler?;
+    private _fluidModel?;
     constructor(blockState: BlockState, options?: Partial<BlockObjectOptions>);
     init(): Promise<void>;
     dispose(): void;
@@ -1153,6 +1154,7 @@ declare class BlockObject extends SceneObject {
         [key: string]: string;
     };
     get fluidKind(): FluidKind | undefined;
+    get fluidLevel(): number;
     /** Refreshes fluid surfaces from relative neighbors; standalone previews use air around the block. */
     updateFluid(sample?: FluidSampler): Promise<void>;
     nextInstance(): InstanceReference<SceneObject>;
@@ -1187,7 +1189,7 @@ declare class FluidModelObject extends ModelObject {
     readonly kind: FluidKind;
     private readonly sample;
     private geometry?;
-    constructor(kind: FluidKind, sample: FluidSampler, origin: AssetKey, options?: Partial<ModelObjectOptions>);
+    constructor(kind: FluidKind, sample: FluidSampler, origin?: AssetKey, options?: Partial<ModelObjectOptions>);
     protected createMeshes(): void;
     protected applyTextures(): void;
     disposeAndRemoveAllChildren(): void;

package/dist/node/index.d.ts

@@ -1113,7 +1113,7 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
 declare function isSceneObject(obj: any): obj is SceneObject;
 
 type FluidKind = "water" | "lava";
-declare function getFluidKind(key?: AssetKey): FluidKind | undefined;
+declare function getFluidKind(key?: AssetKey, state?: BlockStateProperties): FluidKind | undefined;
 interface FluidSample {
     fluid?: FluidKind;
     level?: number;
@@ -1139,6 +1139,7 @@ declare class BlockObject extends SceneObject {
     private _cullMask;
     private _fluidKey?;
     private _fluidSampler?;
+    private _fluidModel?;
     constructor(blockState: BlockState, options?: Partial<BlockObjectOptions>);
     init(): Promise<void>;
     dispose(): void;
@@ -1153,6 +1154,7 @@ declare class BlockObject extends SceneObject {
         [key: string]: string;
     };
     get fluidKind(): FluidKind | undefined;
+    get fluidLevel(): number;
     /** Refreshes fluid surfaces from relative neighbors; standalone previews use air around the block. */
     updateFluid(sample?: FluidSampler): Promise<void>;
     nextInstance(): InstanceReference<SceneObject>;
@@ -1187,7 +1189,7 @@ declare class FluidModelObject extends ModelObject {
     readonly kind: FluidKind;
     private readonly sample;
     private geometry?;
-    constructor(kind: FluidKind, sample: FluidSampler, origin: AssetKey, options?: Partial<ModelObjectOptions>);
+    constructor(kind: FluidKind, sample: FluidSampler, origin?: AssetKey, options?: Partial<ModelObjectOptions>);
     protected createMeshes(): void;
     protected applyTextures(): void;
     disposeAndRemoveAllChildren(): void;

package/dist/node/index.js

@@ -4214,9 +4214,9 @@ var init_ModelObject = __esm({
 });
 
 // src/model/fluid/FluidGeometry.ts
-function getFluidKind(key) {
-  if (key?.namespace !== "minecraft" || key.type) return void 0;
-  return key.path === "water" || key.path === "lava" ? key.path : void 0;
+function getFluidKind(key, state) {
+  if (key?.namespace === "minecraft" && !key.type && (key.path === "water" || key.path === "lava")) return key.path;
+  return state?.waterlogged === "true" ? "water" : void 0;
 }
 function ownHeight(sample) {
   const level = sample.level ?? 0;
@@ -4369,7 +4369,7 @@ var init_FluidModelObject = __esm({
     FluidModelObject = class extends ModelObject {
       constructor(kind, sample, origin, options) {
         super({
-          key: new AssetKey("minecraft", kind, "models", "fluid", "assets", ".json", origin.root),
+          key: new AssetKey("minecraft", kind, "models", "fluid", "assets", ".json", origin?.root),
           textures: { still: `minecraft:block/${kind}_still`, flow: `minecraft:block/${kind}_flow` },
           elements: []
         }, options);
@@ -5718,6 +5718,7 @@ var BlockObject = class _BlockObject extends SceneObject {
   clearModels() {
     this.removeModels(this._models.splice(0));
     this._fluidKey = void 0;
+    this._fluidModel = void 0;
     this._isInstanced = false;
     this._instanceCounter = 0;
   }
@@ -5749,11 +5750,14 @@ var BlockObject = class _BlockObject extends SceneObject {
     return ModelCulling.toLocalMask(worldMask, new import_three22.Euler().setFromQuaternion(rotation));
   }
   async setCullMask(worldMask) {
-    if (this.fluidKind) return;
     worldMask &= 63;
     const replacements = [];
     try {
       for (const model of this._models) {
+        if (model === this._fluidModel) {
+          replacements.push(model);
+          continue;
+        }
         const object = isInstanceReference(model) ? model.instanceable : model;
         const cullMask = this.getModelCullMask(model, worldMask);
         if (cullMask === (object.options.cullMask ?? 0)) {
@@ -5786,7 +5790,10 @@ var BlockObject = class _BlockObject extends SceneObject {
     return this._state;
   }
   get fluidKind() {
-    return getFluidKind(this.blockState.key);
+    return getFluidKind(this.blockState.key, this.state);
+  }
+  get fluidLevel() {
+    return getFluidKind(this.blockState.key) ? Number(this.state.level ?? 0) : 0;
   }
   /** Refreshes fluid surfaces from relative neighbors; standalone previews use air around the block. */
   async updateFluid(sample) {
@@ -5794,22 +5801,24 @@ var BlockObject = class _BlockObject extends SceneObject {
     if (!kind) return;
     const { FluidModelObject: FluidModelObject2, sampleFluid: sampleFluid2 } = await Promise.resolve().then(() => (init_FluidModelObject(), FluidModelObject_exports));
     this._fluidSampler = sample;
-    const surface = sampleFluid2(kind, (x, y, z) => x === 0 && y === 0 && z === 0 ? { fluid: kind, level: Number(this.state.level ?? 0) } : sample?.(x, y, z) ?? {});
+    const surface = sampleFluid2(kind, (x, y, z) => x === 0 && y === 0 && z === 0 ? { fluid: kind, level: this.fluidLevel } : sample?.(x, y, z) ?? {});
     if (this._fluidKey === surface.key) return;
-    const key = new AssetKey("minecraft", `${kind}/${surface.key}`, "models", "fluid", "assets", ".json", this.blockState.key.root);
+    const key = new AssetKey("minecraft", `${kind}/${surface.key}`, "models", "fluid", "assets", ".json", this.blockState.key?.root);
     const replacement = await this.scene.addSceneObject(
       { key },
       () => new FluidModelObject2(kind, surface.sample, this.blockState.key, this.options)
     );
-    const previous = this._models;
-    const matrix = previous.length ? this.getModelMatrix(previous[0]) : new import_three22.Matrix4().makeTranslation(...this.position.toArray());
+    const previous = this._fluidModel;
+    const matrix = previous ? this.getModelMatrix(previous) : new import_three22.Matrix4().makeTranslation(...this.position.toArray());
     if (isInstanceReference(replacement)) replacement.setMatrix(matrix);
     else matrix.decompose(replacement.position, replacement.quaternion, replacement.scale);
-    this._models = [replacement];
+    this._models = this._models.filter((model) => model !== previous);
+    this._models.push(replacement);
+    this._fluidModel = replacement;
     this._fluidKey = surface.key;
-    this._isInstanced = isInstanceReference(replacement);
+    this._isInstanced ||= isInstanceReference(replacement);
     this._instanceCounter = this._isInstanced ? 1 : 0;
-    this.removeModels(previous);
+    if (previous) this.removeModels([previous]);
     this.notifyDirty();
   }
   nextInstance() {
@@ -5826,7 +5835,7 @@ var BlockObject = class _BlockObject extends SceneObject {
   }
   async recreateModels() {
     this.clearModels();
-    if (this.fluidKind) {
+    if (getFluidKind(this.blockState.key)) {
       await this.updateFluid(this._fluidSampler);
       return;
     }
@@ -5835,6 +5844,7 @@ var BlockObject = class _BlockObject extends SceneObject {
     for (let blockStateVariant of variantsToCreate) {
       this._models.push(await this.createVariant(blockStateVariant));
     }
+    await this.updateFluid(this._fluidSampler);
   }
   getSingleVariant(variants) {
     return BlockStateResolver.choose(variants);
@@ -10652,11 +10662,10 @@ var MineRenderWorld = class {
                 const object = section?.getBlockAt(neighbor)?.object;
                 return {
                   fluid: object?.fluidKind,
-                  level: Number(object?.state.level ?? 0),
+                  level: object?.fluidLevel,
                   solid: section?.isOccludingAt(neighbor) ?? false
                 };
               });
-              continue;
             }
             let mask = 0;
             for (const [face, offset] of CUBE_FACE_OFFSETS.entries()) {
@@ -10885,7 +10894,7 @@ var Chunk = class _Chunk {
         this.data.set(index, void 0);
         return void 0;
       }
-      const template = getFluidKind(blockState.key) ? void 0 : await this.sectionModels?.get(blockState, stored.properties);
+      const template = getFluidKind(blockState.key, stored.properties) ? void 0 : await this.sectionModels?.get(blockState, stored.properties);
       if (template) {
         this.sectionBlocks.set(index, { index, template, cullMask: 0 });
         this.meshDirty = true;