Skip to content

Commit

Permalink
Compatible with Minecraft 1.9
Browse files Browse the repository at this point in the history
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
  • Loading branch information
WRIM committed May 24, 2016
1 parent 3b43cd6 commit 86c67ff
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 6 deletions.
10 changes: 10 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@ mcmap changelog
Latest version is available at: http://wrim.pl/mcmap/
------------------------------------------------------

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

2.4.3 (jul 26 2015) - Minecraft 1.8.X compatible
added:
-color for sponge
Expand Down
6 changes: 4 additions & 2 deletions colors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ void loadColors()
//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(163, 156, 127, 78, 255); // Acacia Wood Stairs
SETCOLOR(164, 156, 127, 78, 255); // Dark Oak Wood Stairs
SETCOLOR(170, 172, 145, 18, 255 ); //haystack
SETCOLOR(171, 224, 224, 224, 255 ); //white carpet
SETCOLOR(172, 184, 126, 99, 255 ); //hardened clay
Expand All @@ -248,6 +248,8 @@ void loadColors()
SETCOLOR(140, 208, 128, 128, 255 ); //granite
SETCOLOR(144, 228, 228, 228, 255 ); //diorite
SETCOLOR(157, 160, 160, 160, 255 ); //andesite
SETCOLOR(208, 176, 181, 0, 255 ); //grass path
SETCOLOR(209, 155, 63, 176, 255 ); //purpur blocks

// carpets
SETCOLOR(36 , 255, 255, 255, 254 ); //White carpet
Expand Down
8 changes: 6 additions & 2 deletions colors.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# ID R G B A Noise
# various
133 61 255 61 255 0 # emerald
137 203 163 136 255 0 # command block
Expand All @@ -13,8 +14,8 @@
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
163 156 127 78 255 0 # Acacia Wood Stairs
164 156 127 78 255 0 # 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
Expand Down Expand Up @@ -105,3 +106,6 @@
144 228 228 228 255 0 # diorite
157 160 160 160 255 0 # andesite

# 1.9
208 176 181 0 255 0 # grass path
209 155 63 176 255 0 # purpur blocks / stair / slab
2 changes: 1 addition & 1 deletion globals.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _GLOBALS_H_
#define _GLOBALS_H_

#define VERSION "2.4.3 (compatible with Minecraft 1.8.X)"
#define VERSION "2.4.4 (compatible with Minecraft 1.9.X)"

#include <stdint.h>
#include <cstdlib>
Expand Down
22 changes: 21 additions & 1 deletion worldloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
|| (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 >= 198 && block <= 217) || block == 176 || block == 177
|| block == 72 || block == 77 || block == 143 || block == 36) { //three last lines contains colors for carpets
uint8_t col;
if (g_WorldFormat == 2) {
Expand All @@ -1044,6 +1045,7 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
}
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 == 140 || block == 144
|| block == 176 || block == 177 || block == 209 || block == 217 || block == 198
|| block == WATER || block == STAT_WATER) { //not visible blocks replaced to air, therefore we have few ID's more
*targetBlock++ = 0;
} else if (block == STONE) {
Expand Down Expand Up @@ -1249,7 +1251,7 @@ 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
} else if (block == 141 || block == 142 || block == 207) { //carrots, potatoes and beetroots -> wheat
*targetBlock++ = 59;
} else if (block == 158) { //dropper -> dispenser
*targetBlock++ = 23;
Expand All @@ -1275,6 +1277,24 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
*targetBlock++ = 85;
} else if (block >= 183 && block <= 187) { //fence gates 1.8+
*targetBlock++ = 107;
} else if (block == 199 || block == 200) { //chorus plant/fruit -> nether fences
*targetBlock++ = 113;
} else if (block >= 201 && block <= 205) { //purpur blocks
*targetBlock++ = 209;
} else if (block == 206) { //end bricks -> end stone
*targetBlock++ = 121;
} else if (block == 210 || block == 211) { //1.9 command blocks -> old command block
*targetBlock++ = 137;
} else if (block == 212) { //frosted ice -> regular ice
*targetBlock++ = 79;
} else if (block == 213) { //magma -> lava
*targetBlock++ = STAT_LAVA;
} else if (block == 214) { //nether wart block -> sould sand
*targetBlock++ = 88;
} else if (block == 215) { //red nether brick -> nether brick
*targetBlock++ = 112;
} else if (block == 216) { //bone block -> snow
*targetBlock++ = 80;
} else *targetBlock++ = block;
} else {
*targetBlock++ = block;
Expand Down

0 comments on commit 86c67ff

Please sign in to comment.