LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Implement smooth sandstone stairs

Browse Source
This commit is contained in:
Nicolas F
2019-08-06 14:25:16 +02:00
parent 9193b66cdd
commit 3b96158fb4
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overviewer_core/src/block_class.c
View File

@@ -77,7 +77,9 @@ const mc_block_t block_class_stair[] = {
block_dark_prismarine_stairs, block_dark_prismarine_stairs,
block_prismarine_brick_stairs, block_prismarine_brick_stairs,
block_mossy_cobblestone_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 size_t block_class_stair_len = COUNT_OF(block_class_stair);
const mc_block_t block_class_door[] = { const mc_block_t block_class_door[] = {
@@ -136,6 +138,7 @@ const mc_block_t block_class_ancil[] = {
block_prismarine_brick_stairs, block_prismarine_brick_stairs,
block_mossy_cobblestone_stairs, block_mossy_cobblestone_stairs,
block_mossy_stone_brick_stairs, block_mossy_stone_brick_stairs,
block_smooth_sandstone_stairs,
block_grass, block_grass,
block_flowing_water, block_flowing_water,
block_water, block_water,
@@ -182,6 +185,7 @@ const mc_block_t block_class_alt_height[] = {
block_prismarine_brick_stairs, block_prismarine_brick_stairs,
block_mossy_cobblestone_stairs, block_mossy_cobblestone_stairs,
block_mossy_stone_brick_stairs, block_mossy_stone_brick_stairs,
block_smooth_sandstone_stairs,
block_prismarine_slab, block_prismarine_slab,
block_dark_prismarine_slab, block_dark_prismarine_slab,
block_prismarine_brick_slab, block_prismarine_brick_slab,

1
overviewer_core/src/mc_id.h
View File

@@ -294,6 +294,7 @@ enum mc_block_id {
block_mossy_cobblestone_stairs = 11371, block_mossy_cobblestone_stairs = 11371,
block_mossy_stone_brick_wall = 11372, block_mossy_stone_brick_wall = 11372,
block_lantern = 11373, block_lantern = 11373,
block_smooth_sandstone_stairs = 11374,
}; };
typedef uint16_t mc_block_t; typedef uint16_t mc_block_t;

2
overviewer_core/src/overviewer.h
View File

@@ -31,7 +31,7 @@
// increment this value if you've made a change to the c extesion // increment this value if you've made a change to the c extesion
// and want to force users to rebuild // and want to force users to rebuild
#define OVERVIEWER_EXTENSION_VERSION 71 #define OVERVIEWER_EXTENSION_VERSION 72
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>

3
overviewer_core/textures.py
View File

@@ -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. # 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, @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): def stairs(self, blockid, data):
# preserve the upside-down bit # preserve the upside-down bit
upside_down = data & 0x4 upside_down = data & 0x4
@@ -1982,6 +1982,7 @@ def stairs(self, blockid, data):
11339: "assets/minecraft/textures/block/prismarine_bricks.png", 11339: "assets/minecraft/textures/block/prismarine_bricks.png",
11370: "assets/minecraft/textures/block/mossy_stone_bricks.png", 11370: "assets/minecraft/textures/block/mossy_stone_bricks.png",
11371: "assets/minecraft/textures/block/mossy_cobblestone.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() texture = self.load_image_texture(stair_id_to_tex[blockid]).copy()

1
overviewer_core/world.py
View File

@@ -809,6 +809,7 @@ class RegionSet(object):
"minecraft:mossy_cobblestone_stairs": (11371, 0), "minecraft:mossy_cobblestone_stairs": (11371, 0),
"minecraft:mossy_stone_brick_wall": (11372, 0), "minecraft:mossy_stone_brick_wall": (11372, 0),
"minecraft:lantern": (11373, 0), "minecraft:lantern": (11373, 0),
"minecraft:smooth_sandstone_stairs": (11374, 0),
} }
colors = [ 'white', 'orange', 'magenta', 'light_blue', colors = [ 'white', 'orange', 'magenta', 'light_blue',