diff --git a/overviewer_core/src/iterate.c b/overviewer_core/src/iterate.c index fc52b78..0f02393 100644 --- a/overviewer_core/src/iterate.c +++ b/overviewer_core/src/iterate.c @@ -309,7 +309,8 @@ generate_pseudo_data(RenderState *state, unsigned short ancilData) { } data = (check_adjacent_blocks(state, x, y, z, state->block) ^ 0x0f) | data; return (data << 4) | (ancilData & 0x0f); - } else if (state->block == 85) { /* fences */ + } else if ((state->block == 85) || (state->block == 188) || (state->block == 189) || + (state->block == 190) || (state->block == 191) || (state->block == 192)) { /* fences */ /* check for fences AND fence gates */ return check_adjacent_blocks(state, x, y, z, state->block) | check_adjacent_blocks(state, x, y, z, 107); @@ -710,7 +711,9 @@ chunk_render(PyObject *self, PyObject *args) { (state.block == 111) || (state.block == 113) || (state.block == 139) || (state.block == 175) || (state.block == 160) || (state.block == 95) || - (state.block == 146) || + (state.block == 146) || (state.block == 188) || + (state.block == 189) || (state.block == 190) || + (state.block == 191) || (state.block == 192) || is_stairs(state.block)) { ancilData = generate_pseudo_data(&state, ancilData); state.block_pdata = ancilData; diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index ab8a192..55311cc 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -2738,7 +2738,7 @@ def jukebox(self, blockid, data): # nether and normal fences # uses pseudo-ancildata found in iterate.c -@material(blockid=[85, 113], data=range(16), transparent=True, nospawn=True) +@material(blockid=[85, 188, 189, 190, 191, 192, 113], data=range(16), transparent=True, nospawn=True) def fence(self, blockid, data): # no need for rotations, it uses pseudo data. # create needed images for Big stick fence @@ -2746,6 +2746,26 @@ def fence(self, blockid, data): fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png").copy() fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png").copy() fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png").copy() + elif blockid == 188: # spruce fence + fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_spruce.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_spruce.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_spruce.png").copy() + elif blockid == 189: # birch fence + fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png").copy() + elif blockid == 190: # jungle fence + fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png").copy() + elif blockid == 191: # big/dark oak fence + fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png").copy() + elif blockid == 192: # acacia oak fence + fence_top = self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png").copy() else: # netherbrick fence fence_top = self.load_image_texture("assets/minecraft/textures/blocks/nether_brick.png").copy() fence_side = self.load_image_texture("assets/minecraft/textures/blocks/nether_brick.png").copy()