version 2.4.1 [nov 19 2013] - Minecraft 1.7.2 compatible

fixed: -wooden slabs and stairs -sandstone stairs -better colours of stained clays -little corrections in color.txt
WRIM · Nov 19, 2013 · ca611e6 · ca611e6
1 parent fa07bbd
commit ca611e6
Show file tree

Hide file tree

Showing 10 changed files with 329 additions and 105 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -0,0 +1,21 @@
+mcmap changelog
+Latest version is available at: http://wrim.pl/mcmap/
+------------------------------------------------------
+
+2.4.1 [nov 19 2013] - Minecraft 1.7.2 compatible
+fixed:
+-wooden slabs and stairs
+-sandstone stairs
+-better colours of stained clays
+-little corrections in color.txt
+
+2.4 [nov 15 2013] - Minecraft 1.7.2 compatible
+added:
+-carrots and potatoes
+-redstone block, coal block, anvil, hopper, emerald block etc.
+-packed ice, red sand, hardened clay, wood and leafs introduced in 1.7.2
+-various colors of flowers
+-carpets, stained clays, stained glass and glass panes with 16 colors
+
+2.3b [long time ago] - Minecraft 1.3.1 compatible
+-last Zahl's version
diff --git a/colors.cpp b/colors.cpp
@@ -80,8 +80,10 @@ void loadColors()
 	SETCOLOR(42, 191,191,191,255);
 	SETCOLOR(DOUBLESTEP, 200,200,200,255);
 	SETCOLOR(STEP, 200,200,200,254); // Not fully opaque to prevent culling on this one
+	SETCOLOR(UP_STEP, 200,200,200,254); // Not fully opaque to prevent culling on this one
 	SETCOLOR(45, 170,86,62,255);
 	SETCOLOR(BRICKSTEP, 170,86,62,254);
+	SETCOLOR(UP_BRICKSTEP, 170,86,62,254);
 	SETCOLOR(46, 160,83,65,255);
 	SETCOLORNOISE(48, 90,108,90,255, 27);
 	SETCOLOR(49, 26,11,43,255);
@@ -130,6 +132,7 @@ void loadColors()
 	SETCOLORNOISE(97, 128,128,128,255, 16);
 	SETCOLORNOISE(98, 122,122,122,255, 7);
 	SETCOLORNOISE(STONEBRICKSTEP, 122,122,122,254, 7);
+	SETCOLORNOISE(UP_STONEBRICKSTEP, 122,122,122,254, 7);
 	SETCOLORNOISE(99, 141,106,83,255, 0);
 	SETCOLORNOISE(100, 182,37,36,255, 6);
 	SETCOLORNOISE(IRON_BARS, 109,108,106,254, 6);
@@ -156,12 +159,42 @@ void loadColors()
 	SETCOLOR(122, 20,18,29,255);
 	SETCOLORNOISE(123, 70,43,26,255, 2);
 	SETCOLORNOISE(124, 119,89,55,255, 7);
+	SETCOLORNOISE(WOODEN_DOUBLE_STEP, 156,127,78,255, 11);
+	SETCOLORNOISE(WOODEN_STEP, 156,127,78,254, 11);
+	SETCOLOR(COCOA_PLANT, 145,80,30,200);
+	SETCOLORNOISE(128, 218,210,158,255, 15);
+	SETCOLORNOISE(129, 109,128,116,255, 18);
+	SETCOLORNOISE(130, 18,16,27,255, 5);
+	SETCOLORNOISE(131, 138,129,113,255, 28);
+	SETCOLORNOISE(132, 129,129,129,107, 25);
+	SETCOLOR(133, 81,217,117,255);
+	SETCOLORNOISE(134, 103,77,46,255, 1);
+	SETCOLORNOISE(135, 195,179,123,255, 3);
+	SETCOLORNOISE(136, 154,110,77,255, 2);
+
 	SETCOLORNOISE(PINELEAVES, 44,84,44,160, 20); // Pine leaves
 	SETCOLORNOISE(BIRCHLEAVES, 85,124,60,170, 11); // Birch leaves
 	SETCOLORNOISE(JUNGLELEAVES, 44,135,50,175, 11); // Birch leaves
 	SETCOLORNOISE(SANDSTEP, 218, 210, 158, 254, 7); // Not fully opaque to prevent culling on this one
