From 3b96158fb46c939a6bdb6ebbe6534e0b7e1aa237 Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Tue, 6 Aug 2019 14:25:16 +0200 Subject: [PATCH] Implement smooth sandstone stairs --- overviewer_core/src/block_class.c | 6 +++++- overviewer_core/src/mc_id.h | 1 + overviewer_core/src/overviewer.h | 2 +- overviewer_core/textures.py | 3 ++- overviewer_core/world.py | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/overviewer_core/src/block_class.c b/overviewer_core/src/block_class.c index 8b5db73..9dc6654 100644 --- a/overviewer_core/src/block_class.c +++ b/overviewer_core/src/block_class.c @@ -77,7 +77,9 @@ const mc_block_t block_class_stair[] = { block_dark_prismarine_stairs, block_prismarine_brick_stairs, block_mossy_cobblestone_stairs, - block_mossy_stone_brick_stairs}; + block_mossy_stone_brick_stairs, + block_smooth_sandstone_stairs, +}; const size_t block_class_stair_len = COUNT_OF(block_class_stair); const mc_block_t block_class_door[] = { @@ -136,6 +138,7 @@ const mc_block_t block_class_ancil[] = { block_prismarine_brick_stairs, block_mossy_cobblestone_stairs, block_mossy_stone_brick_stairs, + block_smooth_sandstone_stairs, block_grass, block_flowing_water, block_water, @@ -182,6 +185,7 @@ const mc_block_t block_class_alt_height[] = { block_prismarine_brick_stairs, block_mossy_cobblestone_stairs, block_mossy_stone_brick_stairs, + block_smooth_sandstone_stairs, block_prismarine_slab, block_dark_prismarine_slab, block_prismarine_brick_slab, diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index 344a087..8b8329c 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -294,6 +294,7 @@ enum mc_block_id { block_mossy_cobblestone_stairs = 11371, block_mossy_stone_brick_wall = 11372, block_lantern = 11373, + block_smooth_sandstone_stairs = 11374, }; typedef uint16_t mc_block_t; diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index fffcfc5..4a0a7dc 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -31,7 +31,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 71 +#define OVERVIEWER_EXTENSION_VERSION 72 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 17ac9ca..4ae2d5b 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1949,7 +1949,7 @@ block(blockid=52, top_image="assets/minecraft/textures/block/spawner.png", trans # wooden, cobblestone, red brick, stone brick, netherbrick, sandstone, spruce, birch, jungle, quartz, red sandstone, (dark) prismarine, mossy brick and mossy cobblestone stairs. @material(blockid=[53,67,108,109,114,128,134,135,136,156,163,164,180,203,11337,11338,11339, - 11370, 11371], data=list(range(128)), transparent=True, solid=True, nospawn=True) + 11370, 11371, 11374], data=list(range(128)), transparent=True, solid=True, nospawn=True) def stairs(self, blockid, data): # preserve the upside-down bit upside_down = data & 0x4 @@ -1982,6 +1982,7 @@ def stairs(self, blockid, data): 11339: "assets/minecraft/textures/block/prismarine_bricks.png", 11370: "assets/minecraft/textures/block/mossy_stone_bricks.png", 11371: "assets/minecraft/textures/block/mossy_cobblestone.png", + 11374: "assets/minecraft/textures/block/sandstone_top.png", } texture = self.load_image_texture(stair_id_to_tex[blockid]).copy() diff --git a/overviewer_core/world.py b/overviewer_core/world.py index e5c39c9..c57e699 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -809,6 +809,7 @@ class RegionSet(object): "minecraft:mossy_cobblestone_stairs": (11371, 0), "minecraft:mossy_stone_brick_wall": (11372, 0), "minecraft:lantern": (11373, 0), + "minecraft:smooth_sandstone_stairs": (11374, 0), } colors = [ 'white', 'orange', 'magenta', 'light_blue',