From 942b0098e22110aee325fb77e2e0c6c1a7494801 Mon Sep 17 00:00:00 2001 From: Dan Berglund Date: Thu, 26 Sep 2013 16:12:03 -0700 Subject: [PATCH] add red sand. move packed ice so blockIds are in order --- overviewer_core/textures.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index bca0a85..be4632c 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -961,7 +961,14 @@ def lava(self, blockid, data): return self.build_block(lavatex, lavatex) # sand -block(blockid=12, top_image="assets/minecraft/textures/blocks/sand.png") +@material(blockid=12, data=range(2), solid=True) +def sand_blocks(self, blockid, data): + if data == 0: # normal + img = self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/sand.png"), self.load_image_texture("assets/minecraft/textures/blocks/sand.png")) + if data == 1: # red + img = self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/red_sand.png"), self.load_image_texture("assets/minecraft/textures/blocks/red_sand.png")) + return img + # gravel block(blockid=13, top_image="assets/minecraft/textures/blocks/gravel.png") # gold ore @@ -2647,9 +2654,6 @@ def snow(self, blockid, data): # snow block block(blockid=80, top_image="assets/minecraft/textures/blocks/snow.png") -# packed ice block -block(blockid=174, top_image="assets/minecraft/textures/blocks/ice_packed.png") - # cactus @material(blockid=81, data=range(15), transparent=True, solid=True, nospawn=True) def cactus(self, blockid, data): @@ -4207,6 +4211,9 @@ def stained_clay(self, blockid, data): #coal block block(blockid=173, top_image="assets/minecraft/textures/blocks/coal_block.png") +# packed ice block +block(blockid=174, top_image="assets/minecraft/textures/blocks/ice_packed.png") + #doublePlant blocks @material(blockid=175, data=range(16), transparent=True) def flower(self, blockid, data):