LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fix redstone dust for Minecraft 1.9

Browse Source 
This breaks compatibily with Minecraft 1.8

See #1280
This commit is contained in:
Andrew Chin
2016-03-01 20:46:02 -05:00
parent 525d19318f
commit 68955c7b93
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
overviewer_core/textures.py
View File

@@ -2063,18 +2063,18 @@ def chests(self, blockid, data):
def wire(self, blockid, data): def wire(self, blockid, data):
if data & 0b1000000 == 64: # powered redstone wire if data & 0b1000000 == 64: # powered redstone wire
redstone_wire_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_line.png") redstone_wire_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_line0.png").rotate(90)
redstone_wire_t = self.tint_texture(redstone_wire_t,(255,0,0)) redstone_wire_t = self.tint_texture(redstone_wire_t,(255,0,0))
redstone_cross_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_cross.png") redstone_cross_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_dot.png")
redstone_cross_t = self.tint_texture(redstone_cross_t,(255,0,0)) redstone_cross_t = self.tint_texture(redstone_cross_t,(255,0,0))
else: # unpowered redstone wire else: # unpowered redstone wire
redstone_wire_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_line.png") redstone_wire_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_line0.png").rotate(90)
redstone_wire_t = self.tint_texture(redstone_wire_t,(48,0,0)) redstone_wire_t = self.tint_texture(redstone_wire_t,(48,0,0))
redstone_cross_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_cross.png") redstone_cross_t = self.load_image_texture("assets/minecraft/textures/blocks/redstone_dust_dot.png")
redstone_cross_t = self.tint_texture(redstone_cross_t,(48,0,0)) redstone_cross_t = self.tint_texture(redstone_cross_t,(48,0,0))
# generate an image per redstone direction # generate an image per redstone direction
@@ -2101,26 +2101,24 @@ def wire(self, blockid, data):
# generate the bottom texture # generate the bottom texture
if data & 0b111111 == 0: if data & 0b111111 == 0:
bottom = redstone_cross_t.copy() bottom = redstone_cross_t.copy()
elif data & 0b1111 == 10: #= 0b1010 redstone wire in the x direction # see iterate.c for where these masks come from
bottom = redstone_wire_t.copy() has_x = (data & 0b1010) > 0
has_z = (data & 0b0101) > 0
elif data & 0b1111 == 5: #= 0b0101 redstone wire in the y direction if has_x and has_z:
bottom = redstone_wire_t.copy().rotate(90) bottom = redstone_cross_t.copy()
if has_x:
alpha_over(bottom, redstone_wire_t.copy())
if has_z:
alpha_over(bottom, redstone_wire_t.copy().rotate(90))
else: else:
bottom = Image.new("RGBA", (16,16), self.bgcolor) if has_x:
if (data & 0b0001) == 1: bottom = redstone_wire_t.copy()
alpha_over(bottom,branch_top_left) elif has_z:
bottom = redstone_wire_t.copy().rotate(90)
if (data & 0b1000) == 8: elif data & 0b1111 == 0:
alpha_over(bottom,branch_top_right) bottom = redstone_cross_t.copy()
if (data & 0b0010) == 2:
alpha_over(bottom,branch_bottom_left)
if (data & 0b0100) == 4:
alpha_over(bottom,branch_bottom_right)
# check for going up redstone wire # check for going up redstone wire
if data & 0b100000 == 32: if data & 0b100000 == 32: