neocturne/minecraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GenericWood: temporarily disable biome-specific foliage colors

Browse source
This commit is contained in:
Matthias Schiffer 2014-05-26 15:32:32 +02:00
parent 376dcee606
commit ccc915ecf0
1 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
java/net/universe_factory/minecraft/test/generic/GenericWood.java
View file

@ -3,9 +3,6 @@ package net.universe_factory.minecraft.test.generic;
import java.util.List; import java.util.List;
import java.util.Random; 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.Block;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockLog; import net.minecraft.block.BlockLog;
@ -21,13 +18,15 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemSlab;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; 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.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.event.terraingen.TerrainGen; import net.minecraftforge.event.terraingen.TerrainGen;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import net.universe_factory.minecraft.test.Test; 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 class GenericWood {
public final Info info; 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_) { public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return Item.getItemFromBlock(sapling); 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 { private class Sapling extends BlockSapling {