From 336f78a65fc4da4224d9c5cdc7c77cc9be86c87d Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Tue, 27 Sep 2011 17:59:23 -1000
Subject: [PATCH] add block defs for 1.9pre

---
 materials.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/materials.py b/materials.py
index 3381ae8..3729856 100644
--- a/materials.py
+++ b/materials.py
@@ -190,7 +190,7 @@ class MCMaterials(object):
         self.lightAbsorption[blockID] = block.opacity
         self.aka[blockID] = block.aka
 
-        self.flatColors[blockID, (blockData or slice(None))] = block.color
+        self.flatColors[blockID, (blockData or slice(None))] = (block.color + (255,))[:4]
 
         texture = kw.pop('texture', None)
 
@@ -1090,8 +1090,55 @@ am.StoneBrickStairs = am.Block(109,
     texture=(0x60, 0x30),
     color=am.StoneBricks.color,
     )
+    
+am.Mycelium = am.Block(110,
+    name="Mycelium",
+    texture = ((0xd0, 0x40), (0xd0, 0x40), 
+               (0xe0, 0x40), (0x20, 0x00), 
+               (0xd0, 0x40), (0xd0, 0x40), 
+               ),
+    color=(140, 115, 119),
+)
 
-am.AllStairs = [am.WoodenStairs, am.StoneStairs, am.BrickStairs, am.StoneBrickStairs]
+am.Lilypad = am.Block(111,
+    name="Lilypad",
+    texture = (0xc0, 0x40),
+    opacity = 0,
+)
+
+am.NetherBrick = am.Block(112,
+    name="Nether Brick",
+    texture = (0x0, 0xe0),
+    color=(54, 24, 30),
+)
+
+am.NetherBrickFence = am.Block(113,
+    name="Nether Fence",
+    texture = (0x0, 0xe0),
+    color=(54, 24, 30),
+)
+
+am.NetherBrickStairs = am.Block(114,
+    name="Nether Stairs",
+    texture = (0x0, 0xe0),
+    color=(54, 24, 30),
+)
+
+am.NetherWart = am.Block(115,
+    name="Nether Wart",
+    texture = (0x40, 0xe0),
+    color=(112, 8, 28),
+)
+
+
+
+am.AllStairs = [
+    am.WoodenStairs, 
+    am.StoneStairs, 
+    am.BrickStairs, 
+    am.StoneBrickStairs,
+    am.NetherBrickStairs,
+]
 del am
 
 from classicmaterials import classicMaterials