Compatible with Minecraft 1.8

Author: WRIM

changelog.txt

@@ -2,6 +2,16 @@ mcmap changelog
 Latest version is available at: http://wrim.pl/mcmap/
 ------------------------------------------------------
 
+2.4.3 (jul 26 2015) - Minecraft 1.8.X compatible
+added:
+-color for sponge
+-all wooden door types
+-all fences and fence gates
+-red sandstone recognized as red sand
+-inverted daylight sensor
+-prismarine and sea lantern (ID's 232 and 236)
+-granite, diorite and andesite (ID's 140, 144 and 157)
+
 2.4.2e (feb 20 2014) - snapshot 14w08a compatible (MC 1.7.4)
 added:
 -iron trapdoor

colors.cpp

@@ -239,7 +239,15 @@ void loadColors()
 	SETCOLOR(174, 159, 189, 239, 255 ); //packed ice
 	SETCOLOR(175, 0, 255, 0, 254 ); //Large flower
 	SETCOLOR(206, 54, 24, 30, 255 ); //nether bricks slab
+
+	//1.8+
 	SETCOLOR(165, 61, 255, 61, 96  ); //slime block
+	SETCOLOR(19, 224, 240, 48, 255  ); //sponge
+	SETCOLOR(232, 25, 146, 132, 255  ); //prismarine
+	SETCOLOR(236, 75, 196, 152, 255  ); //sea lantern
+	SETCOLOR(140, 208, 128, 128, 255  ); //granite
+	SETCOLOR(144, 228, 228, 228, 255  ); //diorite
+	SETCOLOR(157, 160, 160, 160, 255  ); //andesite
 
 	// carpets
 	SETCOLOR(36 ,  255, 255, 255,  254   ); //White carpet

colors.txt

@@ -96,3 +96,12 @@
 
 # nether
 238  206 206 201  255   5	# Birch Wood / quartz slab (sic!)
+
+# 1.8
+ 19  224 220  48  255    0	# sponge
+232   25 146 132  255    0	# prismarine
+236   75 196 152  255    0	# sea lantern
+140  208 128 128  255    0	# granite
+144  228 228 228  255    0	# diorite
+157  160 160 160  255    0	# andesite
+

globals.h

@@ -1,7 +1,7 @@
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#define VERSION "2.4.2e (compatible with Minecraft 1.7.4)"
+#define VERSION "2.4.3 (compatible with Minecraft 1.8.X)"
 
 #include <stdint.h>
 #include <cstdlib>

main.cpp

@@ -1144,7 +1144,7 @@ void printHelp(char *binary)
 	   "                format by using file extensions .xml, .json or .txt (default)\n"
 	   "  -split PATH   create tiled output (128x128 to 4096x4096) in given PATH\n"
 	   "  -marker c x z place marker at x z with color c (r g b w)\n"
-	   "\n    WORLDPATH is the path of the desired alpha/beta world.\n\n"
+	   "\n    WORLDPATH is the path of the desired Minecraft world.\n\n"
 	   ////////////////////////////////////////////////////////////////////////////////
 	   "Examples:\n\n"
 #ifdef _WIN32

worldloader.cpp

@@ -1031,9 +1031,9 @@ static void loadBiomeChunk(const char* path, const int chunkX, const int chunkZ)
 static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int &x, int &y, int &z, uint8_t* &justData)
 {
 	if (block == WOOL || block == LOG || block == LEAVES || block == STEP || block == DOUBLESTEP || block == WOOD || block == WOODEN_STEP || block == WOODEN_DOUBLE_STEP 
-		|| block == 95 || block == 160 || block == 159 || block == 171 || block == 38 || block == 175 || block == SAND || block == 153 || block == 166 || block == 167
-		|| (g_NoWater && (block == WATER || block == STAT_WATER))
-		|| block == 141 || block == 142 || block == 158 || block == 149 || block == 157
+		|| block == 95 || block == 160 || block == 159 || block == 171 || block == 38 || block == 175 || block == SAND || block == 153 
+		|| (g_NoWater && (block == WATER || block == STAT_WATER)) || (block >= 176 && block <= 197) || (block >= 166 && block <= 169) || block == STONE
+		|| block == 141 || block == 142 || block == 158 || block == 149 || block == 157 || block == 140 || block == 144
 		|| block == 131 || block == 132 || block == 150 || block == 147 || block == 148 || block == 68 || block == 69 || block == 70
 		|| block == 72 || block == 77 || block == 143 || block == 36) {  //three last lines contains colors for carpets
 		uint8_t col;
@@ -1043,21 +1043,29 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
 			col = (justData[(y + (z + (x * CHUNKSIZE_Z)) * CHUNKSIZE_Y) / 2] >> ((y % 2) * 4)) & 0xF;
 		}
 		if (block == 131 || block == 132 || block == 150 || block == 147 || block == 148 || block == 68 || block == 69 || block == 70
-			|| block == 72 || block == 77 || block == 143 || block == 36 || block == 166
+			|| block == 72 || block == 77 || block == 143 || block == 36 || block == 166 || block == 140 || block == 144
 			|| block == WATER || block == STAT_WATER) {		//not visible blocks replaced to air, therefore we have few ID's more
 				*targetBlock++ = 0;
-		} else if (block == 141 || block == 142) {		//carrots and potatoes -> wheat
-				*targetBlock++ = 59;
-		} else if (block == 158) {		//dropper -> dispenser
-				*targetBlock++ = 23;
-		} else if (block == 149) {		//comparator -> repeater
-				*targetBlock++ = 93;
-		} else if (block == 153) {		//nether ore -> netherrack
-				*targetBlock++ = 87;
-		} else if (block == 157) {		//activator rail -> detector rail
-				*targetBlock++ = 28;
-		} else if (block == 167) {		//iron trapdoor -> wooden trapdoor
-				*targetBlock++ = 96;
+		} else if (block == STONE) {
+			switch (col)
+			{
+			case 0:
+				*targetBlock++ = 1;
+				break;
+			case 1:
+			case 2:
+				*targetBlock++ = 140;
+				break;
+			case 3:
+			case 4:
+				*targetBlock++ = 144;
+				break;
+			case 5:
+			case 6:
+				*targetBlock++ = 157;
+				break;
+			}
+
 		} else if (block == LEAVES) {
 			if ((col & 0x3) != 0) { // Map to pine or birch
 				*targetBlock++ = 228 + (col & 0x3);
@@ -1231,7 +1239,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
 			} else {
 				*targetBlock++ = block;
 			}
-		} else /*if (block == DOUBLESTEP)*/ {
+		} else if (block == DOUBLESTEP) {
 			if (col == 1) {
 				*targetBlock++ = SANDSTONE;
 			} else if (col == 2) {
@@ -1241,7 +1249,33 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
 			} else {
 				*targetBlock++ = block;
 			}
-		}
+		} else if (block == 141 || block == 142) {		//carrots and potatoes -> wheat
+				*targetBlock++ = 59;
+		} else if (block == 158) {		//dropper -> dispenser
+				*targetBlock++ = 23;
+		} else if (block == 149) {		//comparator -> repeater
+				*targetBlock++ = 93;
+		} else if (block == 153) {		//nether ore -> netherrack
+				*targetBlock++ = 87;
+		} else if (block == 157) {		//activator rail -> detector rail
+				*targetBlock++ = 28;
+		} else if (block == 167) {		//iron trapdoor -> wooden trapdoor
+				*targetBlock++ = 96;
+		} else if (block == 179 || block == 180 || block == 181 || block == 182) {	//red sandstone -> red sand
+				*targetBlock++ = 153;
+		} else if (block == 178) {		//daylight detector inverted -> daylight detector
+				*targetBlock++ = 151;
+		} else if (block == 168) {		//prismarine
+				*targetBlock++ = 232;
+		} else if (block == 169) {		//sea lantern
+				*targetBlock++ = 236;
+		} else if (block >= 193 && block <= 197) {	//doors 1.8+
+				*targetBlock++ = 64;
+		} else if (block >= 188 && block <= 192) {	//fences 1.8+
+				*targetBlock++ = 85;
+		} else if (block >= 183 && block <= 187) {	//fence gates 1.8+
+				*targetBlock++ = 107;
+		} else *targetBlock++ = block;
 	} else {
 		*targetBlock++ = block;
 	}