LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Stripped logs

Browse Source
This commit is contained in:
James Miller
2018-12-15 00:14:28 -08:00
parent 446916540a
commit be80775bf2
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
overviewer_core/textures.py
View File

@@ -1077,7 +1077,7 @@ block(blockid=15, top_image="assets/minecraft/textures/block/iron_ore.png")
# coal ore # coal ore
block(blockid=16, top_image="assets/minecraft/textures/block/coal_ore.png") block(blockid=16, top_image="assets/minecraft/textures/block/coal_ore.png")
@material(blockid=[17,162], data=range(12), solid=True) @material(blockid=[17,162,11306,11307], data=range(12), solid=True)
def wood(self, blockid, data): def wood(self, blockid, data):
# extract orientation and wood type frorm data bits # extract orientation and wood type frorm data bits
wood_type = data & 3 wood_type = data & 3
@@ -1113,6 +1113,29 @@ def wood(self, blockid, data):
else: else:
top = self.load_image_texture("assets/minecraft/textures/block/acacia_log_top.png") top = self.load_image_texture("assets/minecraft/textures/block/acacia_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/acacia_log.png") side = self.load_image_texture("assets/minecraft/textures/block/acacia_log.png")
if blockid == 11306: # stripped regular wood:
if wood_type == 0: # normal
top = self.load_image_texture("assets/minecraft/textures/block/stripped_oak_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_oak_log.png")
if wood_type == 1: # spruce
top = self.load_image_texture("assets/minecraft/textures/block/stripped_spruce_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_spruce_log.png")
if wood_type == 2: # birch
top = self.load_image_texture("assets/minecraft/textures/block/stripped_birch_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_birch_log.png")
if wood_type == 3: # jungle wood
top = self.load_image_texture("assets/minecraft/textures/block/stripped_jungle_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_jungle_log.png")
elif blockid == 11307: # stripped acacia/dark wood:
if wood_type == 0: # acacia
top = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log.png")
elif wood_type == 1: # dark oak
top = self.load_image_texture("assets/minecraft/textures/block/stripped_dark_oak_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_dark_oak_log.png")
else:
top = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log_top.png")
side = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log.png")
# choose orientation and paste textures # choose orientation and paste textures
if wood_orientation == 0: if wood_orientation == 0:

7
overviewer_core/world.py
View File

@@ -587,7 +587,6 @@ class RegionSet(object):
'minecraft:green_terracotta': (159, 13), 'minecraft:green_terracotta': (159, 13),
'minecraft:red_terracotta': (159, 14), 'minecraft:red_terracotta': (159, 14),
'minecraft:black_terracotta': (159, 15), 'minecraft:black_terracotta': (159, 15),
# What to do about stripped logs?
'minecraft:acacia_log': (162, 0), 'minecraft:acacia_log': (162, 0),
'minecraft:dark_oak_log': (162, 1), 'minecraft:dark_oak_log': (162, 1),
'minecraft:acacia_stairs': (163, 0), 'minecraft:acacia_stairs': (163, 0),
@@ -736,6 +735,12 @@ class RegionSet(object):
'minecraft:jungle_pressure_plate': (11303, 0), 'minecraft:jungle_pressure_plate': (11303, 0),
'minecraft:acacia_pressure_plate': (11304, 0), 'minecraft:acacia_pressure_plate': (11304, 0),
'minecraft:dark_oak_pressure_plate': (11305, 0), 'minecraft:dark_oak_pressure_plate': (11305, 0),
'minecraft:stripped_oak_log': (11306, 0),
'minecraft:stripped_spruce_log': (11306, 1),
'minecraft:stripped_birch_log': (11306, 2),
'minecraft:stripped_jungle_log': (11306, 3),
'minecraft:stripped_acacia_log': (11307, 0),
'minecraft:stripped_dark_oak_log': (11307, 1),
} }
colors = [ 'white', 'orange', 'magenta', 'light_blue', colors = [ 'white', 'orange', 'magenta', 'light_blue',