+	SETCOLORNOISE(UP_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(UP_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
+	SETCOLORNOISE(UP_COBBLESTEP, 115,115,115,254, 26); // Not fully opaque to prevent culling on this one
+
+	SETCOLORNOISE(PINESTEP, 103,77,46,254, 1);
+	SETCOLORNOISE(BIRCHSTEP, 195,179,123,254, 3);
+	SETCOLORNOISE(JUNGLESTEP, 154,110,77,254, 2);
+
+	SETCOLORNOISE(UP_WOODSTEP2, 157,128,79,254, 11);
+	SETCOLORNOISE(UP_PINESTEP, 103,77,46,255, 1);
+	SETCOLORNOISE(UP_BIRCHSTEP, 195,179,123,255, 3);
+	SETCOLORNOISE(UP_JUNGLESTEP, 154,110,77,255, 2);
+
+	SETCOLORNOISE(226, 103,77,46,255, 1);
+	SETCOLORNOISE(227, 195,179,123,255, 3);
+	SETCOLORNOISE(228, 154,110,77,255, 2);
+
 	SETCOLOR(237, 70,50,32, 255); // Pine trunk
 	SETCOLORNOISE(238, 206,206,201, 255, 5); // Birch trunk
 	SETCOLOR(239, 122,91,51, 255); // Jungle trunk
@@ -188,21 +221,24 @@ void loadColors()
 	SETCOLORNOISE(139,    128,   128,   128,   255,   16); // cobblestone wall
 	SETCOLOR(145, 110, 110, 110, 255 ); //anvil
 	SETCOLOR(146, 125,    91,    38,   255   ); //trapped chest
+	SETCOLOR(151, 187, 158, 109, 255 ); //daylight sensor
 	SETCOLOR(152, 227,  38,  12, 255 ); //redstone block
 	SETCOLOR(154, 110, 110, 110, 255 ); //hopper
 	SETCOLOR(155, 240, 238, 232, 255 ); //quartz
 	SETCOLOR(156, 240, 238, 232, 255 ); //quartz stairs
+	SETCOLOR(207, 240, 238, 232, 255 ); //quartz slab
 	//SETCOLOR(159, 209, 177, 160, 255 ); //white stained clay !
 	SETCOLOR(161, 54, 135, 40, 180 ); //leaves Acacia/Dark Oak
 	SETCOLOR(162, 72,  72, 72, 255 ); //log Acacia/Dark Oak
 	SETCOLORNOISE(163, 154, 110, 77, 255, 2); // Acacia Wood Stairs
 	SETCOLORNOISE(164, 106, 127, 98, 255, 11); // Dark Oak Wood Stairs
 	SETCOLOR(170, 172, 145, 18,  255 ); //haystack
 	SETCOLOR(171, 224, 224, 224, 255 ); //white carpet
-	SETCOLOR(172, 209, 177, 160, 255 ); //hardened clay
+	SETCOLOR(172, 184, 126, 99, 255 ); //hardened clay
 	SETCOLOR(173, 21,  21,  21,  255 ); //coal block
 	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
 
 	// carpets
 	SETCOLOR(36 ,  255, 255, 255,  254   ); //White carpet
@@ -223,30 +259,30 @@ void loadColors()
 	SETCOLOR(158,   32,  27,  27,  254   ); //Black carpet
 
 	// clays
-	SETCOLOR(159,  225, 225,  225, 255   ); //White Stained Clay
+	SETCOLOR(159,  241, 210, 192, 255   ); //White Stained Clay
 
-	SETCOLOR(186,  214, 107,  24,  255   ); //Orange Stained Clay
-	SETCOLOR(187,  170,  45, 180,  255   ); //Magenta Stained Clay
-	SETCOLOR(188,  90 , 128, 211,  255   ); //Light Blue Stained Clay
-	SETCOLOR(189,  174, 170,   0,  255   ); //Yellow Stained Clay
-	SETCOLOR(190,   29, 180,  17,  255   ); //Lime Stained Clay
-	SETCOLOR(191,  207, 111, 134,  255   ); //Pink Stained Clay
-	SETCOLOR(192,   46,  46,  46,  255   ); //Gray Stained Clay
-	SETCOLOR(193,  138, 142, 142,  255   ); //Light Gray Stained Clay
-	SETCOLOR(194,    9,  86, 119,  255   ); //Cyan Stained Clay
-	SETCOLOR(195,  103,  23, 165,  255   ); //Purple Stained Clay
-	SETCOLOR(196,   38,  51, 160,  255   ); //Blue Stained Clay
-	SETCOLOR(197,   85,  51,   0,  255   ); //Brown Stained Clay
-	SETCOLOR(198,   55,  77,   0,  255   ); //Green Stained Clay
-	SETCOLOR(199,  143,  14,  10,  255   ); //Red Stained Clay
-	SETCOLOR(200,    2,   0,   0,  255   ); //Black Stained Clay
+	SETCOLOR(186,  194, 116,  69, 255   ); //Orange Stained Clay
+	SETCOLOR(187,  182, 120, 140, 255   ); //Magenta Stained Clay
+	SETCOLOR(188,  141, 137, 167, 255   ); //Light Blue Stained Clay
+	SETCOLOR(189,  219, 165,  66, 255   ); //Yellow Stained Clay
+	SETCOLOR(190,  137, 149,  84, 255   ); //Lime Stained Clay
+	SETCOLOR(191,  194, 110, 110, 255   ); //Pink Stained Clay
+	SETCOLOR(192,   97,  82,  75, 255   ); //Gray Stained Clay
+	SETCOLOR(193,  168, 138, 128, 255   ); //Light Gray Stained Clay
+	SETCOLOR(194,  119, 122, 122, 255   ); //Cyan Stained Clay
+	SETCOLOR(195,  152, 102, 117, 255   ); //Purple Stained Clay
+	SETCOLOR(196,  103,  88, 120, 255   ); //Blue Stained Clay
+	SETCOLOR(197,  109,  82,  66, 255   ); //Brown Stained Clay
+	SETCOLOR(198,  105, 112,  70, 255   ); //Green Stained Clay
+	SETCOLOR(199,  176,  93,  78, 255   ); //Red Stained Clay
+	SETCOLOR(200,   67,  52,  46, 255   ); //Black Stained Clay
 
-	SETCOLOR(153,  254, 167,  54,  255   ); //Red Sand
+	SETCOLOR(153,  225, 140,  73, 255   ); //Red Sand
 
 	// glass
 	SETCOLOR(95 , 255, 255,  255,  100  ); //White Stained Glass
 	SETCOLOR(160, 255, 255,  255,  100  ); //White Stained Glass pane
-	SETCOLOR(207,  244, 137,  54,  40   ); //Orange Stained Glass [pane]
+	SETCOLOR(234,  244, 137,  54,  40   ); //Orange Stained Glass [pane]
 	SETCOLOR(225,  200,  75, 210,  40   ); //Magenta Stained Glass [pane]
 	SETCOLOR(255,  120, 158, 241,  40   ); //Light Blue Stained Glass [pane]
 	SETCOLOR(166,  204, 200,  28,  40   ); //Yellow Stained Glass [pane]
@@ -265,7 +301,7 @@ void loadColors()
 	// flowers
 	SETCOLOR(165, 120, 158, 241, 254   ); //BLUE_ORCHID 165
 	SETCOLOR(176, 200,  75, 210, 254 ); //ALLIUM 176
-	SETCOLOR(206, 168, 172, 172, 254 ); //AZURE_BLUET 206
+	SETCOLOR(235, 168, 172, 172, 254 ); //AZURE_BLUET 235
 	// 38, 173  44  40 254, ); //RED_TULIP 38
 	SETCOLOR(217, 244, 137,  54, 254 ); //ORANGE_TULIP 217
 	SETCOLOR(218, 255, 255, 255, 254 ); //WHITE_TULIP 218

diff --git a/colors.h b/colors.h
@@ -76,20 +76,41 @@ bool loadBiomeColors(const char* path);
 #define NETHER_BRICK_FENCE 113
 #define NETHER_BRICK_STAIRS 114
 #define NETHER_WART 115
+#define WOODEN_DOUBLE_STEP 125
+#define WOODEN_STEP 126
+#define COCOA_PLANT 127
+#define TRIPWIRE_HOOK 131
+#define TRIPWIRE 132
 
-#define SANDSTEP 232
-#define WOODSTEP 233
-#define COBBLESTEP 234
-#define BRICKSTEP 235
-#define STONEBRICKSTEP 236
+#define SANDSTEP 201
+#define WOODSTEP 202
+#define COBBLESTEP 203
+#define BRICKSTEP 204
+#define STONEBRICKSTEP 205
+
+#define UP_STEP 208
+#define UP_SANDSTEP 209
+#define UP_WOODSTEP 210
+#define UP_COBBLESTEP 211
+#define UP_BRICKSTEP 212
+#define UP_STONEBRICKSTEP 213
+
+#define PINESTEP 214
+#define BIRCHSTEP 215
+#define JUNGLESTEP 216
+
+#define UP_WOODSTEP2 221
+#define UP_PINESTEP 222
+#define UP_BIRCHSTEP 223
+#define UP_JUNGLESTEP 224
 
 #define PINELEAVES 229
 #define BIRCHLEAVES 230
 #define JUNGLELEAVES 231
 
 #define BLUE_ORCHID 165
 #define ALLIUM 176
-#define AZURE_BLUET 206
+#define AZURE_BLUET 235
 #define RED_TULIP 38
 #define ORANGE_TULIP 217
 #define WHITE_TULIP 218

diff --git a/colors.txt b/colors.txt
@@ -0,0 +1,98 @@
+# various
+133	  61	 255	  61	 255 	 0	# emerald
+137	 203	 163	 136	 255	 0	# command block
+138	  21	 255	 255	 255	 0	# beacon
+139	 128	 128	 128	 255	 16	# cobblestone wall
+145	 110	 110	 110	 255	 0	# anvil
+146	 125	  91	  38	 255	 0	# trapped chest
+151	 187	 158	 109	 255	 0	# daylight sensor
+152	 227	  38	  12	 255	 0	# redstone block
+154	 110	 110	 110	 255	 0	# hopper
+155	 240	 238	 232	 255	 0	# quartz
+156	 240	 238	 232	 255	 0	# quartz stairs
+207	 240	 238	 232	 255	 0	# quartz slab
+161	  54	 135	  40	 180	 0	# leaves Acacia/Dark Oak
+162	  72	  72	  72	 255	 0	# log Acacia/Dark Oak
+163	 154	 110	  77	 255	 2	# Acacia Wood Stairs
+164	 106	 127	  98	 255	 11	# Dark Oak Wood Stairs
+170	 172	 145	  18	 255	 0	# haystack
+171	 224	 224	 224	 255	 0	# white carpet
+172	 184	 126	 99	 255	 0	# hardened clay
+173	  21	  21	  21	 255	 0	# coal block
+174	 159	 189	 239	 255 	 0	# packed ice
+175	   0	 255	   0	 254	 0	# Large flower
+206	  54	  24	  30	 255 	 0	# nether bricks slab
+
+# carpets
+36   255 255 255  254   0	# White carpet
+68   244 137  54  254   0	# Orange carpet
+69   200  75 210  254   0	# Magenta carpet
+70   120 158 241  254   0	# Light Blue carpet
+72   204 200  28  254   0	# Yellow carpet
+77    59 210  47  254   0	# Lime carpet
+131  237 141 164  254   0	# Pink carpet
+132   76  76  76  254   0	# Gray carpet
+141  168 172 172  254   0	# Light Gray
+142   39 116 149  254   0	# Cyan carpet
+143  133  53 195  254   0	# Purple carpet
+147   38  51 160  254   0	# Blue carpet
+148   85  51  27  254   0	# Brown carpet
+149   55  77  24  254   0	# Green carpet
+150  173  44  40  254   0	# Red carpet
+158   32  27  27  254   0	# Black carpet
+
+# clays
+159  241  210  192  255   0 	# White Stained Clay
+
+186  194  116   69  255   0 	# Orange Stained Clay
+187  182  120  140  255   0 	# Magenta Stained Clay
+188  141  137  167  255   0 	# Light Blue Stained Clay
+189  219  165   66  255   0 	# Yellow Stained Clay
+190  137  149   84  255   0 	# Lime Stained Clay
+191  194  110  110  255   0 	# Pink Stained Clay
+192   97   82   75  255   0 	# Gray Stained Clay
+193  168  138  128  255   0 	# Light Gray Stained Clay
+194  119  122  122  255   0 	# Cyan Stained Clay
+195  152  102  117  255   0 	# Purple Stained Clay
+196  103   88  120  255   0 	# Blue Stained Clay
+197  109   82   66  255   0 	# Brown Stained Clay
+198  105  112   70  255   0 	# Green Stained Clay
+199  176   93   78  255   0 	# Red Stained Clay
+200   67   52   46  255   0 	# Black Stained Clay
+
+153  225  140   73  255   0 	# Red Sand
+
+# glass
+95  255 255  255  100  0	# White Stained Glass
+160 255 255  255  100  0	# White Stained Glass pane
+234  244 137  54  40   0	# Orange Stained Glass [pane]
+225  200  75 210  40   0	# Magenta Stained Glass [pane]
+255  120 158 241  40   0	# Light Blue Stained Glass [pane]
+166  204 200  28  40   0	# Yellow Stained Glass [pane]
+167   59 210  47  40   0	# Lime Stained Glass [pane]
+168  237 141 164  40   0	# Pink Stained Glass [pane]
+169   76  76  76  40   0	# Gray Stained Glass [pane]
+178  168 172 172  40   0	# Light Gray Stained Glass [pane]
+179   39 116 149  40   0	# Cyan Stained Glass [pane]
+180  133  53 195  40   0	# Purple Stained Glass [pane]
+181   38  51 160  40   0	# Blue Stained Glass [pane]
+182   85  51  27  40   0	# Brown Stained Glass [pane]
+183   55  77  24  40   0	# Green Stained Glass [pane]
+184  173  44  40  40   0	# Red Stained Glass [pane]
+185   32  27  27  40   0	# Black Stained Glass [pane]
+
+# flowers
+165	 120 158 241 254	 0	# BLUE_ORCHID 165
+176	 200  75 210 254	 0	# ALLIUM 176
+235	 168 172 172 254	 0	# AZURE_BLUET 235
+# 38	 173  44  40 254	 0	# RED_TULIP 38
+217	 244 137  54 254	 0	# ORANGE_TULIP 217
+218	 255 255 255 254	 0	# WHITE_TULIP 218
+219	 237 141 164 254	 0	# PINK_TULIP 219
+220	 168 172 172 254	 0	# OXEYE_DAISY 220
+# 37	 255 255  0  254	 0	# SUNFLOWER 37
+233	 200  75 210 254	 0	# LILAC 233
+177	 237 141 164 254	 0	# PEONY 177
+
+# nether
+238  206 206 201  255   5	# Birch Wood / quartz slab (sic!)