Tweaked a few textures, added Wisteria block for future use

src/main/java/biomesoplenty/api/content/BOPCBlocks.java

@@ -18,6 +18,7 @@ public class BOPCBlocks
 	public static Block ivy;
 	public static Block treeMoss;
 	public static Block flowerVine;
+	public static Block wisteria;
 	public static Block foliage;
 	public static Block turnip;
 	

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java

@@ -6,9 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 
-public class BiomeGenArctic extends BOPOverworldBiome
+public class BiomeGenArctic extends BOPOverworldBiome implements IBiomeFog
 {
 	private static final Height biomeHeight = new Height(0F, 0F);
 	
@@ -63,20 +64,20 @@ public class BiomeGenArctic extends BOPOverworldBiome
 		return 11903827;
 	}
 	
-	/*
+	
 	@Override
-	public int getFogColour()
+	public int getFogColour(int x, int y, int z)
 	{
 		return 12638463;
 	}
-	*/
 	
-	/*
+	
+	
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.4F;
     }
-    */
+    
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java

@@ -6,10 +6,9 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
@@ -18,7 +17,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBayou1;
 import biomesoplenty.common.world.features.trees.WorldGenBayou2;
 import biomesoplenty.common.world.features.trees.WorldGenBayou3;
 
-public class BiomeGenBayou extends BOPOverworldBiome
+public class BiomeGenBayou extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(-0.1F, 0.1F);
 
@@ -122,17 +121,16 @@ public class BiomeGenBayou extends BOPOverworldBiome
 		else return super.getSkyColorByTemp(par1);
 	}
 
-	/*@Override
-	public int getFogColour()
+	@Override
+	public int getFogColour(int x, int y, int z)
 	{
 		return 9482133;
 	}
 
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.6F;
     }
-	 */
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java

@@ -5,12 +5,12 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 
-public class BiomeGenCrag extends BOPOverworldBiome
+public class BiomeGenCrag extends BOPOverworldBiome implements IBiomeFog
 {
 	private static final Height biomeHeight = new Height(2.0F, 3.0F);
 	
@@ -65,20 +65,16 @@ public class BiomeGenCrag extends BOPOverworldBiome
 	/**
 	 * Fog Color
 	 */
-	/*
 	@Override
-	public int getFogColour()
+	public int getFogColour(int x, int y, int z)
 	{
 		return 10514245;
 	}
-	*/
 	 
-	/*
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 1.0F;
     }
-    */
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java

@@ -5,16 +5,16 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenDeadSwamp extends BOPOverworldBiome
+public class BiomeGenDeadSwamp extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
     
@@ -106,17 +106,16 @@ public class BiomeGenDeadSwamp extends BOPOverworldBiome
         else return super.getSkyColorByTemp(par1);
     }
 	
-	/*@Override
-	public int getFogColour()
+    @Override
+	public int getFogColour(int x, int y, int z)
 	{
 		return 9219993;
 	}
 	
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.6F;
     }
-    */
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java

@@ -3,13 +3,11 @@ package biomesoplenty.common.biome.overworld;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
@@ -19,7 +17,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga1;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenFen extends BOPOverworldBiome
+public class BiomeGenFen extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
     
@@ -115,17 +113,16 @@ public class BiomeGenFen extends BOPOverworldBiome
 		return 13547897;
 	}
 
-	/*@Override
-	public int getFogColour()
+	@Override
+	public int getFogColour(int x, int y, int z)
 	{
 		return 12638463;
 	}
 	
 	@Override
-	public float getFogCloseness()
+	public float getFogDensity(int x, int y, int z)
 	{
 	    // TODO Auto-generated method stub
 	    return 0.8F;
 	}
-	*/
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java

@@ -5,15 +5,15 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 
-public class BiomeGenFrostForest extends BOPOverworldBiome
+public class BiomeGenFrostForest extends BOPOverworldBiome implements IBiomeFog
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 	
@@ -96,17 +96,17 @@ public class BiomeGenFrostForest extends BOPOverworldBiome
 		else return super.getSkyColorByTemp(par1);
 	}
 	
