Replaced Spring Water with Blood, added blood pools to the Visceral Heap

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

@@ -105,6 +105,6 @@ public class BOPCBlocks
 	
 	//Fluid blocks
 	public static Block poison;
-	public static Block springWater;
+	public static Block blood;
 	public static Block honey;
 }

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

@@ -5,6 +5,6 @@ import net.minecraftforge.fluids.Fluid;
 public class BOPCFluids 
 {
 	public static Fluid poison;
-	public static Fluid spring_water;
+	public static Fluid blood;
 	public static Fluid honey;
 }

src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java

@@ -11,4 +11,6 @@ public class NetherBiomeFeatures extends BiomeFeaturesBase
     @BiomeFeature public int netherVinesPerChunk = 0;
     @BiomeFeature public int netherrackSplatterPerChunk = 0;
     @BiomeFeature public int gravesPerChunk = 0;
+    //@BiomeFeature public int bloodSpringsPerChunk = 0;
+    @BiomeFeature public int bloodLakesPerChunk = 0;
 }

src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java

@@ -18,10 +18,12 @@ public class OverworldBiomeFeatures extends BiomeFeaturesBase
 
     @BiomeFeature public int waterSpringsPerChunk = 50;
     @BiomeFeature public int lavaSpringsPerChunk = 20;
+    @BiomeFeature public int bloodSpringsPerChunk = 0;
 
     @BiomeFeature public int waterLakesPerChunk = 0;
     @BiomeFeature public int lavaLakesPerChunk = 0;
     @BiomeFeature public int poisonLakesPerChunk = 0;
+    @BiomeFeature public int bloodLakesPerChunk = 0;
 
     @BiomeFeature public int mudPerChunk = 0;
     @BiomeFeature public int riverCanePerChunk = 0;

src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java

@@ -6,6 +6,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
 import biomesoplenty.common.biome.BOPNetherBiome;
+import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
 
@@ -31,6 +32,7 @@ public class BiomeGenUndergarden extends BOPNetherBiome
         this.theBiomeDecorator.bopFeatures.glowshroomsPerChunk = 5;
                                
         this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50;
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
 		
         this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.25D);
 		this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
@@ -38,6 +40,8 @@ public class BiomeGenUndergarden extends BOPNetherBiome
         this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
         this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
         this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(BOPCBlocks.flowers, BOPCBlocks.flowers, 13, 14), 6);
     }
     
 	@Override

src/main/java/biomesoplenty/common/biome/nether/BiomeGenVisceralHeap.java

@@ -2,6 +2,7 @@ package biomesoplenty.common.biome.nether;
 
 import biomesoplenty.api.content.BOPCBlocks;
 import biomesoplenty.common.biome.BOPNetherBiome;
+import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 
 public class BiomeGenVisceralHeap extends BOPNetherBiome
 {
@@ -16,5 +17,12 @@ public class BiomeGenVisceralHeap extends BOPNetherBiome
 
         this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
         this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
+        
+        this.theBiomeDecorator.bopFeatures.bloodLakesPerChunk = 15;
+        //this.theBiomeDecorator.bopFeatures.bloodSpringsPerChunk = 10;
+        
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
+        
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(BOPCBlocks.flowers, BOPCBlocks.flowers, 13, 14), 6);
     }
 }

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

@@ -10,11 +10,12 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 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.trees.WorldGenBulbTree;
 
-public class BiomeGenBambooForest extends BOPOverworldBiome
+public class BiomeGenBambooForest extends BOPOverworldBiome implements IBiomeFog
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.3F);
 	
@@ -96,17 +97,14 @@ public class BiomeGenBambooForest extends BOPOverworldBiome
         return d0 < -0.7D ? 13949781 : (d0 < -0.3 ? 12311892 : 10739795);
 	}
 
-	/*@Override
-	public int getFogColour()
+	public int getFogColour(int x, int y, int z)
 	{
 		return 13428852;
 	}
 
-    @Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
         // TODO Auto-generated method stub
-        return 0.8F;
+        return 0.01F;
     }
-	 */
 }

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

@@ -6,11 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityOcelot;
 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 net.minecraft.world.gen.feature.WorldGenTrees;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.client.fog.IBiomeFog;
 import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.entities.EntityJungleSpider;
