From ccc915ecf0f9c4e79e8d291c15d12c93ce36db32 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 26 May 2014 15:32:32 +0200
Subject: [PATCH] GenericWood: temporarily disable biome-specific foliage
 colors

---
 .../minecraft/test/generic/GenericWood.java   | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/java/net/universe_factory/minecraft/test/generic/GenericWood.java b/java/net/universe_factory/minecraft/test/generic/GenericWood.java
index d41e9cc..31b97f5 100644
--- a/java/net/universe_factory/minecraft/test/generic/GenericWood.java
+++ b/java/net/universe_factory/minecraft/test/generic/GenericWood.java
@@ -3,9 +3,6 @@ package net.universe_factory.minecraft.test.generic;
 import java.util.List;
 import java.util.Random;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeaves;
 import net.minecraft.block.BlockLog;
@@ -21,13 +18,15 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenBigTree;
-import net.minecraft.world.gen.feature.WorldGenTrees;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import net.minecraftforge.event.terraingen.TerrainGen;
 import net.minecraftforge.oredict.OreDictionary;
 import net.universe_factory.minecraft.test.Test;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class GenericWood {
 	public final Info info;
@@ -168,6 +167,45 @@ public class GenericWood {
 		public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
 			return Item.getItemFromBlock(sapling);
 		}
+
+		@Override
+		@SideOnly(Side.CLIENT)
+		public int getBlockColor() {
+			// double d0 = 0.5D;
+			// double d1 = 1.0D;
+			// return ColorizerFoliage.getFoliageColor(d0, d1);
+			return 0xffffff;
+		}
+
+		@Override
+		@SideOnly(Side.CLIENT)
+		public int getRenderColor(int meta) {
+			// return ColorizerFoliage.getFoliageColorBasic();
+			return 0xffffff;
+		}
+
+		@Override
+		@SideOnly(Side.CLIENT)
+		public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+			// int l = 0;
+			// int i1 = 0;
+			// int j1 = 0;
+			//
+			// for (int k1 = -1; k1 <= 1; ++k1) {
+			// for (int l1 = -1; l1 <= 1; ++l1) {
+			// int i2 = world.getBiomeGenForCoords(x + l1, z +
+			// k1).getBiomeFoliageColor(x + l1,
+			// y, z + k1);
+			// l += (i2 & 16711680) >> 16;
+			// i1 += (i2 & 65280) >> 8;
+			// j1 += i2 & 255;
+			// }
+			// }
+			//
+			// return (l / 9 & 255) << 16 | (i1 / 9 & 255) << 8 | j1
+			// / 9 & 255;
+			return 0xffffff;
+		}
 	}
 
 	private class Sapling extends BlockSapling {