diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt
index dfab94d4b..0dbf1e4da 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt
@@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
 import de.bixilon.minosoft.data.registries.blocks.types.Block
 import de.bixilon.minosoft.data.registries.blocks.types.air.AirBlock
 import de.bixilon.minosoft.data.registries.blocks.types.fluid.LavaFluidBlock
-import de.bixilon.minosoft.data.registries.blocks.types.fluid.WaterFluidBlock
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterFluidBlock
 import de.bixilon.minosoft.data.registries.blocks.types.stone.RockBlock
 import de.bixilon.minosoft.data.registries.factory.DefaultFactory
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt
index a4fa15108..190f29ff7 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt
@@ -19,7 +19,6 @@ import de.bixilon.minosoft.data.registries.blocks.light.CustomLightProperties
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.registries.blocks.types.Block
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
 import de.bixilon.minosoft.data.registries.blocks.types.properties.LightedBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.ShapedBlock
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@@ -29,7 +28,7 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
-abstract class FluidBlock(identifier: ResourceLocation, settings: BlockSettings) : Block(identifier, settings), FluidFilled, ShapedBlock, LightedBlock {
+abstract class FluidBlock(identifier: ResourceLocation, settings: BlockSettings) : Block(identifier, settings), FluidHolder, ShapedBlock, LightedBlock {
 
     override fun getOutlineShape(connection: PlayConnection, blockState: BlockState): VoxelShape {
         return VoxelShape(mutableListOf(AABB(Vec3.EMPTY, Vec3(1.0f, fluid.getHeight(blockState), 1.0f))))
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidFilled.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidFilled.kt
similarity index 93%
rename from src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidFilled.kt
rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidFilled.kt
index 01334e1c4..359f85611 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidFilled.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidFilled.kt
@@ -11,7 +11,7 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer
+package de.bixilon.minosoft.data.registries.blocks.types.fluid
 
 /**
  * A block that is fluid filled, e.g. water or kelp (filled with water)
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidHolder.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidHolder.kt
similarity index 93%
rename from src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidHolder.kt
rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidHolder.kt
index 4f5cf8781..06e9dde9b 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidHolder.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidHolder.kt
@@ -11,7 +11,7 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer
+package de.bixilon.minosoft.data.registries.blocks.types.fluid
 
 import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid
 
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/WaterFluidBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterFluidBlock.kt
similarity index 84%
rename from src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/WaterFluidBlock.kt
rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterFluidBlock.kt
index cc741e8db..ce565ed80 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/WaterFluidBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterFluidBlock.kt
@@ -11,16 +11,17 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.data.registries.blocks.types.fluid
+package de.bixilon.minosoft.data.registries.blocks.types.fluid.water
 
 import de.bixilon.kutil.cast.CastUtil.unsafeNull
 import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
 import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.water.WaterFluid
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.registries.registries.Registries
 
-class WaterFluidBlock(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : FluidBlock(identifier, settings) {
+class WaterFluidBlock(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : FluidBlock(identifier, settings) {
     override val fluid: WaterFluid = unsafeNull()
 
     init {
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterloggableBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterloggableBlock.kt
new file mode 100644
index 000000000..1e16c197a
--- /dev/null
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterloggableBlock.kt
@@ -0,0 +1,16 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2023 Moritz Zwerger
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.data.registries.blocks.types.fluid.water
+
+interface WaterloggableBlock
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt
index 9fefed732..3ee268bc1 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt
@@ -26,6 +26,7 @@ import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.registries.blocks.state.builder.BlockStateBuilder
 import de.bixilon.minosoft.data.registries.blocks.state.builder.BlockStateSettings
 import de.bixilon.minosoft.data.registries.blocks.types.Block
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterloggableBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.FrictionBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.JumpBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.ReplaceableBlock
@@ -49,7 +50,7 @@ open class PixLyzerBlock(
     identifier: ResourceLocation,
     registries: Registries,
     data: Map<String, Any>,
-) : Block(identifier, BlockSettings(soundGroup = data["sound_group"]?.toInt()?.let { registries.soundGroup[it] }, item = data["item"]?.toInt())), FrictionBlock, JumpBlock, VelocityBlock, RandomOffsetBlock, ShapedBlock, BlockStateBuilder, ReplaceableBlock, PotentialFullOpaqueBlock {
+) : Block(identifier, BlockSettings(soundGroup = data["sound_group"]?.toInt()?.let { registries.soundGroup[it] }, item = data["item"]?.toInt())), FrictionBlock, JumpBlock, VelocityBlock, RandomOffsetBlock, ShapedBlock, BlockStateBuilder, ReplaceableBlock, PotentialFullOpaqueBlock, WaterloggableBlock {
 
     override val randomOffset: RandomOffsetTypes? = data["offset_type"].nullCast<String>()?.let { RandomOffsetTypes[it] }
 
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpBlock.kt
index 42ff5c975..317687786 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpBlock.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
 
 import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
 import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
 import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
 import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpPlantBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpPlantBlock.kt
index 49c97917a..b21967096 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpPlantBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpPlantBlock.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
 
 import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
 import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
 import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
 import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/SeagrassBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/SeagrassBlock.kt
index 543f4b977..5b215d074 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/SeagrassBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/SeagrassBlock.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
 
 import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
 import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
 import de.bixilon.minosoft.data.registries.factory.clazz.MultiClassFactory
 import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt
index 946a245a6..59b7bae05 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt
@@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.registries.blocks.state.PropertyBlockState
 import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidHolder
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
 import de.bixilon.minosoft.gui.rendering.models.unbaked.fluid.FluidModel
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/flowable/water/WaterFluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/flowable/water/WaterFluid.kt
index a7871010b..8ac0758f8 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/flowable/water/WaterFluid.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/flowable/water/WaterFluid.kt
@@ -22,6 +22,7 @@ import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity
 import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.registries.blocks.state.PropertyBlockState
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterloggableBlock
 import de.bixilon.minosoft.data.registries.effects.movement.MovementEffect
 import de.bixilon.minosoft.data.registries.enchantment.armor.ArmorEnchantment
 import de.bixilon.minosoft.data.registries.fluid.FluidFactory
@@ -133,6 +134,7 @@ class WaterFluid(resourceLocation: ResourceLocation = this.identifier) : Flowabl
 
 
         fun BlockState.isWaterlogged(): Boolean {
+            if (this.block !is WaterloggableBlock) return false
             if (this !is PropertyBlockState) return false
             return properties[BlockProperties.WATERLOGGED]?.toBoolean() ?: return false
         }
diff --git a/src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt b/src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt
index b837eca21..f8101bc64 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt
@@ -17,7 +17,8 @@ import de.bixilon.minosoft.data.Axes
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.blocks.cube.CubeDirections
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.FullOpaqueBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.PotentialFullOpaqueBlock
 import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.water.WaterFluid.Companion.isWaterlogged
@@ -85,7 +86,7 @@ class BlockSectionDataProvider(
 
     private fun BlockState?.isFluid(): Boolean {
         if (this == null) return false
-        if (this.block is FluidFilled) {
+        if (this.block is FluidFilled || this.block is FluidBlock) {
             return true
         }
         if (this.isWaterlogged()) {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt
index 0fe52c438..dfca859b2 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt
@@ -22,7 +22,7 @@ import de.bixilon.kotlinglm.vec3.Vec3i
 import de.bixilon.kutil.cast.CastUtil.nullCast
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
-import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidHolder
+import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.PotentialFullOpaqueBlock
 import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid
 import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.FlowableFluid
@@ -283,8 +283,8 @@ class FluidCullSectionPreparer(
             }
 
             if (!fluid.matches(blockState)) {
-                // TODO: this was blockState.material.solid
-                if (blockState.block is PotentialFullOpaqueBlock && blockState.block.isFullOpaque(blockState)) {
+                // TODO: this was !blockState.material.solid
+                if (blockState.block !is PotentialFullOpaqueBlock || !blockState.block.isFullOpaque(blockState)) {
                     count++
                 }
                 continue