@@ -19,7 +18,7 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1;
 
-public class BiomeGenTropicalRainforest extends BOPOverworldBiome
+public class BiomeGenTropicalRainforest extends BOPOverworldBiome implements IBiomeFog
 {
     private static final Height biomeHeight = new Height(0.2F, 0.3F);
 
@@ -112,22 +111,14 @@ public class BiomeGenTropicalRainforest extends BOPOverworldBiome
         else return super.getSkyColorByTemp(par1);
     }
 
-    /**
-     * Fog Color
-     */
-    /*
     @Override
-    public int getFogColour()
+    public int getFogColour(int x, int y, int z)
     {
         return 16228194;
     }
-    */
 
-    /*@Override
-    public float getFogCloseness()
+    public float getFogDensity(int x, int y, int z)
     {
-        // TODO Auto-generated method stub
-        return 0.8F;
+        return 0.01F;
     }
-    */
 }

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

@@ -163,7 +163,7 @@ public class BOPBiomes
 	{
 		alps = registerOverworldBiome(BiomeGenAlps.class, "Alps", TemperatureType.ICY, 5);
 		arctic = registerOverworldBiome(BiomeGenArctic.class, "Arctic", TemperatureType.ICY, 10);
-        bambooForest = registerOverworldBiome(BiomeGenBambooForest.class, "Bamboo Forest", TemperatureType.HOT, 5);
+		bambooForest = registerOverworldBiome(BiomeGenBambooForest.class, "Bamboo Forest", TemperatureType.HOT, 5);
         bayou = registerOverworldBiome(BiomeGenBayou.class, "Bayou", TemperatureType.WARM, 10);
         bog = registerOverworldBiome(BiomeGenBog.class, "Bog", TemperatureType.WARM, 7);
         borealForest = registerOverworldBiome(BiomeGenBorealForest.class, "Boreal Forest", TemperatureType.WARM, 10);

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

@@ -1,12 +1,86 @@
 package biomesoplenty.common.core;
 
-import static biomesoplenty.api.content.BOPCBlocks.*;
-import static biomesoplenty.common.core.BOPBlocks.registerBlock;
+import static biomesoplenty.api.content.BOPCBlocks.appleLeaves;
+import static biomesoplenty.api.content.BOPCBlocks.ash;
+import static biomesoplenty.api.content.BOPCBlocks.ashStone;
+import static biomesoplenty.api.content.BOPCBlocks.bamboo;
+import static biomesoplenty.api.content.BOPCBlocks.biomeBlock;
+import static biomesoplenty.api.content.BOPCBlocks.blood;
+import static biomesoplenty.api.content.BOPCBlocks.bones;
+import static biomesoplenty.api.content.BOPCBlocks.bopGrass;
+import static biomesoplenty.api.content.BOPCBlocks.cherryStairs;
+import static biomesoplenty.api.content.BOPCBlocks.colorizedLeaves1;
+import static biomesoplenty.api.content.BOPCBlocks.colorizedLeaves2;
+import static biomesoplenty.api.content.BOPCBlocks.colorizedSaplings;
+import static biomesoplenty.api.content.BOPCBlocks.coral1;
+import static biomesoplenty.api.content.BOPCBlocks.coral2;
+import static biomesoplenty.api.content.BOPCBlocks.cragRock;
+import static biomesoplenty.api.content.BOPCBlocks.crystal;
+import static biomesoplenty.api.content.BOPCBlocks.darkStairs;
+import static biomesoplenty.api.content.BOPCBlocks.driedDirt;
+import static biomesoplenty.api.content.BOPCBlocks.firStairs;
+import static biomesoplenty.api.content.BOPCBlocks.flesh;
+import static biomesoplenty.api.content.BOPCBlocks.flowerVine;
+import static biomesoplenty.api.content.BOPCBlocks.flowers;
+import static biomesoplenty.api.content.BOPCBlocks.flowers2;
+import static biomesoplenty.api.content.BOPCBlocks.foliage;
+import static biomesoplenty.api.content.BOPCBlocks.gemOre;
+import static biomesoplenty.api.content.BOPCBlocks.grave;
+import static biomesoplenty.api.content.BOPCBlocks.hardDirt;
+import static biomesoplenty.api.content.BOPCBlocks.hardIce;
+import static biomesoplenty.api.content.BOPCBlocks.hardSand;
+import static biomesoplenty.api.content.BOPCBlocks.hellBarkStairs;
+import static biomesoplenty.api.content.BOPCBlocks.hive;
+import static biomesoplenty.api.content.BOPCBlocks.holyStairs;
+import static biomesoplenty.api.content.BOPCBlocks.honey;
+import static biomesoplenty.api.content.BOPCBlocks.honeyBlock;
+import static biomesoplenty.api.content.BOPCBlocks.ivy;
+import static biomesoplenty.api.content.BOPCBlocks.jacarandaStairs;
+import static biomesoplenty.api.content.BOPCBlocks.leaves1;
+import static biomesoplenty.api.content.BOPCBlocks.leaves2;
+import static biomesoplenty.api.content.BOPCBlocks.leaves3;
+import static biomesoplenty.api.content.BOPCBlocks.leaves4;
+import static biomesoplenty.api.content.BOPCBlocks.logs1;
+import static biomesoplenty.api.content.BOPCBlocks.logs2;
+import static biomesoplenty.api.content.BOPCBlocks.logs3;
+import static biomesoplenty.api.content.BOPCBlocks.logs4;
+import static biomesoplenty.api.content.BOPCBlocks.longGrass;
+import static biomesoplenty.api.content.BOPCBlocks.magicStairs;
+import static biomesoplenty.api.content.BOPCBlocks.mahoganyStairs;
+import static biomesoplenty.api.content.BOPCBlocks.mangroveStairs;
+import static biomesoplenty.api.content.BOPCBlocks.moss;
+import static biomesoplenty.api.content.BOPCBlocks.mud;
+import static biomesoplenty.api.content.BOPCBlocks.mudBricks;
+import static biomesoplenty.api.content.BOPCBlocks.mudBricksStairs;
+import static biomesoplenty.api.content.BOPCBlocks.mushrooms;
+import static biomesoplenty.api.content.BOPCBlocks.originGrass;
+import static biomesoplenty.api.content.BOPCBlocks.overgrownNetherrack;
+import static biomesoplenty.api.content.BOPCBlocks.palmStairs;
+import static biomesoplenty.api.content.BOPCBlocks.persimmonLeaves;
+import static biomesoplenty.api.content.BOPCBlocks.petals;
+import static biomesoplenty.api.content.BOPCBlocks.pineStairs;
+import static biomesoplenty.api.content.BOPCBlocks.planks;
+import static biomesoplenty.api.content.BOPCBlocks.plants;
+import static biomesoplenty.api.content.BOPCBlocks.poison;
+import static biomesoplenty.api.content.BOPCBlocks.redwoodStairs;
+import static biomesoplenty.api.content.BOPCBlocks.rocks;
+import static biomesoplenty.api.content.BOPCBlocks.sacredoakStairs;
+import static biomesoplenty.api.content.BOPCBlocks.saplings;
+import static biomesoplenty.api.content.BOPCBlocks.stoneDoubleSlab;
+import static biomesoplenty.api.content.BOPCBlocks.stoneFormations;
+import static biomesoplenty.api.content.BOPCBlocks.stoneSingleSlab;
+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.woodenDoubleSlab1;
+import static biomesoplenty.api.content.BOPCBlocks.woodenDoubleSlab2;
+import static biomesoplenty.api.content.BOPCBlocks.woodenSingleSlab1;
+import static biomesoplenty.api.content.BOPCBlocks.woodenSingleSlab2;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
-import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.api.content.BOPCBlocks;
 import biomesoplenty.common.blocks.BlockAsh;
 import biomesoplenty.common.blocks.BlockBOPAppleLeaves;
@@ -54,9 +128,9 @@ import biomesoplenty.common.blocks.BlockStoneFormations;
 import biomesoplenty.common.blocks.BlockTreeMoss;
 import biomesoplenty.common.blocks.BlockTurnip;
 import biomesoplenty.common.blocks.BlockWillow;
+import biomesoplenty.common.fluids.blocks.BlockBloodFluid;
 import biomesoplenty.common.fluids.blocks.BlockHoneyFluid;
 import biomesoplenty.common.fluids.blocks.BlockPoisonFluid;
-import biomesoplenty.common.fluids.blocks.BlockSpringWaterFluid;
 import biomesoplenty.common.itemblocks.ItemBlockAppleLeaves;
 import biomesoplenty.common.itemblocks.ItemBlockBamboo;
 import biomesoplenty.common.itemblocks.ItemBlockBones;
@@ -207,7 +281,7 @@ public class BOPBlocks
         
         //Fluid Blocks
 		poison = registerBlock(new BlockPoisonFluid().setBlockName("poison"));
-		springWater = registerBlock(new BlockSpringWaterFluid().setBlockName("springWater"));
+		blood = registerBlock(new BlockBloodFluid().setBlockName("blood"));
 		honey = registerBlock(new BlockHoneyFluid().setBlockName("honey"));
 	}
 	

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

