added new blocks from 1.6, 1.7 and 1.8

Author: Zahl

colors.cpp

@@ -35,11 +35,10 @@ uint8_t colors[256][8];
 
 void loadColors()
 {
-	// Colors are mostly the same as in Cartograph
 	memset(colors, 0, sizeof colors);
 	SETCOLOR(AIR, 255,255,255,0);
 	SETCOLORNOISE(STONE, 128,128,128,255, 16);
-	SETCOLORNOISE(GRASS, 100,150,60,255, 14);
+	SETCOLORNOISE(GRASS, 102,142,62,255, 14);
 	SETCOLORNOISE(DIRT, 134,96,67,255, 22);
 	SETCOLORNOISE(COBBLESTONE, 115,115,115,255, 24);
 	SETCOLORNOISE(WOOD, 157,128,79,255, 11);
@@ -65,6 +64,12 @@ void loadColors()
 	SETCOLOR(BED, 175,116,116, 254); // Not fully opaque to prevent culling on this one
 	SETCOLOR(POW_RAILROAD, 160,134,72,250);
 	SETCOLOR(DET_RAILROAD, 120,114,92,250);
+	SETCOLOR(29, 106,102,95,255);
+	SETCOLOR(COBWEB, 220,220,220,190);
+	SETCOLORNOISE(TALL_GRASS, 110,166,68,254, 12);
+	SETCOLORNOISE(SHRUB, 123,79,25,254, 25);
+	SETCOLOR(33, 106,102,95,255);
+	SETCOLOR(34, 153,129,89,255);
 	SETCOLOR(WOOL, 222,222,222,255); //Color(143,143,143,255);
 	//SETCOLOR(36, 222,222,222,255);
 	SETCOLOR(FLOWERR, 255,0,0,254); // Not fully opaque to prevent culling on this one
@@ -119,6 +124,21 @@ void loadColors()
 	SETCOLORNOISE(CAKE, 228, 205, 206, 255, 7);
 	SETCOLORNOISE(93, 151,147,147, 255, 2);
 	SETCOLORNOISE(94, 161,147,147, 255, 2);
+	SETCOLOR(95, 125,91,38,255);
+	SETCOLORNOISE(TRAPDOOR, 126,93,45,240, 5);
+	SETCOLORNOISE(97, 128,128,128,255, 16);
+	SETCOLORNOISE(98, 122,122,122,255, 7);
+	SETCOLORNOISE(99, 141,106,83,255, 0);
+	SETCOLORNOISE(100, 182,37,36,255, 6);
+	SETCOLORNOISE(IRON_BARS, 109,108,106,254, 6);
+	SETCOLOR(102, 255,255,255,40);
+	SETCOLORNOISE(103, 151,153,36,255, 10);
+	SETCOLOR(PUMPKIN_STEM, 115,170,73,254);
+	SETCOLOR(MELON_STEM, 115,170,73,254);
+	SETCOLORNOISE(VINES, 51,130,36,180, 12);
+	SETCOLOR(FENCE_GATE, 137,112,65,225);
+	SETCOLOR(108, 170,86,62,255);
+	SETCOLORNOISE(109, 122,122,122,255, 7);
 	SETCOLORNOISE(SANDSTEP, 218, 210, 158, 254, 7); // Not fully opaque to prevent culling on this one
 	SETCOLORNOISE(WOODSTEP, 157,128,79,254, 11); // Not fully opaque to prevent culling on this one
 	SETCOLORNOISE(COBBLESTEP, 115,115,115,254, 26); // Not fully opaque to prevent culling on this one
@@ -285,10 +305,12 @@ bool loadBiomeColors(const char* path)
 	g_GrasscolorDepth = pngGrass->getBytesPerPixel();
 	g_FoliageDepth = pngLeaf->getBytesPerPixel();
 	g_Grasscolor = pngGrass->getImageData();
+	g_TallGrasscolor = new uint8_t[pngGrass->getBytesPerPixel() * 256 * 256];
 	g_Leafcolor = pngLeaf->getImageData();
 	// Adjust brightness to what colors.txt says
 	const int maxG = pngGrass->getWidth() * pngGrass->getHeight() * g_GrasscolorDepth;
 	for (int i = 0; i < maxG; ++i) {
+		g_TallGrasscolor[i] = ((int)g_Grasscolor[i] * (int)colors[TALL_GRASS][BRIGHTNESS]) / 255;
 		g_Grasscolor[i] = ((int)g_Grasscolor[i] * (int)colors[GRASS][BRIGHTNESS]) / 255;
 	}
 	const int maxT = pngLeaf->getWidth() * pngLeaf->getHeight() * g_FoliageDepth;

colors.h

@@ -45,6 +45,9 @@ bool loadBiomeColors(const char* path);
 #define BED 26
 #define POW_RAILROAD 27
 #define DET_RAILROAD 28
+#define COBWEB 30
+#define TALL_GRASS 31
+#define SHRUB 32
 #define WOOL 35
 #define FLOWERY 37
 #define FLOWERR 38
@@ -61,11 +64,17 @@ bool loadBiomeColors(const char* path);
 #define SNOW 78
 #define FENCE 85
 #define CAKE 92
+#define TRAPDOOR 96
+#define IRON_BARS 101
+#define PUMPKIN_STEM 104
+#define MELON_STEM 105
+#define VINES 106
+#define FENCE_GATE 107
+
 #define SANDSTEP 233
 #define WOODSTEP 234
 #define COBBLESTEP 235
 #define PINELEAVES 236
 #define BIRCHLEAVES 237
-//#define VOIDBLOCK 255 // This will hopefully never be a valid block id in the near future :-)
 
 #endif

draw_png.cpp

@@ -637,19 +637,19 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 	modColor(c, sub);
 	if (g_BlendAll) {
 		// Then check the block type, as some types will be drawn differently
-		if (color == SNOW) {
+		if (color == SNOW || color == TRAPDOOR) {
 			setSnowBA(x, y, c);
 			return;
 		}
 		if (color == TORCH || color == REDTORCH_ON || color == REDTORCH_OFF) {
 			setTorchBA(x, y, c);
 			return;
 		}
-		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR) {
+		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB) {
 			setFlowerBA(x, y, c);
 			return;
 		}
-		if (color == FENCE) {
+		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS) {
 			setFence(x, y, c);
 			return;
 		}
@@ -672,7 +672,7 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 			setGrassBA(x, y, c, L, D, sub);
 			return;
 		}
-		if (color == FIRE) {
+		if (color == FIRE || color == TALL_GRASS) {
 			setFire(x, y, c, L, D);
 			return;
 		}
@@ -682,19 +682,19 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 		}
 	} else {
 		// Then check the block type, as some types will be drawn differently
-		if (color == SNOW) {
+		if (color == SNOW || color == TRAPDOOR) {
 			setSnow(x, y, c);
 			return;
 		}
 		if (color == TORCH || color == REDTORCH_ON || color == REDTORCH_OFF) {
 			setTorch(x, y, c);
 			return;
 		}
-		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR) {
+		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB) {
 			setFlower(x, y, c);
 			return;
 		}
-		if (color == FENCE) {
+		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS) {
 			setFence(x, y, c);
 			return;
 		}
@@ -717,7 +717,7 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 			setGrass(x, y, c, L, D, sub);
 			return;
 		}
-		if (color == FIRE) {
+		if (color == FIRE || color == TALL_GRASS) {
 			setFire(x, y, c, L, D);
 			return;
 		}
@@ -913,14 +913,13 @@ namespace
 		// This basically just leaves out a few pixels
 		// Top row
 		uint8_t *pos = &PIXEL(x, y);
-		for (size_t i = 0; i < 2; ++i, pos += CHANSPERPIXEL * 2) {
-			blend(pos, color);
-		}
+		blend(pos, light);
+		blend(pos + CHANSPERPIXEL*2, dark);
 		// Second and third row
 		for (size_t i = 1; i < 3; ++i) {
 			pos = &PIXEL(x, y+i);
 			blend(pos, dark);
-			blend(pos+(CHANSPERPIXEL*i), dark);
+			blend(pos+(CHANSPERPIXEL*i), color);
 			blend(pos+(CHANSPERPIXEL*3), light);
 		}
 		// Last row

extractcolors.cpp

@@ -45,12 +45,12 @@ static const int special_sauce[256][3] = {
 	{	 7,	 8,	10	},
 	{	 3,	11,	10	},
 	{	 3,	12,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	}, /*  30 */
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
+	{	12,	 6,	10	},
+	{	11,	 0,	10	}, /*  30 */
+	{	 7,	 2,	10	},
+	{	 7,	 3,	10	},
+	{	12,	 6,	10	},
+	{	11,	 6,	10	},
 	{	 0,	 4,	10	},
 	{	-1,	-1,	10	},
 	{	13,	 0,	10	},
@@ -111,21 +111,21 @@ static const int special_sauce[256][3] = {
 	{	 9,	 7,	10	},
 	{	 3,	 8,	10	},
 	{	 3,	 9,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	}, /* 100 */
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
-	{	-1,	-1,	10	},
+	{	11,	 1,	10	},
+	{	 4,	 5,	10	},
+	{	 1,	 0,	10	},
+	{	 6,	 3,	10	},
+	{	14,	 7,	10	},
+	{	13,	 7,	10	}, /* 100 */
+	{	 5,	 5,	10	},
+	{	 1,	 3,	 7	},
+	{	 9,	 8,	10	},
+	{	15,	 6,	10	},
+	{	15,	 7,	10	},
+	{	15,	 8,	10	},
+	{	 5,	 1,	 9	},
+	{	 7,	 0,	10	},
+	{	 6,	 3,	10	},
 	{	-1,	-1,	10	}, /* 110 */
 	{	-1,	-1,	10	},
 	{	-1,	-1,	10	},

globals.cpp

@@ -18,7 +18,7 @@ bool g_Hell = false, g_ServerHell = false;
 
 bool g_UseBiomes = false;
 uint64_t g_BiomeMapSize = 0;
-uint8_t *g_Grasscolor = NULL, *g_Leafcolor = NULL;
+uint8_t *g_Grasscolor = NULL, *g_Leafcolor = NULL, *g_TallGrasscolor = NULL;
 uint16_t *g_BiomeMap = NULL;
 int g_GrasscolorDepth = 0, g_FoliageDepth = 0;
 

globals.h

@@ -1,7 +1,7 @@
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#define VERSION "2.0g"
+#define VERSION "2.1"
 
 #include <stdint.h>
 #include <cstdlib>
@@ -43,7 +43,7 @@ extern bool g_Hell, g_ServerHell; // rendering the nether
 // For rendering biome colors properly, external png files are used
 extern bool g_UseBiomes;
 extern uint64_t g_BiomeMapSize;
-extern uint8_t *g_Grasscolor, *g_Leafcolor;
+extern uint8_t *g_Grasscolor, *g_Leafcolor, *g_TallGrasscolor;
 extern uint16_t *g_BiomeMap;
 extern int g_GrasscolorDepth, g_FoliageDepth;
 

main.cpp

@@ -523,6 +523,10 @@ int main(int argc, char **argv)
 					uint16_t &offset = BIOMEAT(x,z);
 					memcpy(colors[GRASS], g_Grasscolor + offset * g_GrasscolorDepth, 3);
 					memcpy(colors[LEAVES], g_Leafcolor + offset * g_FoliageDepth, 3);
+					memcpy(colors[TALL_GRASS], g_TallGrasscolor + offset * g_GrasscolorDepth, 3);
+					memcpy(colors[PUMPKIN_STEM], g_TallGrasscolor + offset * g_GrasscolorDepth, 3);
+					memcpy(colors[MELON_STEM], g_TallGrasscolor + offset * g_GrasscolorDepth, 3);
+					memcpy(colors[VINES], g_Grasscolor + offset * g_GrasscolorDepth, 3);
 					// Leaves: This is just an approximation to get different leaf colors at all
 					colors[PINELEAVES][PRED] = clamp(int32_t(colors[LEAVES][PRED]) - 17);
 					colors[PINELEAVES][PGREEN] = clamp(int32_t(colors[LEAVES][PGREEN]) - 12);