-	/*@Override
-	public int getFogColour()
+	@Override
+	public int getFogColour(int x, int y, int z)
 	{
 		return 12239814;
 	}
 	
     @Override
-    public float getFogCloseness()
+   	public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.6F;
     }
-    */
+    
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java

@@ -6,18 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntityWitch;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
+import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenMysticGrove extends BOPOverworldBiome
+public class BiomeGenMysticGrove extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
 
@@ -112,49 +112,27 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome
 		return 7397529;
 	}
 	
-	/**
-	 * Fog Color
-	 */
-	/*
-	@Override
-	public int getFogColour()
-	{
-		return 16755401;
-	}
-	*/
-
-	/**
-	 * takes temperature, returns color
-	 */
-	/*
 	@Override
 	public int getSkyColorByTemp(float par1)
 	{
-		if (BOPConfigurationMisc.skyColors)
-			return 8972496;
-		else
-		{
-			par1 /= 3.0F;
-
-			if (par1 < -1.0F)
-			{
-				par1 = -1.0F;
-			}
-
-			if (par1 > 1.0F)
-			{
-				par1 = 1.0F;
-			}
-
-			return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
-		}
+		if (BOPConfigurationMisc.skyColors) return 8972496;
+		else return super.getSkyColorByTemp(par1);
+	}
+	
+	/**
+	 * Fog Color
+	 */
+	@Override
+	public int getFogColour(int x, int y, int z)
+	{
+		return 16755401;
 	}
 
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 1.0F;
     }
-    */
+    
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java

@@ -3,20 +3,18 @@ package biomesoplenty.common.biome.overworld;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBogTree1;
 import biomesoplenty.common.world.features.trees.WorldGenBogTree2;
 
-public class BiomeGenSludgepit extends BOPOverworldBiome
+public class BiomeGenSludgepit extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
 
@@ -108,17 +106,16 @@ public class BiomeGenSludgepit extends BOPOverworldBiome
 
     }
 
-	/*@Override
-	public int getFogColour()
+	@Override
+	public int getFogColour(int x, int y, int z)
 	{
 		return 10463856;
 	}
 
 	@Override
-	public float getFogCloseness()
+	public float getFogDensity(int x, int y, int z)
 	{
 	    // TODO Auto-generated method stub
 	    return 0.6F;
 	}
-     */
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java

@@ -5,10 +5,10 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
@@ -18,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
 
-public class BiomeGenTemperateRainforest extends BOPOverworldBiome
+public class BiomeGenTemperateRainforest extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.0F, 0.3F);
 
@@ -119,17 +119,15 @@ public class BiomeGenTemperateRainforest extends BOPOverworldBiome
         else return super.getSkyColorByTemp(par1);
     }
 	
-	/*@Override
-	public int getFogColour()
+	public int getFogColour(int x, int y, int z)
 	{
 		return 13753294;
 	}
 	
     @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.8F;
     }
-    */
 }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java

@@ -5,15 +5,15 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenWasteland extends BOPOverworldBiome
+public class BiomeGenWasteland extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
 
@@ -96,18 +96,16 @@ public class BiomeGenWasteland extends BOPOverworldBiome
         else return super.getSkyColorByTemp(par1);
     }
 
-    /*@Override
-    public int getFogColour()
+    @Override
+    public int getFogColour(int x, int y, int z)
     {
         return 12106885;
     }
-    */
 
-    /*@Override
-    public float getFogCloseness()
+    @Override
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
         return 0.3F;
     }
-    */
 }

src/main/java/biomesoplenty/common/blocks/BlockWisteria.java