@@ -1,13 +1,14 @@
 package biomesoplenty.common.core;
 
-import static biomesoplenty.api.content.BOPCFluids.*;
-
+import static biomesoplenty.api.content.BOPCFluids.blood;
+import static biomesoplenty.api.content.BOPCFluids.honey;
+import static biomesoplenty.api.content.BOPCFluids.poison;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.fluids.BloodFluid;
 import biomesoplenty.common.fluids.HoneyFluid;
 import biomesoplenty.common.fluids.PoisonFluid;
-import biomesoplenty.common.fluids.SpringWaterFluid;
 
 public class BOPFluids 
 {
@@ -24,14 +25,14 @@ public class BOPFluids
 	private static void registerFluids()
 	{
 		poison = registerFluid(new PoisonFluid("poison"));
-		spring_water = registerFluid(new SpringWaterFluid("spring_water"));
+		blood = registerFluid(new BloodFluid("blood"));
 		honey = registerFluid(new HoneyFluid("honey"));
 	}
 
 	private static void registerFluidBlocks()
 	{
 		poison.setBlock(BOPCBlocks.poison);
-		spring_water.setBlock(BOPCBlocks.springWater);
+		blood.setBlock(BOPCBlocks.blood);
 		honey.setBlock(BOPCBlocks.honey);
 	}
 	

src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java

@@ -31,7 +31,7 @@ public class BucketEventHandler
 
 		if (fluid != null)
 		{
-			if ((fluid == BOPCFluids.poison && world.getBlockMetadata(x, y, z) == 0) || (fluid == BOPCFluids.honey && world.getBlockMetadata(x, y, z) == 7))
+			if ((fluid == BOPCFluids.poison && world.getBlockMetadata(x, y, z) == 0) || (fluid == BOPCFluids.blood && world.getBlockMetadata(x, y, z) == 0) || (fluid == BOPCFluids.honey && world.getBlockMetadata(x, y, z) == 7))
 			{
 				bopBucket.fill(bopBucketStack, new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME), true);
 

src/main/java/biomesoplenty/common/fluids/BloodFluid.java

@@ -0,0 +1,14 @@
+package biomesoplenty.common.fluids;
+
+import net.minecraftforge.fluids.Fluid;
+import biomesoplenty.common.fluids.blocks.BlockBloodFluid;
+
+public class BloodFluid extends Fluid
+{
+	public BloodFluid(String fluidName) 
+	{
+		super(fluidName);
+
+		this.setIcons(BlockBloodFluid.bloodStillIcon, BlockBloodFluid.bloodFlowingIcon);
+	}
+}

src/main/java/biomesoplenty/common/fluids/HoneyFluid.java

@@ -1,8 +1,7 @@
 package biomesoplenty.common.fluids;
 
-import biomesoplenty.common.fluids.blocks.BlockPoisonFluid;
-import biomesoplenty.common.fluids.blocks.BlockSpringWaterFluid;
 import net.minecraftforge.fluids.Fluid;
+import biomesoplenty.common.fluids.blocks.BlockPoisonFluid;
 
 public class HoneyFluid extends Fluid
 {

src/main/java/biomesoplenty/common/fluids/SpringWaterFluid.java

@@ -1,15 +0,0 @@
-package biomesoplenty.common.fluids;
-
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.Fluid;
-import biomesoplenty.common.fluids.blocks.BlockSpringWaterFluid;
-
-public class SpringWaterFluid extends Fluid
-{
-	public SpringWaterFluid(String fluidName) 
-	{
-		super(fluidName);
-
-		this.setIcons(BlockSpringWaterFluid.springWaterStillIcon, BlockSpringWaterFluid.springWaterFlowingIcon);
-	}
-}

src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java

@@ -0,0 +1,43 @@
+package biomesoplenty.common.fluids.blocks;
+
+import java.util.Random;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.FluidRegistry;
+import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.common.configuration.BOPConfigurationMisc;
+
+public class BlockBloodFluid extends BlockFluidClassic
+{
+	public static IIcon bloodStillIcon;
+	public static IIcon bloodFlowingIcon;
+
+	public BlockBloodFluid() 
+	{
+		//TODO:											  water
+		super(FluidRegistry.getFluid("blood"), Material.water);
+	}
+
+	@Override
+	//TODO:		registerIcons()
+	public void registerBlockIcons(IIconRegister iconRegister)
+	{
+		bloodStillIcon = iconRegister.registerIcon("biomesoplenty:blood_still");
+		bloodFlowingIcon = iconRegister.registerIcon("biomesoplenty:blood_flowing");
+	}
+
+	@Override
+	//TODO:		 getIcon()
+	public IIcon getIcon(int side, int meta)
+	{
+		return side != 0 && side != 1 ? bloodFlowingIcon : bloodStillIcon;
+	}
+}

src/main/java/biomesoplenty/common/fluids/blocks/BlockSpringWaterFluid.java

@@ -1,71 +0,0 @@
-package biomesoplenty.common.fluids.blocks;
-
-import java.util.Random;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.FluidRegistry;
-import biomesoplenty.BiomesOPlenty;
-import biomesoplenty.common.configuration.BOPConfigurationMisc;
-
-public class BlockSpringWaterFluid extends BlockFluidClassic
-{
-	public static IIcon springWaterStillIcon;
-	public static IIcon springWaterFlowingIcon;
-
-	public BlockSpringWaterFluid() 
-	{
-		//TODO:											  water
-		super(FluidRegistry.getFluid("spring_water"), Material.water);
-	}
-
-    @Override
-    //TODO: 	randomDisplayTick()
-    public void randomDisplayTick(World world, int x, int y, int z, Random random)
-    {
-    	super.randomDisplayTick(world, x, y, z, random);
-
-    	if (random.nextInt(1) == 0)
-    	{
-    		BiomesOPlenty.proxy.spawnParticle("steam", x + random.nextFloat(), y + 1.0F, z + random.nextFloat());
-    	}
-    }
-	
-	@Override
-	//TODO:		onEntityCollidedWithBlock()
-	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
-	{
-		int meta = world.getBlockMetadata(x, y, z);
-
-		if (!world.isRemote && BOPConfigurationMisc.hotSpringsRegeneration)
-		{
-			if (entity instanceof EntityLivingBase) 
-			{
-				if (!((EntityLivingBase)entity).isPotionActive(Potion.regeneration.id))
-					((EntityLivingBase)entity).addPotionEffect(new PotionEffect(Potion.regeneration.id, 50));
-			}
-		}
-	}
-
-	@Override
-	//TODO:		registerIcons()
-	public void registerBlockIcons(IIconRegister iconRegister)
-	{
-		springWaterStillIcon = iconRegister.registerIcon("biomesoplenty:spring_water_still");
-		springWaterFlowingIcon = iconRegister.registerIcon("biomesoplenty:spring_water_flowing");
-	}
-
-	@Override
-	//TODO:		 getIcon()
-	public IIcon getIcon(int side, int meta)
-	{
-		return side != 0 && side != 1 ? springWaterFlowingIcon : springWaterStillIcon;
-	}
-}

src/main/java/biomesoplenty/common/items/ItemBOPBucket.java

@@ -130,6 +130,8 @@ public class ItemBOPBucket extends ItemFluidContainer
 		
 		this.fill(fluid, new FluidStack(BOPCFluids.poison, FluidContainerRegistry.BUCKET_VOLUME), true); list.add(fluid);
 		fluid = new ItemStack(item);
+		this.fill(fluid, new FluidStack(BOPCFluids.blood, FluidContainerRegistry.BUCKET_VOLUME), true); list.add(fluid);
+		fluid = new ItemStack(item);
 		this.fill(fluid, new FluidStack(BOPCFluids.honey, FluidContainerRegistry.BUCKET_VOLUME), true); list.add(fluid);
 	}
 	
@@ -138,6 +140,7 @@ public class ItemBOPBucket extends ItemFluidContainer
 	{
 		bucketIcons.put("poison", iconRegister.registerIcon("biomesoplenty:bucket_poison"));
 		bucketIcons.put("honey", iconRegister.registerIcon("biomesoplenty:bucket_honey"));
+		bucketIcons.put("blood", iconRegister.registerIcon("biomesoplenty:bucket_blood"));
 	}
     
     @Override

src/main/java/biomesoplenty/common/world/forcedgenerators/SpringForcedGenerator.java

@@ -36,6 +36,15 @@ public class SpringForcedGenerator extends ForcedWorldFeatureBOP
 
                 this.generate(world, random, randX, randY, randZ);
             }
+            
+            for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature("bloodSpringsPerChunk"); ++i)
+            {
+                int randX = x + random.nextInt(16) + 8;
+                int randY = random.nextInt(random.nextInt(random.nextInt(112) + 8) + 8);
+                int randZ = z + random.nextInt(16) + 8;
+
+                this.generate(world, random, randX, randY, randZ);
+            }
         }
     }
 }

