v1.7.10-0.3.4

.gitignore

@@ -1,6 +1,6 @@
 /.gradle/
 /build/
 /libs/
+/out/
 /run/
-/gradle/wrapper/gradle-wrapper.jar
 /src/main/resources/mcmod.info

changelog.md

@@ -1,4 +1,2 @@
-- TFC soil blocks falling in streams when _not_ using Repose are now washed away as items instead of simply disappearing, and no longer make a rock breaking sound.
-- Gravity-fallen rock blocks can now replace Streams river blocks. This addresses a corner case where Streams, Repose and TFC would cause infinite re-spawn of lava-generated cobble.
-- Fixed TFC Nether using wrong modded chunk provider.
-- Removed Shader block replacement message when in server mode.
+- Fixed [falling blocks bouncing endlessly when landing on blocks without a solid top](https://github.com/delvr/Streams/issues/63).
+- Fixed the ["air gaps" within Streams that allowed breathing underwater](https://github.com/delvr/Streams/issues/15).

gradle.properties

@@ -1,4 +1,4 @@
-modVersion=0.3.3
+modVersion=0.3.4
 modDependencies=farseek@[2,3)
 modOptionalDependencies=
 modDescription=This mod introduces real flowing rivers, with a true current, to your Minecraft worlds. Compatible with many terrain generators.

src/main/scala/streams/block/BlockRiver.scala

@@ -145,8 +145,10 @@ class BlockRiver(liquid: MaterialLiquid, val dx: Int, val dz: Int) extends Block
 
     def getFilledPercentage(w: World, x: Int, y: Int, z: Int) = {
         implicit val world = w
-        val data = dataAt(x, y, z)
-        val decay = if(data != 0 && allNeighbors(x, y, z).exists(blockAbove(_).getMaterial == liquid)) 0f else data.toFloat
-        (8f - decay) / 9f
+        if(blockAbove(x, y, z).isLiquid) 1f else {
+            val data = dataAt(x, y, z)
+            val decay = if(data != 0 && allNeighbors(x, y, z).exists(blockAbove(_).getMaterial == liquid)) 0f else data.toFloat
+            (8f - decay) / 9f
+        }
     }
 }

src/main/scala/streams/tfc/package.scala

@@ -40,15 +40,11 @@ package object tfc {
     def isFreshWater(block: Block): Boolean = block.isInstanceOf[BlockRiver] || TFC_Core.isFreshWater(block)
 
     def canReplace(fallingBlock: EntityFallingBlockTFC, world: World, x: Int, y: Int, z: Int): Boolean = {
-        if(!fallingBlock.isDead)
-            false
+        if(!blockAt(x, y, z)(world).isInstanceOf[BlockRiver])
+            fallingBlock.canReplace(world, x, y, z)
         else {
-            if(!blockAt(x, y, z)(world).isInstanceOf[BlockRiver])
-                fallingBlock.canReplace(world, x, y, z)
-            else {
-                fallingBlock.shouldDropItem = true
-                false
-            }
+            fallingBlock.shouldDropItem = true
+            false
         }
     }
 }