LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

add quartz_bricks, remove duplicates

Browse Source
This commit is contained in:
InrcedibleHolg
2020-10-04 09:08:36 +02:00
parent d23fdb13f1
commit 6b2be1635d
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/block_class.c
View File

@@ -147,7 +147,6 @@ const mc_block_t block_class_ancil[] = {
block_jungle_door, block_jungle_door,
block_acacia_door, block_acacia_door,
block_dark_oak_door, block_dark_oak_door,
block_dark_oak_door,
block_crimson_door, block_crimson_door,
block_oak_stairs, block_oak_stairs,
block_brick_stairs, block_brick_stairs,
@@ -240,7 +239,6 @@ const mc_block_t block_class_alt_height[] = {
block_birch_stairs, block_birch_stairs,
block_jungle_stairs, block_jungle_stairs,
block_quartz_stairs, block_quartz_stairs,
block_quartz_stairs,
block_acacia_stairs, block_acacia_stairs,
block_dark_oak_stairs, block_dark_oak_stairs,
block_crimson_stairs, block_crimson_stairs,

1
overviewer_core/src/mc_id.h
View File

@@ -295,6 +295,7 @@ enum mc_block_id {
block_gilded_blackstone = 1024, block_gilded_blackstone = 1024,
block_cracked_polished_blackstone_bricks = 1025, block_cracked_polished_blackstone_bricks = 1025,
block_polished_blackstone_bricks = 1026, block_polished_blackstone_bricks = 1026,
block_quartz_bricks = 1041,
// Nether stone stairs // Nether stone stairs
block_blackstone_stairs = 1030, block_blackstone_stairs = 1030,
block_polished_blackstone_stairs = 1031, block_polished_blackstone_stairs = 1031,

2
overviewer_core/src/overviewer.h
View File

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

1
overviewer_core/textures.py
View File

@@ -5772,3 +5772,4 @@ block(blockid=1026, top_image="assets/minecraft/textures/block/polished_blacksto
block(blockid=1035, top_image="assets/minecraft/textures/block/crying_obsidian.png") block(blockid=1035, top_image="assets/minecraft/textures/block/crying_obsidian.png")
block(blockid=1036, top_image="assets/minecraft/textures/block/lodestone_top.png", side_image="assets/minecraft/textures/block/lodestone_side.png") block(blockid=1036, top_image="assets/minecraft/textures/block/lodestone_top.png", side_image="assets/minecraft/textures/block/lodestone_side.png")
block(blockid=1037, top_image="assets/minecraft/textures/block/respawn_anchor_top.png", side_image="assets/minecraft/textures/block/respawn_anchor_side1.png") block(blockid=1037, top_image="assets/minecraft/textures/block/respawn_anchor_top.png", side_image="assets/minecraft/textures/block/respawn_anchor_side1.png")
block(blockid=1041, top_image="assets/minecraft/textures/block/quartz_bricks.png")

2
overviewer_core/world.py
View File

@@ -763,6 +763,8 @@ class RegionSet(object):
'minecraft:soul_wall_torch': (1039, 0), 'minecraft:soul_wall_torch': (1039, 0),
'minecraft:soul_torch': (1039, 5), 'minecraft:soul_torch': (1039, 5),
'minecraft:soul_fire': (1040, 0), 'minecraft:soul_fire': (1040, 0),
# quartz bricks
'minecraft:quartz_bricks': (1041, 0),
# New blocks # New blocks
'minecraft:carved_pumpkin': (11300, 0), 'minecraft:carved_pumpkin': (11300, 0),