Merge branch 'snapshot'

Conflicts:
	overviewer_core/src/iterate.c

overviewer_core/textures.py

@@ -712,7 +712,7 @@ class Textures(object):
         """
         img = Image.new("RGBA", (24,24), self.bgcolor)
 
-        front = tex.resize((14, 11), Image.ANTIALIAS)
+        front = tex.resize((14, 12), Image.ANTIALIAS)
         alpha_over(img, front, (5,9))
         return img
 
@@ -864,7 +864,18 @@ def grass(self, blockid, data):
     return img
 
 # dirt
-block(blockid=3, top_image="assets/minecraft/textures/blocks/dirt.png")
+@material(blockid=3, data=range(3), solid=True)
+def dirt_blocks(self, blockid, data):
+    side_img = self.load_image_texture("assets/minecraft/textures/blocks/dirt.png")
+    if data == 0: # normal
+        img =  self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/dirt.png"), side_img)
+    if data == 1: # grassless
+        img = self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/dirt.png"), side_img)
+    if data == 2: # podzol
+        side_img = self.load_image_texture("assets/minecraft/textures/blocks/dirt_podzol_side.png")
+        img = self.build_block(self.load_image_texture("assets/minecraft/textures/blocks/dirt_podzol_top.png"), side_img)
+    return img
+
 # cobblestone
 block(blockid=4, top_image="assets/minecraft/textures/blocks/cobblestone.png")
 
@@ -950,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
@@ -1443,8 +1461,16 @@ def wool(self, blockid, data):
 
 # dandelion
 sprite(blockid=37, imagename="assets/minecraft/textures/blocks/flower_dandelion.png")
-# rose
-sprite(blockid=38, imagename="assets/minecraft/textures/blocks/flower_rose.png")
+
+# flowers
+@material(blockid=38, data=range(10), transparent=True)
+def flower(self, blockid, data):
+    flower_map = ["rose", "blue_orchid", "allium", "houstonia", "tulip_red", "tulip_orange",
+                  "tulip_white", "tulip_pink", "oxeye_daisy", "dandelion"]
+    texture = self.load_image_texture("assets/minecraft/textures/blocks/flower_%s.png" % flower_map[data])
+
+    return self.build_billboard(texture)
+
 # brown mushroom
 sprite(blockid=39, imagename="assets/minecraft/textures/blocks/mushroom_brown.png")
 # red mushroom
@@ -3821,7 +3847,7 @@ def beacon(self, blockid, data):
     
     return img
 
-# cobbleston and mossy cobblestone walls
+# cobblestone and mossy cobblestone walls
 # one additional bit of data value added for mossy and cobblestone
 @material(blockid=139, data=range(32), transparent=True, nospawn=True)
 def cobblestone_wall(self, blockid, data):
@@ -4156,3 +4182,27 @@ 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")
+
+@material(blockid=175, data=range(16), transparent=True)
+def flower(self, blockid, data):
+    double_plant_map = ["sunflower", "syringa", "grass", "fern", "rose", "paeonia", "paeonia", "paeonia"]
+    plant = double_plant_map[data & 0x7]
+
+    if data & 0x8:
+        part = "top"
+    else:
+        part = "bottom"
+
+    png = "assets/minecraft/textures/blocks/double_plant_%s_%s.png" % (plant,part)
+    texture = self.load_image_texture(png)
+    img = self.build_billboard(texture)
+
+    #sunflower top
+    if data == 8:
+        bloom_tex = self.load_image_texture("assets/minecraft/textures/blocks/double_plant_sunflower_front.png")
+        alpha_over(img, bloom_tex.resize((14, 11), Image.ANTIALIAS), (5,5))
+
+    return img