@@ -0,0 +1,58 @@
+package biomesoplenty.common.blocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockVine;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.world.IBlockAccess;
+import biomesoplenty.BiomesOPlenty;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockWisteria extends BlockVine
+{
+	public BlockWisteria()
+	{
+		//TODO: this.setHardness
+		this.setHardness(0.2F);
+		
+		//TODO setStepSound(Block.soundGrassFootstep)
+		this.setStepSound(Block.soundTypeGrass);
+		
+		//TODO: setTickRandomly()
+		this.setTickRandomly(true);
+		
+		//TODO: this.setCreativeTab()
+		this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+	}
+
+	@Override
+	//TODO:		registerIcons()
+	public void registerBlockIcons(IIconRegister iconRegister)
+	{
+				//TODO: blockIcon
+		this.blockIcon = iconRegister.registerIcon("biomesoplenty:wisteria");
+	}
+	
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getBlockColor()
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149741_i
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(int p_149741_1_)
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149720_d
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_)
+    {
+        return 16777215;
+    }
+}

src/main/java/biomesoplenty/common/core/BOPBlocks.java

@@ -74,6 +74,7 @@ import static biomesoplenty.api.content.BOPCBlocks.treeMoss;
 import static biomesoplenty.api.content.BOPCBlocks.turnip;
 import static biomesoplenty.api.content.BOPCBlocks.willow;
 import static biomesoplenty.api.content.BOPCBlocks.willowStairs;
+import static biomesoplenty.api.content.BOPCBlocks.wisteria;
 import static biomesoplenty.api.content.BOPCBlocks.woodenDoubleSlab1;
 import static biomesoplenty.api.content.BOPCBlocks.woodenDoubleSlab2;
 import static biomesoplenty.api.content.BOPCBlocks.woodenSingleSlab1;
@@ -130,6 +131,7 @@ import biomesoplenty.common.blocks.BlockStoneFormations;
 import biomesoplenty.common.blocks.BlockTreeMoss;
 import biomesoplenty.common.blocks.BlockTurnip;
 import biomesoplenty.common.blocks.BlockWillow;
+import biomesoplenty.common.blocks.BlockWisteria;
 import biomesoplenty.common.fluids.blocks.BlockBloodFluid;
 import biomesoplenty.common.fluids.blocks.BlockHoneyFluid;
 import biomesoplenty.common.fluids.blocks.BlockPoisonFluid;
@@ -188,6 +190,7 @@ public class BOPBlocks
         ivy = registerBlock(new BlockIvy().setBlockName("ivy"), ItemBlockIvy.class);
         treeMoss = registerBlock(new BlockTreeMoss().setBlockName("treeMoss"));
         flowerVine = registerBlock(new BlockFlowerVine().setBlockName("flowerVine"));
+        wisteria = registerBlock(new BlockWisteria().setBlockName("wisteria"));
         foliage = registerBlock(new BlockBOPFoliage().setBlockName("foliage"), ItemBlockFoliage.class);
         turnip = registerBlock(new BlockTurnip().setBlockName("turnip"));
         
@@ -324,6 +327,8 @@ public class BOPBlocks
 		Blocks.fire.setFireInfo(BOPCBlocks.moss, 15, 100);
 		Blocks.fire.setFireInfo(BOPCBlocks.treeMoss, 15, 100);
 		Blocks.fire.setFireInfo(BOPCBlocks.willow, 15, 100);
+		Blocks.fire.setFireInfo(BOPCBlocks.flowerVine, 15, 100);
+		Blocks.fire.setFireInfo(BOPCBlocks.wisteria, 15, 100);
 	}
 	
 	public static Block registerBlock(Block block)

src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java

@@ -42,4 +42,15 @@ public class ItemBlockColorizedSapling extends ItemBlock
 		//TODO: block		  getIcon()
 		return field_150939_a.getIcon(0, meta);
 	}
+	
+	@Override
+	public boolean hasEffect(ItemStack itemStack, int pass)
+	{	
+		if (itemStack.getItemDamage() == 0)
+		{
+			return true;
+		}
+		
+		return false;
+	}
 }

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -128,6 +128,7 @@ tile.longGrass.name=Long Grass Block
 tile.overgrownNetherrack.name=Overgrown Netherrack
 tile.treeMoss.name=Tree Moss
 tile.flowerVine.name=Flowering Vines
+tile.wisteria.name=Wisteria
 
 tile.coral1.kelpsingle.name=Kelp
 tile.coral1.pinkcoral.name=Pink Coral