diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index e0c4a46..880c021 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -26,7 +26,7 @@ // increment this value if you've made a change to the c extesion // and want to force users to rebuild -#define OVERVIEWER_EXTENSION_VERSION 44 +#define OVERVIEWER_EXTENSION_VERSION 45 /* Python PIL, and numpy headers */ #include diff --git a/overviewer_core/src/primitives/base.c b/overviewer_core/src/primitives/base.c index dd24450..99a5e67 100644 --- a/overviewer_core/src/primitives/base.c +++ b/overviewer_core/src/primitives/base.c @@ -97,7 +97,7 @@ base_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObjec /* water */ state->block == 8 || state->block == 9 || /* leaves */ - state->block == 18 || + state->block == 18 || state->block == 161 || /* tallgrass, but not dead shrubs */ (state->block == 31 && state->block_data != 0) || /* pumpkin/melon stem, not fully grown. Fully grown stems @@ -134,6 +134,7 @@ base_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObjec color_table = self->watercolor; break; case 18: + case 161: /* leaves */ color_table = self->foliagecolor; if (state->block_data == 2) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 81f92cc..8702bc2 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1029,18 +1029,22 @@ def wood(self, blockid, data): elif wood_orientation == 8: # north-south orientation return self.build_full_block(side, None, None, side.rotate(270), top) -@material(blockid=18, data=range(16), transparent=True, solid=True) +@material(blockid=[18, 161], data=range(16), transparent=True, solid=True) def leaves(self, blockid, data): # mask out the bits 4 and 8 # they are used for player placed and check-for-decay blocks data = data & 0x3 t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_oak.png") - if data == 1: - # pine! + if (blockid, data) == (18, 1): # pine! t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_spruce.png") - elif data == 3: - # jungle tree + elif (blockid, data) == (18, 2): # birth tree + t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_birch.png") + elif (blockid, data) == (18, 3): # jungle tree t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_jungle.png") + elif (blockid, data) == (161, 4): # acacia tree + t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_acacia.png") + elif (blockid, data) == (161, 5): + t = self.load_image_texture("assets/minecraft/textures/blocks/leaves_big_oak.png") return self.build_block(t, t) # sponge