src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java

@@ -137,10 +137,12 @@ public class WorldGenFieldAssociation
     {
         associateFeatureForced("waterSpringsPerChunk", new WorldGenLiquids(Blocks.flowing_water), SpringForcedGenerator.class);
         associateFeatureForced("lavaSpringsPerChunk", new WorldGenLiquids(Blocks.flowing_lava), SpringForcedGenerator.class);
+        //associateFeatureForced("bloodSpringsPerChunk", new WorldGenLiquids(BOPCBlocks.blood), SpringForcedGenerator.class);
 
         associateFeatureForced("waterLakesPerChunk", new WorldGenLakes(Blocks.water), LakesForcedGenerator.class);
         associateFeatureForced("lavaLakesPerChunk", new WorldGenLakes(Blocks.lava), LakesForcedGenerator.class);
         associateFeatureForced("poisonLakesPerChunk", new WorldGenLakes(BOPCBlocks.poison), LakesForcedGenerator.class);
+        associateFeatureForced("bloodLakesPerChunk", new WorldGenLakes(BOPCBlocks.blood), LakesForcedGenerator.class);
 
         associateFeatureForced("generateMelons", new WorldGenMelon(), MelonForcedGenerator.class);
     }

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

@@ -392,14 +392,15 @@ item.biomeFinder.name=Biome Radar
 item.biomeEssence.name=Biome Essence
 
 item.poisonBucket.name=Poison Bucket
+item.bloodBucket.name=Blood Bucket
 item.honeyBucket.name=Honey Bucket
 
 tile.poison.name=Poison
-tile.springWater.name=Spring Water
+tile.blood.name=Blood
 tile.honey.name=Honey
 
 fluid.poison=Poison
-fluid.springWater=Spring Water
+fluid.blood=Blood
 fluid.honey=Honey
 
 biomeRadar.target=Target:

src/main/resources/assets/biomesoplenty/textures/blocks/spring_water_still.txt

@@ -1,32 +0,0 @@
-0*2
-1*2
-2*2
-3*2
-4*2
-5*2
-6*2
-7*2
-8*2
-9*2
-10*2
-11*2
-12*2
-13*2
-14*2
-15*2
-16*2
-17*2
-18*2
-19*2
-20*2
-21*2
-22*2
-23*2
-24*2
-25*2
-26*2
-27*2
-28*2
-29*2
-30*2
-31*2