v1.12-0.4.6

changelog.md

@@ -1,3 +1 @@
-- Fixed river blocks not being rendered by shaders in recent versions of Forge/OptiFine.
-- Fixed river blocks not being rendered by [BSL shaders](https://bitslablab.wixsite.com/main/bsl-shaders) (this works with 7.0 and 7.1.01, but not with earlier versions of 7.1).
-- Fixed river blocks ignoring biome-specific water colors when _not_ using OptiFine.
+- Fixed [Streams river blocks disappearing from existing worlds when upgrading to Streams 0.4.5](https://github.com/delvr/Streams/issues/77). (Note: upgrading from 0.4.5 to 0.4.6 will restore the missing blocks but will cause some of the sloping sections to misbehave. For best results, upgrade on the Forge-created world backup instead.)

gradle.properties

@@ -1,4 +1,4 @@
-modVersion=0.4.5
+modVersion=0.4.6
 modDependencies=farseek@[2,3)
 modDescription=This mod introduces real flowing rivers, with a true current, to your Minecraft worlds. Compatible with many terrain generators.
 modUrl=https://minecraft.curseforge.com/projects/streams

src/main/resources/assets/streams/shaders/block.properties

@@ -1,2 +1,2 @@
-block.8=streams:river/water/-2/-2 streams:river/water/-2/-1 streams:river/water/-2/0 streams:river/water/-2/1 streams:river/water/-2/2 streams:river/water/-1/-2 streams:river/water/-1/2 streams:river/water/0/-2 streams:river/water/0/0 streams:river/water/0/2 streams:river/water/1/-2 streams:river/water/1/2 streams:river/water/2/-2 streams:river/water/2/-1 streams:river/water/2/0 streams:river/water/2/1 streams:river/water/2/2 streams:river/tile.water/-2/-2 streams:river/tile.water/-2/-1 streams:river/tile.water/-2/0 streams:river/tile.water/-2/1 streams:river/tile.water/-2/2 streams:river/tile.water/-1/-2 streams:river/tile.water/-1/2 streams:river/tile.water/0/-2 streams:river/tile.water/0/0 streams:river/tile.water/0/2 streams:river/tile.water/1/-2 streams:river/tile.water/1/2 streams:river/tile.water/2/-2 streams:river/tile.water/2/-1 streams:river/tile.water/2/0 streams:river/tile.water/2/1 streams:river/tile.water/2/2
-block.13000=streams:river/water/-2/-2 streams:river/water/-2/-1 streams:river/water/-2/0 streams:river/water/-2/1 streams:river/water/-2/2 streams:river/water/-1/-2 streams:river/water/-1/2 streams:river/water/0/-2 streams:river/water/0/0 streams:river/water/0/2 streams:river/water/1/-2 streams:river/water/1/2 streams:river/water/2/-2 streams:river/water/2/-1 streams:river/water/2/0 streams:river/water/2/1 streams:river/water/2/2 streams:river/tile.water/-2/-2 streams:river/tile.water/-2/-1 streams:river/tile.water/-2/0 streams:river/tile.water/-2/1 streams:river/tile.water/-2/2 streams:river/tile.water/-1/-2 streams:river/tile.water/-1/2 streams:river/tile.water/0/-2 streams:river/tile.water/0/0 streams:river/tile.water/0/2 streams:river/tile.water/1/-2 streams:river/tile.water/1/2 streams:river/tile.water/2/-2 streams:river/tile.water/2/-1 streams:river/tile.water/2/0 streams:river/tile.water/2/1 streams:river/tile.water/2/2
+block.8=streams:river/tile.water/-2/-2 streams:river/tile.water/-2/-1 streams:river/tile.water/-2/0 streams:river/tile.water/-2/1 streams:river/tile.water/-2/2 streams:river/tile.water/-1/-2 streams:river/tile.water/-1/2 streams:river/tile.water/0/-2 streams:river/tile.water/0/0 streams:river/tile.water/0/2 streams:river/tile.water/1/-2 streams:river/tile.water/1/2 streams:river/tile.water/2/-2 streams:river/tile.water/2/-1 streams:river/tile.water/2/0 streams:river/tile.water/2/1 streams:river/tile.water/2/2
+block.13000=streams:river/tile.water/-2/-2 streams:river/tile.water/-2/-1 streams:river/tile.water/-2/0 streams:river/tile.water/-2/1 streams:river/tile.water/-2/2 streams:river/tile.water/-1/-2 streams:river/tile.water/-1/2 streams:river/tile.water/0/-2 streams:river/tile.water/0/0 streams:river/tile.water/0/2 streams:river/tile.water/1/-2 streams:river/tile.water/1/2 streams:river/tile.water/2/-2 streams:river/tile.water/2/-1 streams:river/tile.water/2/0 streams:river/tile.water/2/1 streams:river/tile.water/2/2

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

@@ -33,7 +33,7 @@ class BlockRiver(liquid: MaterialLiquid, val dxFlow: Int, val dzFlow: Int) exten
     cloneObject(classOf[BlockLiquid], getStaticBlock(liquid), this, f => f.getType == classOf[IRegistryDelegate[Block]] || f.getType == classOf[ResourceLocation])
     blockState = createBlockState
     setDefaultState(blockState.getBaseState)
-    ForgeRegistries.BLOCKS.register(setRegistryName("streams", s"river/${Block.REGISTRY.getNameForObject(getStaticBlock(liquid)).getPath}/$dxFlow/$dzFlow"))
+    ForgeRegistries.BLOCKS.register(setRegistryName("streams", s"river/${getStaticBlock(liquid).getTranslationKey}/$dxFlow/$dzFlow"))
 
     override def onBlockAdded(w: World, pos: BlockPos, state: IBlockState) {
         if(populating)