diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java
index b5191f3cb..047a98761 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java
@@ -36,14 +36,10 @@ public class BlockAcaciaLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java
index fc59b9e70..bcec9107a 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java
@@ -36,14 +36,10 @@ public class BlockCherryLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java
index e67d7c644..ecdec7fe1 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java
@@ -36,14 +36,10 @@ public class BlockDarkLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java
index b616e16ad..7a7ad4d30 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java
@@ -36,14 +36,10 @@ public class BlockDeadLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java
index ad5bf69d8..8765f3da8 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java
@@ -36,14 +36,10 @@ public class BlockFirLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java
index 6ff0ffa16..30b6f901f 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java
@@ -36,14 +36,10 @@ public class BlockHolyLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java
index 46dd1ee6b..7f698fb47 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java
@@ -35,14 +35,10 @@ public class BlockMagicLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java
index 5f9a9c240..864e02379 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java
@@ -36,14 +36,10 @@ public class BlockMangroveLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 	
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java
index 0967157ce..6e9624a17 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java
@@ -36,14 +36,10 @@ public class BlockPalmLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java
index b65368d2f..602ba57f1 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java
@@ -36,14 +36,10 @@ public class BlockRedwoodLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**
diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java
index 12b0631b6..21310bed3 100644
--- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java
+++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java
@@ -36,14 +36,10 @@ public class BlockWillowLog extends Block
 	
     public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
-    	if(par1 == 0 || par1 == 1)
-    	{
-    		return blockIcon[0];
-    	}
-    	else
-    	{
-    		return blockIcon[1];
-    	}
+    	int pos = par2 & 12;
+        if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))
+            return blockIcon[0];
+        return blockIcon[1];
     }
 
     /**