Skip to content

Commit 86c67ff

Browse files
committed
Compatible with Minecraft 1.9
2.4.4 (may 24 2016) - Minecraft 1.9.X compatible added: 1.9 blocks: -grass path, purpur blocks, chorus plant and fruit -beetroots, end bricks, frosted ice and new command blocks 1.10 (16w20a): new blocks render as similar old blocks (magma as lava etc.) fixed: -banners rendered as flowers -acacia and dark oak stairs colors
1 parent 3b43cd6 commit 86c67ff

File tree

5 files changed

+42
-6
lines changed

5 files changed

+42
-6
lines changed

changelog.txt

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ mcmap changelog
22
Latest version is available at: http://wrim.pl/mcmap/
33
------------------------------------------------------
44

5+
2.4.4 (may 24 2016) - Minecraft 1.9.X compatible
6+
added:
7+
1.9 blocks:
8+
-grass path, purpur blocks, chorus plant and fruit
9+
-beetroots, end bricks, frosted ice and new command blocks
10+
1.10 (16w20a): new blocks render as similar old blocks (magma as lava etc.)
11+
fixed:
12+
-banners rendered as flowers
13+
-acacia and dark oak stairs colors
14+
515
2.4.3 (jul 26 2015) - Minecraft 1.8.X compatible
616
added:
717
-color for sponge

colors.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ void loadColors()
230230
//SETCOLOR(159, 209, 177, 160, 255 ); //white stained clay !
231231
SETCOLOR(161, 54, 135, 40, 180 ); //leaves Acacia/Dark Oak
232232
SETCOLOR(162, 72, 72, 72, 255 ); //log Acacia/Dark Oak
233-
SETCOLORNOISE(163, 154, 110, 77, 255, 2); // Acacia Wood Stairs
234-
SETCOLORNOISE(164, 106, 127, 98, 255, 11); // Dark Oak Wood Stairs
233+
SETCOLOR(163, 156, 127, 78, 255); // Acacia Wood Stairs
234+
SETCOLOR(164, 156, 127, 78, 255); // Dark Oak Wood Stairs
235235
SETCOLOR(170, 172, 145, 18, 255 ); //haystack
236236
SETCOLOR(171, 224, 224, 224, 255 ); //white carpet
237237
SETCOLOR(172, 184, 126, 99, 255 ); //hardened clay
@@ -248,6 +248,8 @@ void loadColors()
248248
SETCOLOR(140, 208, 128, 128, 255 ); //granite
249249
SETCOLOR(144, 228, 228, 228, 255 ); //diorite
250250
SETCOLOR(157, 160, 160, 160, 255 ); //andesite
251+
SETCOLOR(208, 176, 181, 0, 255 ); //grass path
252+
SETCOLOR(209, 155, 63, 176, 255 ); //purpur blocks
251253

252254
// carpets
253255
SETCOLOR(36 , 255, 255, 255, 254 ); //White carpet

colors.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ID R G B A Noise
12
# various
23
133 61 255 61 255 0 # emerald
34
137 203 163 136 255 0 # command block
@@ -13,8 +14,8 @@
1314
207 240 238 232 255 0 # quartz slab
1415
161 54 135 40 180 0 # leaves Acacia/Dark Oak
1516
162 72 72 72 255 0 # log Acacia/Dark Oak
16-
163 154 110 77 255 2 # Acacia Wood Stairs
17-
164 106 127 98 255 11 # Dark Oak Wood Stairs
17+
163 156 127 78 255 0 # Acacia Wood Stairs
18+
164 156 127 78 255 0 # Dark Oak Wood Stairs
1819
170 172 145 18 255 0 # haystack
1920
171 224 224 224 255 0 # white carpet
2021
172 184 126 99 255 0 # hardened clay
@@ -105,3 +106,6 @@
105106
144 228 228 228 255 0 # diorite
106107
157 160 160 160 255 0 # andesite
107108

109+
# 1.9
110+
208 176 181 0 255 0 # grass path
111+
209 155 63 176 255 0 # purpur blocks / stair / slab

globals.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _GLOBALS_H_
22
#define _GLOBALS_H_
33

4-
#define VERSION "2.4.3 (compatible with Minecraft 1.8.X)"
4+
#define VERSION "2.4.4 (compatible with Minecraft 1.9.X)"
55

66
#include <stdint.h>
77
#include <cstdlib>

worldloader.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
10351035
|| (g_NoWater && (block == WATER || block == STAT_WATER)) || (block >= 176 && block <= 197) || (block >= 166 && block <= 169) || block == STONE
10361036
|| block == 141 || block == 142 || block == 158 || block == 149 || block == 157 || block == 140 || block == 144
10371037
|| block == 131 || block == 132 || block == 150 || block == 147 || block == 148 || block == 68 || block == 69 || block == 70
1038+
|| (block >= 198 && block <= 217) || block == 176 || block == 177
10381039
|| block == 72 || block == 77 || block == 143 || block == 36) { //three last lines contains colors for carpets
10391040
uint8_t col;
10401041
if (g_WorldFormat == 2) {
@@ -1044,6 +1045,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
10441045
}
10451046
if (block == 131 || block == 132 || block == 150 || block == 147 || block == 148 || block == 68 || block == 69 || block == 70
10461047
|| block == 72 || block == 77 || block == 143 || block == 36 || block == 166 || block == 140 || block == 144
1048+
|| block == 176 || block == 177 || block == 209 || block == 217 || block == 198
10471049
|| block == WATER || block == STAT_WATER) { //not visible blocks replaced to air, therefore we have few ID's more
10481050
*targetBlock++ = 0;
10491051
} else if (block == STONE) {
@@ -1249,7 +1251,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
12491251
} else {
12501252
*targetBlock++ = block;
12511253
}
1252-
} else if (block == 141 || block == 142) { //carrots and potatoes -> wheat
1254+
} else if (block == 141 || block == 142 || block == 207) { //carrots, potatoes and beetroots -> wheat
12531255
*targetBlock++ = 59;
12541256
} else if (block == 158) { //dropper -> dispenser
12551257
*targetBlock++ = 23;
@@ -1275,6 +1277,24 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
12751277
*targetBlock++ = 85;
12761278
} else if (block >= 183 && block <= 187) { //fence gates 1.8+
12771279
*targetBlock++ = 107;
1280+
} else if (block == 199 || block == 200) { //chorus plant/fruit -> nether fences
1281+
*targetBlock++ = 113;
1282+
} else if (block >= 201 && block <= 205) { //purpur blocks
1283+
*targetBlock++ = 209;
1284+
} else if (block == 206) { //end bricks -> end stone
1285+
*targetBlock++ = 121;
1286+
} else if (block == 210 || block == 211) { //1.9 command blocks -> old command block
1287+
*targetBlock++ = 137;
1288+
} else if (block == 212) { //frosted ice -> regular ice
1289+
*targetBlock++ = 79;
1290+
} else if (block == 213) { //magma -> lava
1291+
*targetBlock++ = STAT_LAVA;
1292+
} else if (block == 214) { //nether wart block -> sould sand
1293+
*targetBlock++ = 88;
1294+
} else if (block == 215) { //red nether brick -> nether brick
1295+
*targetBlock++ = 112;
1296+
} else if (block == 216) { //bone block -> snow
1297+
*targetBlock++ = 80;
12781298
} else *targetBlock++ = block;
12791299
} else {
12801300
*targetBlock++ = block;

0 commit comments

Comments
 (0)