From 6b08cdc51bb7196f29c2862b0c01e4d1829bf016 Mon Sep 17 00:00:00 2001 From: skeight Date: Thu, 9 May 2013 08:27:20 -0700 Subject: [PATCH 1/3] Added: Hay blocks, Hardened Clay, Coal blocks, and Carpet. --- overviewer_core/textures.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 115a892..6dd4ae2 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4058,3 +4058,23 @@ def hopper(self, blockid, data): alpha_over(img, hop_top, (0,-6), hop_top) return img + +# hay block +@material(blockid=170, solid=True) +def hayblock(self, blockid, data): + top = self.load_image_texture("textures/blocks/hayBlock_top.png") + side = self.load_image_texture("textures/blocks/hayBlock.png") + return self.build_block(top, side) + +# carpet - wool block that's small? +@material(blockid=171, data=range(16), transparent=True) +def carpet(self, blockid, data): + texture = self.load_image_texture("textures/blocks/cloth_%d.png" % data) + + return self.build_full_block((texture,15),texture,texture,texture,texture) + +#clay block +block(blockid=172, top_image="textures/blocks/clayHardened.png") + +#coal block +block(blockid=173, top_image="textures/blocks/blockCoal.png") From d884718d64121b4914755cb353d0348e4ca1ea1f Mon Sep 17 00:00:00 2001 From: skeight Date: Fri, 10 May 2013 09:22:17 -0700 Subject: [PATCH 2/3] Added stained hardened clay --- overviewer_core/textures.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 6dd4ae2..cf2bea3 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4076,5 +4076,12 @@ def carpet(self, blockid, data): #clay block block(blockid=172, top_image="textures/blocks/clayHardened.png") +#stained hardened clay +@material(blockid=159, data=range(16), solid=True) +def carpet(self, blockid, data): + texture = self.load_image_texture("textures/blocks/clayHardenedStained_%d.png" % data) + + return self.build_block(texture,texture) + #coal block block(blockid=173, top_image="textures/blocks/blockCoal.png") From b8d04055255371a77fd2456128c8928642507eb6 Mon Sep 17 00:00:00 2001 From: skeight Date: Tue, 28 May 2013 09:33:12 -0700 Subject: [PATCH 3/3] Fixed Hay blocks and Stained clay --- overviewer_core/textures.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index cf2bea3..bdef0d9 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4060,11 +4060,26 @@ def hopper(self, blockid, data): return img # hay block -@material(blockid=170, solid=True) +@material(blockid=170, data=range(9), solid=True) def hayblock(self, blockid, data): top = self.load_image_texture("textures/blocks/hayBlock_top.png") side = self.load_image_texture("textures/blocks/hayBlock.png") - return self.build_block(top, side) + + if self.rotation == 1: + if data == 4: data = 8 + elif data == 8: data = 4 + elif self.rotation == 3: + if data == 4: data = 8 + elif data == 8: data = 4 + + # choose orientation and paste textures + if data == 4: # east-west orientation + return self.build_full_block(side.rotate(90), None, None, top, side.rotate(90)) + elif data == 8: # north-south orientation + return self.build_full_block(side, None, None, side.rotate(90), top) + else: + return self.build_block(top, side) + # carpet - wool block that's small? @material(blockid=171, data=range(16), transparent=True) @@ -4078,7 +4093,7 @@ block(blockid=172, top_image="textures/blocks/clayHardened.png") #stained hardened clay @material(blockid=159, data=range(16), solid=True) -def carpet(self, blockid, data): +def stained_clay(self, blockid, data): texture = self.load_image_texture("textures/blocks/clayHardenedStained_%d.png" % data) return self.build_block(texture,texture)