LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge PR #1943 from buscher

Browse Source
This commit is contained in:
Nicolas F
2021-06-10 19:34:11 +02:00
parent 6097461494 b37f8b4a53
commit ea4b543e74
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
overviewer_core/src/block_class.c
View File

@@ -226,9 +226,6 @@ const mc_block_t block_class_ancil[] = {
block_blackstone_wall, block_blackstone_wall,
block_polished_blackstone_wall, block_polished_blackstone_wall,
block_polished_blackstone_brick_wall, block_polished_blackstone_brick_wall,
block_crying_obsidian,
block_lodestone,
block_respawn_anchor,
block_double_plant, block_double_plant,
block_stained_glass, block_stained_glass,
block_spruce_fence, block_spruce_fence,

12
overviewer_core/textures.py
View File

@@ -5914,6 +5914,17 @@ def chain(self, blockid, data):
return img return img
# Respawn anchor
@material(blockid=1037, data=list(range(5)), solid=True)
def respawn_anchor(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/respawn_anchor_top_off.png" if data ==
0 else "assets/minecraft/textures/block/respawn_anchor_top.png")
side = self.load_image_texture(
"assets/minecraft/textures/block/respawn_anchor_side%s.png" % (data))
return self.build_block(top, side)
# Netherite # Netherite
block(blockid=[1005], top_image="assets/minecraft/textures/block/netherite_block.png") block(blockid=[1005], top_image="assets/minecraft/textures/block/netherite_block.png")
# soul soil # soul soil
@@ -5929,7 +5940,6 @@ 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=1041, top_image="assets/minecraft/textures/block/quartz_bricks.png") block(blockid=1041, top_image="assets/minecraft/textures/block/quartz_bricks.png")
block(blockid=1042, top_image="assets/minecraft/textures/block/amethyst_block.png") block(blockid=1042, top_image="assets/minecraft/textures/block/amethyst_block.png")

2
overviewer_core/world.py
View File

@@ -1262,6 +1262,8 @@ class RegionSet(object):
data |= {'south': 0, 'west': 1, 'north': 2, 'east': 3}[facing] data |= {'south': 0, 'west': 1, 'north': 2, 'east': 3}[facing]
if palette_entry['Properties'].get('eye', 'false') == 'true': if palette_entry['Properties'].get('eye', 'false') == 'true':
data |= 4 data |= 4
elif key == 'minecraft:respawn_anchor':
data = int(palette_entry['Properties']['charges'])
elif key == 'minecraft:cauldron': elif key == 'minecraft:cauldron':
data = int(palette_entry['Properties'].get('level', '0')) data = int(palette_entry['Properties'].get('level', '0'))
elif key == 'minecraft:structure_block': elif key == 'minecraft:structure_block':