Fixed water issue with missing water (mapcrafter#178), and the forum thread issue.

Author: m0r13

src/mapcraftercore/mc/worldcache.cpp

@@ -34,7 +34,7 @@ Block::Block(const mc::BlockPos& pos, uint16_t id, uint16_t data)
 }
 
 bool Block::isFullWater() const {
-	return (id == 8 || id == 9) && data == 0;
+	return (id == 8 || id == 9) && (data & 0x7) == 0;
 }
 
 bool Block::isStairs() const {

src/mapcraftercore/renderer/blockimages.h

@@ -55,6 +55,10 @@ const int EDGE_EAST = 1 << 14;
 const int EDGE_BOTTOM = 1 << 15;
 
 // some data values and stuff for special blocks
+const int FULL_WATER = DATA_NORTH;
+const int FULL_WATER_SOUTH = DATA_SOUTH;
+const int FULL_WATER_WEST = DATA_WEST;
+const int FULL_WATER_TOP = DATA_TOP;
 const int GRASS_SNOW = 16;
 
 const int OPAQUE_WATER = 1 << 4;

src/mapcraftercore/renderer/renderviews/isometric/blockimages.cpp

@@ -347,9 +347,13 @@ uint16_t IsometricBlockImages::filterBlockData(uint16_t id, uint16_t data) const
 
 	if (id == 6)
 		return data & (0xff00 | util::binary<11>::value);
-	else if (id == 8 || id == 9) // water
+	else if (id == 8 || id == 9) { // water
+		// 0x8 bit means that this is a water block spreading downwards
+		// -> return with Minecraft data 0 (full block)
+		if (data & 0x8)
+			data &= ~0x7;
 		return data & (0xff00 | util::binary<11110111>::value);
-	else if (id == 10 || id == 11) { // lava
+	} else if (id == 10 || id == 11) { // lava
 		// 0x8 bit means that this is a lava block spreading downwards
 		// -> return data 0 (full block)
 		if (data & 0x8)
@@ -623,25 +627,27 @@ void IsometricBlockImages::createWater() { // id 8, 9
 		bool top = i & util::binary<1>::value;
 
 		RGBAImage block(getBlockSize(), getBlockSize());
-		uint16_t extra_data = 0;
+		uint16_t extra_data = FULL_WATER;
 
 		if (top) {
 			blitFace(block, FACE_TOP, water, 0, 0, true, dleft, dright);
-			extra_data |= DATA_TOP;
+			extra_data |= FULL_WATER_TOP;
 		}
 
 		if (west) {
 			blitFace(block, FACE_WEST, water, 0, 0, true, dleft, dright);
-			extra_data |= DATA_WEST;
+			extra_data |= FULL_WATER_WEST;
 		}
 
 		if (south) {
 			blitFace(block, FACE_SOUTH, water, 0, 0, true, dleft, dright);
-			extra_data |= DATA_SOUTH;
+			extra_data |= FULL_WATER_SOUTH;
 		}
 
-		setBlockImage(8, extra_data, block);
-		setBlockImage(9, extra_data, block);
+		if (extra_data != 0) {
+			setBlockImage(8, extra_data, block);
+			setBlockImage(9, extra_data, block);
+		}
 	}
 }
 

src/mapcraftercore/renderer/tilerenderer.cpp

@@ -140,12 +140,14 @@ uint16_t TileRenderer::checkNeighbors(const mc::BlockPos& pos, uint16_t id, uint
 		// check if the neighbors on visible faces (top, west, south) are also full water blocks
 		// show water textures on these sides only if there is no water as neighbor too
 		// exception for the top-face and when preblit water is used
+		data |= FULL_WATER;
 		if (use_preblit_water || !top.isFullWater())
-			data |= DATA_TOP;
+			data |= FULL_WATER_TOP;
 		if (!west.isFullWater())
-			data |= DATA_WEST;
+			data |= FULL_WATER_WEST;
 		if (!south.isFullWater())
-			data |= DATA_SOUTH;
+			data |= FULL_WATER_SOUTH;
+
 	} else if (block.isStairs()) { // stairs
 		// corner stairs... wtf
 		// using corner stair detection code of Minecraft Overviewer for now: