Merge pull request spoutn1k#12 from orphu/master

Adds 1.9 pre 2 blocks

Author: Zahl

colors.cpp

@@ -141,6 +141,12 @@ void loadColors()
 	SETCOLOR(FENCE_GATE, 137,112,65,225);
 	SETCOLOR(108, 170,86,62,255);
 	SETCOLORNOISE(109, 122,122,122,255, 7);
+	SETCOLORNOISE(MYCELIUM, 140,115,119,255, 14);
+	SETCOLOR(LILYPAD, 85,124,60,254); 
+	SETCOLORNOISE(NETHER_BRICK, 54,24,30,255, 7);
+	SETCOLOR(NETHER_BRICK_FENCE, 54,24,30,225);
+	SETCOLOR(NETHER_BRICK_STAIRS, 54,24,30,255);
+	SETCOLOR(NETHER_WART, 112,8,28,254);
 	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

colors.h

@@ -70,6 +70,12 @@ bool loadBiomeColors(const char* path);
 #define MELON_STEM 105
 #define VINES 106
 #define FENCE_GATE 107
+#define MYCELIUM 110
+#define LILYPAD 111
+#define NETHER_BRICK 112
+#define NETHER_BRICK_FENCE 113
+#define NETHER_BRICK_STAIRS 114
+#define NETHER_WART 115
 
 #define SANDSTEP 233
 #define WOODSTEP 234

draw_png.cpp

@@ -645,11 +645,11 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 			setTorchBA(x, y, c);
 			return;
 		}
-		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB) {
+		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB || color == LILYPAD || color == NETHER_WART) {
 			setFlowerBA(x, y, c);
 			return;
 		}
-		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS) {
+		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS || color == NETHER_BRICK_FENCE) {
 			setFence(x, y, c);
 			return;
 		}
@@ -690,11 +690,11 @@ void setPixel(const size_t x, const size_t y, const uint8_t color, const float f
 			setTorch(x, y, c);
 			return;
 		}
-		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB) {
+		if (color == FLOWERR || color == FLOWERY || color == MUSHROOMB || color == MUSHROOMR || color == MELON_STEM || color == PUMPKIN_STEM || color == SHRUB || color == COBWEB || color == LILYPAD || color == NETHER_WART) {
 			setFlower(x, y, c);
 			return;
 		}
-		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS) {
+		if (color == FENCE || color == FENCE_GATE || color == VINES || color == IRON_BARS || color == NETHER_BRICK_FENCE) {
 			setFence(x, y, c);
 			return;
 		}