LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Added dark wood and acacia wood blocks

Browse Source 
Includes stairs, slabs, planks and saplings.
This commit is contained in:
Nicolas Frattaroli
2013-11-02 15:12:44 +01:00
parent 9d76e48481
commit 2346c26f37
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/iterate.c
View File

@@ -260,6 +260,8 @@ is_stairs(int block) {
case 135: /* birch wood stairs */ case 135: /* birch wood stairs */
case 136: /* jungle wood stairs */ case 136: /* jungle wood stairs */
case 156: /* quartz stairs */ case 156: /* quartz stairs */
case 163: /* acacia wood stairs */
case 164: /* dark wood stairs */
return 1; return 1;
} }
return 0; return 0;

4
overviewer_core/src/primitives/lighting.c
View File

@@ -160,7 +160,7 @@ get_lighting_color(RenderPrimitiveLighting *self, RenderState *state,
/* special half-step handling, stairs handling */ /* special half-step handling, stairs handling */
/* Anvil also needs to be here, blockid 145 */ /* Anvil also needs to be here, blockid 145 */
if (block == 44 || block == 53 || block == 67 || block == 108 || block == 109 || block == 114 || if (block == 44 || block == 53 || block == 67 || block == 108 || block == 109 || block == 114 ||
block == 128 || block == 134 || block == 135 || block == 136 || block == 145 || block == 156) { block == 128 || block == 134 || block == 135 || block == 136 || block == 145 || block == 156 || block == 163 || block == 164) {
unsigned int upper_block; unsigned int upper_block;
/* stairs and half-blocks take the skylevel from the upper block if it's transparent */ /* stairs and half-blocks take the skylevel from the upper block if it's transparent */
@@ -171,7 +171,7 @@ get_lighting_color(RenderPrimitiveLighting *self, RenderState *state,
upper_block = get_data(state, BLOCKS, x, y + upper_counter, z); upper_block = get_data(state, BLOCKS, x, y + upper_counter, z);
} while (upper_block == 44 || upper_block == 53 || upper_block == 67 || upper_block == 108 || } while (upper_block == 44 || upper_block == 53 || upper_block == 67 || upper_block == 108 ||
upper_block == 109 || upper_block == 114 || upper_block == 128 || upper_block == 134 || upper_block == 109 || upper_block == 114 || upper_block == 128 || upper_block == 134 ||
upper_block == 135 || upper_block == 136 || upper_block == 156 ); upper_block == 135 || upper_block == 136 || upper_block == 156 || upper_block == 163 || upper_block == 164);
if (is_transparent(upper_block)) { if (is_transparent(upper_block)) {
skylevel = get_data(state, SKYLIGHT, x, y + upper_counter, z); skylevel = get_data(state, SKYLIGHT, x, y + upper_counter, z);
} else { } else {

20
overviewer_core/textures.py
View File

@@ -880,7 +880,7 @@ def dirt_blocks(self, blockid, data):
block(blockid=4, top_image="assets/minecraft/textures/blocks/cobblestone.png") block(blockid=4, top_image="assets/minecraft/textures/blocks/cobblestone.png")
# wooden planks # wooden planks
@material(blockid=5, data=range(4), solid=True) @material(blockid=5, data=range(7), solid=True)
def wooden_planks(self, blockid, data): def wooden_planks(self, blockid, data):
if data == 0: # normal if data == 0: # normal
return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png"), self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png")) return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png"), self.load_image_texture("assets/minecraft/textures/blocks/planks_oak.png"))
@@ -890,6 +890,10 @@ def wooden_planks(self, blockid, data):
return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png")) return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png"))
if data == 3: # jungle wood if data == 3: # jungle wood
return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png")) return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png"))
if data == 4: # acacia
return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png"))
if data == 5: # dark oak
return self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png"),self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png"))
@material(blockid=6, data=range(16), transparent=True) @material(blockid=6, data=range(16), transparent=True)
def saplings(self, blockid, data): def saplings(self, blockid, data):
@@ -902,6 +906,10 @@ def saplings(self, blockid, data):
tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_birch.png") tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_birch.png")
elif data & 0x3 == 3: # jungle sapling elif data & 0x3 == 3: # jungle sapling
tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_jungle.png") tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_jungle.png")
elif data & 0x3 == 4: # acacia sapling
tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_acacia.png")
elif data & 0x3 == 5: # dark oak/roofed oak/big oak sapling
tex = self.load_image_texture("assets/minecraft/textures/blocks/sapling_roofed_oak.png")
return self.build_sprite(tex) return self.build_sprite(tex)
# bedrock # bedrock
@@ -1672,7 +1680,7 @@ def fire(self, blockid, data):
block(blockid=52, top_image="assets/minecraft/textures/blocks/mob_spawner.png", transparent=True) block(blockid=52, top_image="assets/minecraft/textures/blocks/mob_spawner.png", transparent=True)
# wooden, cobblestone, red brick, stone brick, netherbrick, sandstone, spruce, birch, jungle and quartz stairs. # wooden, cobblestone, red brick, stone brick, netherbrick, sandstone, spruce, birch, jungle and quartz stairs.
@material(blockid=[53,67,108,109,114,128,134,135,136,156], data=range(128), transparent=True, solid=True, nospawn=True) @material(blockid=[53,67,108,109,114,128,134,135,136,156,163,164], data=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
@@ -1705,6 +1713,10 @@ def stairs(self, blockid, data):
texture = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png").copy() texture = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png").copy()
elif blockid == 156: # quartz block stairs elif blockid == 156: # quartz block stairs
texture = self.load_image_texture("assets/minecraft/textures/blocks/quartz_block_side.png").copy() texture = self.load_image_texture("assets/minecraft/textures/blocks/quartz_block_side.png").copy()
elif blockid == 163: # acacia wood stairs
texture = self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png").copy()
elif blockid == 164: # dark oak stairs
texture = self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png").copy()
outside_l = texture.copy() outside_l = texture.copy()
outside_r = texture.copy() outside_r = texture.copy()
@@ -3729,6 +3741,10 @@ def wooden_slabs(self, blockid, data):
top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png") top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_birch.png")
elif texture== 3: # jungle elif texture== 3: # jungle
top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png") top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_jungle.png")
elif texture== 4: # acacia
top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_acacia.png")
elif texture== 5: # dark wood
top = side = self.load_image_texture("assets/minecraft/textures/blocks/planks_big_oak.png")
else: else:
return None return None