Move waterlogged to the Block class.

leMaik · leMaik · commit c5a37b984a5e · 2025-12-27T01:04:32.000+01:00
diff --git a/chunky/src/java/se/llbit/chunky/block/Block.java b/chunky/src/java/se/llbit/chunky/block/Block.java
@@ -32,6 +32,8 @@ public abstract class Block extends Material {
    */
   public boolean invisible = false;
 
+  protected boolean waterlogged = false;
+
   public Block(String name, Texture texture) {
     super(name, texture);
   }
@@ -176,4 +178,12 @@ public Block applyWaterlogging() {
     this.waterlogged = true;
     return this;
   }
+
+  public boolean isWaterlogged() {
+    return waterlogged;
+  }
+
+  public boolean isWaterFilled() {
+    return waterlogged || isWater();
+  }
 }
diff --git a/chunky/src/java/se/llbit/chunky/block/OctreeFinalizationState.java b/chunky/src/java/se/llbit/chunky/block/OctreeFinalizationState.java
@@ -25,13 +25,12 @@ public OctreeFinalizationState(Octree worldTree, Octree waterTree,
 
   @Override
   public Material getMaterial() {
-    return worldTree.getMaterial(x, y, z, getPalette());
+    return worldTree.getBlock(x, y, z, getPalette());
   }
 
   @Override
   public Material getMaterial(int rx, int ry, int rz) {
-    return worldTree
-        .getMaterial(x + rx, y + ry, z + rz, getPalette());
+    return worldTree.getBlock(x + rx, y + ry, z + rz, getPalette());
   }
 
   @Override
diff --git a/chunky/src/java/se/llbit/chunky/entity/BeaconBeam.java b/chunky/src/java/se/llbit/chunky/entity/BeaconBeam.java
@@ -89,8 +89,8 @@ public void loadDataFromOctree(Octree octree, BlockPalette palette, Vector3i ori
     //Start i at 1 so the first beacon block is not checked. This would cause the base beam color to always be white.
     //Stop iterating if the we get outside octree.
     for (int i = 1; i < height && octree.isInside(new Vector3((position.x - origin.x), (position.y + i - origin.y), (position.z - origin.z))); i++) {
-      Material blockMaterial = octree.getMaterial((int)(position.x - origin.x), (int)(position.y + i - origin.y), (int)(position.z - origin.z), palette);
-      int color = getColorFromBlock((Block)blockMaterial);
+      Block block = octree.getBlock((int)(position.x - origin.x), (int)(position.y + i - origin.y), (int)(position.z - origin.z), palette);
+      int color = getColorFromBlock(block);
       if(color != -1) {
         if (!foundFirst) {
           this.materials.put(i, new BeaconBeamMaterial(color));
@@ -111,12 +111,12 @@ public void loadDataFromOctree(Octree octree, BlockPalette palette, Vector3i ori
     }
   }
 
-  private int getColorFromBlock(Block blockMaterial) {
-    if(blockMaterial instanceof Beacon) {
+  private int getColorFromBlock(Block block) {
+    if(block instanceof Beacon) {
       return BeaconBeamMaterial.DEFAULT_COLOR;
     }
     Pattern stainedGlassPattern = Pattern.compile("(minecraft:)?(.+?)_stained_glass(_pane)?");
-    Matcher matcher = stainedGlassPattern.matcher(blockMaterial.name);
+    Matcher matcher = stainedGlassPattern.matcher(block.name);
     if (matcher.find()) {
       String prefix = matcher.group(2);
       switch (prefix) {
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/OctreeFinalizer.java b/chunky/src/java/se/llbit/chunky/renderer/scene/OctreeFinalizer.java
@@ -16,6 +16,7 @@
  */
 package se.llbit.chunky.renderer.scene;
 
+import se.llbit.chunky.block.Block;
 import se.llbit.chunky.block.minecraft.Lava;
 import se.llbit.chunky.block.minecraft.Water;
 import se.llbit.chunky.chunk.BlockPalette;
@@ -65,12 +66,12 @@ private static void hideBlocks(Octree worldTree, BlockPalette palette, int x,
     int y = cy - origin.y;
     if (cy > yMin && cy < yMax - 1) {
       boolean isHidden =
-          worldTree.getMaterial(x - 1, y, z, palette).opaque
-              && worldTree.getMaterial(x + 1, y, z, palette).opaque
-              && worldTree.getMaterial(x, y, z - 1, palette).opaque
-              && worldTree.getMaterial(x, y, z + 1, palette).opaque
-              && worldTree.getMaterial(x, y - 1, z, palette).opaque
-              && worldTree.getMaterial(x, y + 1, z, palette).opaque;
+          worldTree.getBlock(x - 1, y, z, palette).opaque
+              && worldTree.getBlock(x + 1, y, z, palette).opaque
+              && worldTree.getBlock(x, y, z - 1, palette).opaque
+              && worldTree.getBlock(x, y, z + 1, palette).opaque
+              && worldTree.getBlock(x, y - 1, z, palette).opaque
+              && worldTree.getBlock(x, y + 1, z, palette).opaque;
       if (isHidden) {
         worldTree.set(BlockPalette.ANY_ID, x, y, z);
       }
@@ -80,11 +81,11 @@ private static void hideBlocks(Octree worldTree, BlockPalette palette, int x,
   private static void processBlock(Octree worldTree, Octree waterTree, BlockPalette palette,
       Set<ChunkPosition> loadedChunks, int x, int cy, int z, Vector3i origin) {
     int y = cy - origin.y;
-    Material mat = worldTree.getMaterial(x, y, z, palette);
-    Material wmat = waterTree.getMaterial(x, y, z, palette);
+    Block mat = worldTree.getBlock(x, y, z, palette);
+    Block wmat = waterTree.getBlock(x, y, z, palette);
 
     if (wmat instanceof Water) {
-      Material above = waterTree.getMaterial(x, y + 1, z, palette);
+      Block above = waterTree.getBlock(x, y + 1, z, palette);
       int level0 = 8 - ((Water) wmat).level;
       if (!above.isWaterFilled()) {
         int cornerSW = level0;
@@ -141,7 +142,7 @@ private static void processBlock(Octree worldTree, Octree waterTree, BlockPalett
         waterTree.set(palette.getWaterId(0, 1 << Water.FULL_BLOCK), x, y, z);
       }
     } else if (mat instanceof Lava) {
-      Material above = worldTree.getMaterial(x, y + 1, z, palette);
+      Material above = worldTree.getBlock(x, y + 1, z, palette);
       if (!(above instanceof Lava)) {
         Lava lava = (Lava) mat;
 
@@ -201,14 +202,14 @@ private static int waterLevelAt(Octree worldTree, Octree waterTree, BlockPalette
       return baseLevel;
     }
 
-    Material corner = waterTree.getMaterial(x, cy, z, palette);
+    Block corner = waterTree.getBlock(x, cy, z, palette);
     if (corner.isWater()) {
-      Material above = waterTree.getMaterial(x, cy + 1, z, palette);
+      Block above = waterTree.getBlock(x, cy + 1, z, palette);
       boolean isFullBlock = above.isWaterFilled();
       return isFullBlock ? 8 : 8 - ((Water) corner).level;
     } else if (corner.isWaterlogged()) {
       return 8;
-    } else if (!worldTree.getMaterial(x, cy, z, palette).solid) {
+    } else if (!worldTree.getBlock(x, cy, z, palette).solid) {
       return 0;
     }
     return baseLevel;
@@ -221,9 +222,9 @@ private static int lavaLevelAt(Octree octree, BlockPalette palette,
       return baseLevel;
     }
 
-    Material corner = octree.getMaterial(x, cy, z, palette);
+    Block corner = octree.getBlock(x, cy, z, palette);
     if (corner instanceof Lava) {
-      Material above = octree.getMaterial(x, cy + 1, z, palette);
+      Block above = octree.getBlock(x, cy + 1, z, palette);
       boolean isFullBlock = above instanceof Lava;
       return isFullBlock ? 8 : 8 - ((Lava) corner).level;
     } else if (!corner.solid) {
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -1569,7 +1569,7 @@ public Vector3 calcCenterCamera() {
     int zcenter = (zmax + zmin) / 2;
     int ycenter = (yMax + yMin) / 2;
     for (int y = Math.min(ycenter+127, yMax); y >= Math.max(ycenter-128, yMin); --y) {
-      Material block = worldOctree.getMaterial(xcenter - origin.x, y - origin.y, zcenter - origin.z,
+      Material block = worldOctree.getBlock(xcenter - origin.x, y - origin.y, zcenter - origin.z,
           palette);
       if (!(block instanceof Air)) {
         return new Vector3(xcenter, y + 5, zcenter);
@@ -2544,7 +2544,7 @@ public boolean isInWater(Ray ray) {
       int x = (int) QuickMath.floor(ray.o.x);
       int y = (int) QuickMath.floor(ray.o.y);
       int z = (int) QuickMath.floor(ray.o.z);
-      Material block = waterOctree.getMaterial(x, y, z, palette);
+      Block block = waterOctree.getBlock(x, y, z, palette);
       return block.isWater()
           && ((ray.o.y - y) < 0.875 || ((Water) block).isFullBlock());
     }
diff --git a/chunky/src/java/se/llbit/chunky/world/Material.java b/chunky/src/java/se/llbit/chunky/world/Material.java
@@ -87,8 +87,6 @@ public abstract class Material {
 
   public boolean refractive = false;
 
-  protected boolean waterlogged = false;
-
   public Material(String name, Texture texture) {
     this.name = name;
     this.texture = texture;
@@ -131,14 +129,6 @@ public boolean isWater() {
     return false;
   }
 
-  public boolean isWaterlogged() {
-    return waterlogged;
-  }
-
-  public boolean isWaterFilled() {
-    return waterlogged || isWater();
-  }
-
   public boolean isSameMaterial(Material other) {
     return other == this;
   }
diff --git a/chunky/src/java/se/llbit/math/Grid.java b/chunky/src/java/se/llbit/math/Grid.java
@@ -45,7 +45,7 @@ public static EmitterPosition create(int x, int y, int z, int block, Scene scene
     }
 
     public static EmitterPosition create(int x, int y, int z, Scene scene) {
-      return new EmitterPosition(x, y, z, (Block) scene.getWorldOctree().getMaterial(x, y, z, scene.getPalette()));
+      return new EmitterPosition(x, y, z, scene.getWorldOctree().getBlock(x, y, z, scene.getPalette()));
     }
 
     public void sample(Vector3 loc, Random rand) {
diff --git a/chunky/src/java/se/llbit/math/Octree.java b/chunky/src/java/se/llbit/math/Octree.java
@@ -58,7 +58,10 @@ public class Octree {
 
   public interface OctreeImplementation {
     void set(int type, int x, int y, int z);
-    Material getMaterial(int x, int y, int z, BlockPalette palette);
+    @Deprecated(forRemoval = true) Material getMaterial(int x, int y, int z, BlockPalette palette);
+    default Block getBlock(int x, int y, int z, BlockPalette palette) {
+      return (Block) getMaterial(x, y, z, palette);
+    }
     void store(DataOutputStream output) throws IOException;
     int getDepth();
     long nodeCount();
@@ -287,18 +290,18 @@ public synchronized void set(int type, int x, int y, int z) {
   }
 
   /**
-   * Get the material at the given position (relative to the octree origin).
+   * Get the block at the given position (relative to the octree origin).
    * @param x x position
    * @param y y position
    * @param z z position
    * @param palette Block palette
-   * @return Material at the given position or {@link Air#INSTANCE} if the position is outside of this octree
+   * @return Block at the given position or {@link Air#INSTANCE} if the position is outside of this octree
    */
-  public Material getMaterial(int x, int y, int z, BlockPalette palette) {
+  public Block getBlock(int x, int y, int z, BlockPalette palette) {
     int size = (1 << implementation.getDepth());
     if(x < 0 || y < 0 || z < 0 || x >= size || y >= size || z >= size)
       return Air.INSTANCE;
-    return implementation.getMaterial(x, y, z, palette);
+    return implementation.getBlock(x, y, z, palette);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,12 @@ public OctreeFinalizationState(Octree worldTree, Octree waterTree,`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public Material getMaterial() {`
`28`		`- return worldTree.getMaterial(x, y, z, getPalette());`
	`28`	`+ return worldTree.getBlock(x, y, z, getPalette());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public Material getMaterial(int rx, int ry, int rz) {`
`33`		`- return worldTree`
`34`		`- .getMaterial(x + rx, y + ry, z + rz, getPalette());`
	`33`	`+ return worldTree.getBlock(x + rx, y + ry, z + rz, getPalette());`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static EmitterPosition create(int x, int y, int z, int block, Scene scene`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public static EmitterPosition create(int x, int y, int z, Scene scene) {`
`48`		`- return new EmitterPosition(x, y, z, (Block) scene.getWorldOctree().getMaterial(x, y, z, scene.getPalette()));`
	`48`	`+ return new EmitterPosition(x, y, z, scene.getWorldOctree().getBlock(x, y, z, scene.getPalette()));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void sample(Vector3 loc, Random rand) {`