Rename from Liquids to Fluids

src/minecraft/biomesoplenty/BiomesOPlenty.java

@@ -9,7 +9,7 @@ import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.configuration.BOPCrafting;
 import biomesoplenty.configuration.BOPEntities;
 import biomesoplenty.configuration.BOPItems;
-import biomesoplenty.configuration.BOPLiquids;
+import biomesoplenty.configuration.BOPFluids;
 import biomesoplenty.configuration.BOPPotions;
 import biomesoplenty.configuration.BOPVanillaCompat;
 import biomesoplenty.handlers.BOPCraftHandler;
@@ -65,7 +65,7 @@ public class BiomesOPlenty
 		BOPPotions.init();
 		BOPBlocks.init();
 		BOPItems.init();
-		BOPLiquids.init();
+		BOPFluids.init();
 		BOPCrafting.init();
 		BOPBiomes.init();
 		BOPEntities.init();

src/minecraft/biomesoplenty/api/Fluids.java

@@ -6,7 +6,7 @@ import net.minecraftforge.fluids.Fluid;
 
 import com.google.common.base.Optional;
 
-public class Liquids
+public class Fluids
 {
 	public static Optional<? extends Item> 	bopBucket         		        = Optional.absent();
 

src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -43,7 +43,7 @@ import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
 import net.minecraftforge.event.terraingen.OreGenEvent;
 import net.minecraftforge.event.terraingen.TerrainGen;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.worldgen.WorldGenAlgae;
 import biomesoplenty.worldgen.WorldGenAsh;
 import biomesoplenty.worldgen.WorldGenBOPFlowers;
@@ -630,7 +630,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 			 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
 			 var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8);
 			 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
-			 (new WorldGenLakes(Liquids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
+			 (new WorldGenLakes(Fluids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
 		 }
 
 		 for (var2 = 0; var2 < 5; ++var2)
@@ -642,7 +642,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 				 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
 				 var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8);
 				 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
-				 (new WorldGenLakes(Liquids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
+				 (new WorldGenLakes(Fluids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
 			 }
 		 }
 
@@ -651,7 +651,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 			 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
 			 var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8);
 			 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
-			 (new WorldGenLakes(Liquids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
+			 (new WorldGenLakes(Fluids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
 		 }
 		 
 		 for (var2 = 0; var2 < 5; ++var2)
@@ -663,7 +663,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 				 var3 = chunk_X + randomGenerator.nextInt(16) + 8;
 				 var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8);
 				 var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
-				 (new WorldGenLakes(Liquids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
+				 (new WorldGenLakes(Fluids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5);
 			 }
 		 }
 

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java

@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedShrub;
 import biomesoplenty.worldgen.WorldGenPromisedTree;
@@ -45,7 +45,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
 		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Fluids.springWater.get().blockID, 8);
 		/*this.spawnableMonsterList.add(new SpawnListEntry(EntityCow.class, 6, 1, 4));
 
 		if (Loader.isModLoaded("TwilightForest"))

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java

@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedBush;
 import biomesoplenty.worldgen.WorldGenWaterSpring;
@@ -40,7 +40,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Fluids.springWater.get().blockID, 8);
 
 		/*if (Loader.isModLoaded("TwilightForest"))
 		{

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java

@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedTree;
 import biomesoplenty.worldgen.WorldGenPromisedWillowTree;
@@ -45,7 +45,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
 		customBiomeDecorator.generatePumpkins = false;
 		//this.customBiomeDecorator.generateClouds = true;
 		//this.customBiomeDecorator.generateLakes = false;
-		theWorldGenerator = new WorldGenWaterSpring(Liquids.springWater.get().blockID, 8);
+		theWorldGenerator = new WorldGenWaterSpring(Fluids.springWater.get().blockID, 8);
 		/*this.spawnableMonsterList.add(new SpawnListEntry(EntityPig.class, 4, 1, 4));
 
 		if (Loader.isModLoaded("TwilightForest"))

src/minecraft/biomesoplenty/configuration/BOPFluids.java

@@ -0,0 +1,58 @@
+package biomesoplenty.configuration;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import biomesoplenty.api.Fluids;
+import biomesoplenty.fluids.BlockFluidLiquidPoison;
+import biomesoplenty.fluids.BlockFluidSpringWater;
+import biomesoplenty.fluids.LiquidPoisonFluid;
+import biomesoplenty.fluids.SpringWaterFluid;
+import biomesoplenty.items.ItemBOPBucket;
+
+import com.google.common.base.Optional;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BOPFluids
+{
+	public static void init()
+	{
+		registerFluids();
+		initializeLiquids();
+		initializeContainers();
+		registerBlocks();
+	}
+
+	private static void registerFluids()
+	{
+		Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("Liquid Poison").setBlockID(BOPConfiguration.liquidPoisonStillID));
+		FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get());
+
+		Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("Spring Water").setBlockID(BOPConfiguration.springWaterStillID));
+		FluidRegistry.registerFluid(Fluids.springWaterFluid.get());
+	}
+
+	private static void initializeLiquids()
+	{
+		Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison"));
+
+		Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater"));
+	}
+
+	private static void initializeContainers()
+	{
+		Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket").setContainerItem(Item.bucketEmpty)));
+		
+		FluidContainerRegistry.registerFluidContainer(Fluids.liquidPoisonFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 2), new ItemStack(Item.bucketEmpty));
+		FluidContainerRegistry.registerFluidContainer(Fluids.springWaterFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 1), new ItemStack(Fluids.bopBucket.get(), 1, 0));
+	}
+
+	private static void registerBlocks()
+	{
+		GameRegistry.registerBlock(Fluids.liquidPoison.get(), "liquidPoison");
+		GameRegistry.registerBlock(Fluids.springWater.get(), "springWater");
+	}
+}

src/minecraft/biomesoplenty/configuration/BOPLiquids.java

@@ -1,58 +0,0 @@
-package biomesoplenty.configuration;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
-import biomesoplenty.api.Liquids;
-import biomesoplenty.items.ItemBOPBucket;
-import biomesoplenty.liquids.BlockFluidLiquidPoison;
-import biomesoplenty.liquids.BlockFluidSpringWater;
-import biomesoplenty.liquids.LiquidPoisonFluid;
-import biomesoplenty.liquids.SpringWaterFluid;
-
-import com.google.common.base.Optional;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class BOPLiquids
-{
-	public static void init()
-	{
-		registerFluids();
-		initializeLiquids();
-		initializeContainers();
-		registerBlocks();
-	}
-
-	private static void registerFluids()
-	{
-		Liquids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("Liquid Poison").setBlockID(BOPConfiguration.liquidPoisonStillID));
-		FluidRegistry.registerFluid(Liquids.liquidPoisonFluid.get());
-
-		Liquids.springWaterFluid = Optional.of(new SpringWaterFluid("Spring Water").setBlockID(BOPConfiguration.springWaterStillID));
-		FluidRegistry.registerFluid(Liquids.springWaterFluid.get());
-	}
-
-	private static void initializeLiquids()
-	{
-		Liquids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.liquidPoisonStillID, Liquids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison"));
-
-		Liquids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Liquids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater"));
-	}
-
-	private static void initializeContainers()
-	{
-		Liquids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket").setContainerItem(Item.bucketEmpty)));
-		
-		FluidContainerRegistry.registerFluidContainer(Liquids.liquidPoisonFluid.get(), new ItemStack(Liquids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty));
-		FluidContainerRegistry.registerFluidContainer(Liquids.springWaterFluid.get(), new ItemStack(Liquids.bopBucket.get(), 1, 0), new ItemStack(Item.bucketEmpty));
-	}
-
-	private static void registerBlocks()
-	{
-		GameRegistry.registerBlock(Liquids.liquidPoison.get(), "liquidPoison");
-		GameRegistry.registerBlock(Liquids.springWater.get(), "springWater");
-	}
-}

src/minecraft/biomesoplenty/fluids/BlockFluidLiquidPoison.java

@@ -1,4 +1,4 @@
-package biomesoplenty.liquids;
+package biomesoplenty.fluids;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java

@@ -1,4 +1,4 @@
-package biomesoplenty.liquids;
+package biomesoplenty.fluids;
 
 import java.util.Random;
 
@@ -18,7 +18,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import biomesoplenty.BiomesOPlenty;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -37,7 +37,7 @@ public class BlockFluidSpringWater extends BlockFluidClassic
 			displacementIds.put(i, false);
 		}
 
-		displacementIds.put(Liquids.liquidPoison.get().blockID, false);
+		displacementIds.put(Fluids.liquidPoison.get().blockID, false);
 	}
 
 	@Override

src/minecraft/biomesoplenty/fluids/LiquidPoisonFluid.java

@@ -1,4 +1,4 @@
-package biomesoplenty.liquids;
+package biomesoplenty.fluids;
 
 import net.minecraft.util.Icon;
 import net.minecraftforge.fluids.Fluid;

src/minecraft/biomesoplenty/fluids/SpringWaterFluid.java

@@ -1,4 +1,4 @@
-package biomesoplenty.liquids;
+package biomesoplenty.fluids;
 
 import net.minecraft.util.Icon;
 import net.minecraftforge.fluids.Fluid;

src/minecraft/biomesoplenty/handlers/BOPLiquidEventHandler.java

@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 
 public class BOPLiquidEventHandler
 {
@@ -28,18 +28,18 @@ public class BOPLiquidEventHandler
 		int blockID = world.getBlockId(pos.blockX, pos.blockY, pos.blockZ);
 		int meta = world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ);
 
-		if ((blockID == Liquids.springWater.get().blockID) && meta == 0)
+		if ((blockID == Fluids.springWater.get().blockID) && meta == 0)
 		{
 			world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0);
 
 			return new ItemStack(Item.bucketWater);
 		}
 
-		if ((blockID == Liquids.liquidPoison.get().blockID) && meta == 0)
+		if ((blockID == Fluids.liquidPoison.get().blockID) && meta == 0)
 		{
 			world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0);
 
-			return new ItemStack(Liquids.bopBucket.get(), 1, 2);
+			return new ItemStack(Fluids.bopBucket.get(), 1, 2);
 		} 
 		else
 		{

src/minecraft/biomesoplenty/helpers/AchievementHelper.java

@@ -17,7 +17,7 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import biomesoplenty.api.Biomes;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Items;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
@@ -185,7 +185,7 @@ public class AchievementHelper
 		achGrove = (new Achievement(3111, "achGrove", 4, -2, new ItemStack(Blocks.flowers.get(), 1, 0), achBOP)).registerAchievement();
 		achHeathland = (new Achievement(3112, "achHeathland", 6, -2, new ItemStack(Blocks.saplings.get(), 1, 14), achBOP)).registerAchievement(); 	
 		achHighland = (new Achievement(3113, "achHighland", 8, -2, new ItemStack(Blocks.foliage.get(), 1, 3), achBOP)).registerAchievement();
-		achHotSprings = (new Achievement(3114, "achHotSprings", 10, -2, new ItemStack(Liquids.bopBucket.get(), 1, 0), achBOP)).registerAchievement();
+		achHotSprings = (new Achievement(3114, "achHotSprings", 10, -2, new ItemStack(Fluids.bopBucket.get(), 1, 0), achBOP)).registerAchievement();
 		
 		achIcyHills = (new Achievement(3115, "achIcyHills", -10, 0, new ItemStack(Block.ice, 1, 0), achBOP)).registerAchievement().setSpecial();  
 		achJadeCliffs = (new Achievement(3116, "achJadeCliffs", -8, 0, new ItemStack(Blocks.colorizedSaplings.get(), 1, 5), achBOP)).registerAchievement(); 

src/minecraft/biomesoplenty/integration/BCIntegration.java

@@ -4,7 +4,7 @@ import java.lang.reflect.Method;
 
 import biomesoplenty.api.Biomes;
 import biomesoplenty.api.BlockReferences;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import cpw.mods.fml.common.event.FMLInterModComms;
 
 public class BCIntegration {
@@ -97,8 +97,8 @@ public class BCIntegration {
 			
 			Method method = bcUtils.getMethod("liquidId", int.class);
 			
-			method.invoke(bcUtils, Liquids.springWaterFluid.get().getBlockID());
+			method.invoke(bcUtils, Fluids.springWaterFluid.get().getBlockID());
-			method.invoke(bcUtils, Liquids.liquidPoisonFluid.get().getBlockID());
+			method.invoke(bcUtils, Fluids.liquidPoisonFluid.get().getBlockID());
 		} 
 		catch (Exception e) 
 		{

src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java

@@ -7,7 +7,7 @@ import thaumcraft.api.ThaumcraftApi;
 import biomesoplenty.api.BlockReferences;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Items;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import biomesoplenty.blocks.BlockBOPAmethyst;
 import cpw.mods.fml.common.event.FMLInterModComms;
 
@@ -159,8 +159,8 @@ public class ThaumcraftIntegration {
 		/*Mudbrick*/ThaumcraftApi.registerObjectTag(Items.miscItems.get().itemID, 0, (new ObjectTags()).add(EnumTag.EARTH, 2).add(EnumTag.FIRE, 1));
 		/*Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 0, (new ObjectTags()).add(EnumTag.WEAPON, 1));
 		/*Poison Dart*/ThaumcraftApi.registerObjectTag(Items.dart.get().itemID, 1, (new ObjectTags()).add(EnumTag.PLANT, 2).add(EnumTag.WEAPON, 2));
-		/*Spring Water Bucket*/ThaumcraftApi.registerObjectTag(Liquids.bopBucket.get().itemID, 0, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4).add(EnumTag.LIFE, 2).add(EnumTag.HEAL, 4));
+		/*Spring Water Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 0, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4).add(EnumTag.LIFE, 2).add(EnumTag.HEAL, 4));
-		/*Liquid Poison Bucket*/ThaumcraftApi.registerObjectTag(Liquids.bopBucket.get().itemID, 1, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 2).add(EnumTag.WEAPON, 4).add(EnumTag.POISON, 4));
+		/*Liquid Poison Bucket*/ThaumcraftApi.registerObjectTag(Fluids.bopBucket.get().itemID, 1, (new ObjectTags()).add(EnumTag.METAL, 13).add(EnumTag.VOID, 1).add(EnumTag.WATER, 2).add(EnumTag.WEAPON, 4).add(EnumTag.POISON, 4));
 		ThaumcraftApi.registerObjectTag(Items.berries.get().itemID, 0, (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.LIFE, 1));
 		ThaumcraftApi.registerObjectTag(Items.sunflowerSeeds.get().itemID, 0, (new ObjectTags()).add(EnumTag.PLANT, 1).add(EnumTag.EXCHANGE, 1));
 		ThaumcraftApi.registerObjectTag(Items.mudball.get().itemID, 0, (new ObjectTags()).add(EnumTag.WATER, 1).add(EnumTag.EARTH, 2));

src/minecraft/biomesoplenty/items/ItemBOPBucket.java

@@ -12,7 +12,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import biomesoplenty.BiomesOPlenty;
-import biomesoplenty.api.Liquids;
+import biomesoplenty.api.Fluids;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -102,7 +102,7 @@ public class ItemBOPBucket extends Item
 						if (par1ItemStack.getItemDamage() != 1)
 							return new ItemStack(Item.bucketEmpty);
 						else
-							return new ItemStack(Liquids.bopBucket.get(), 1, 0);
+							return new ItemStack(Fluids.bopBucket.get(), 1, 0);
 					}
 				}
 			}
@@ -122,7 +122,7 @@ public class ItemBOPBucket extends Item
 			return false;
 		else
 		{
-			if (par1World.provider.isHellWorld && isFull == Liquids.springWater.get().blockID)
+			if (par1World.provider.isHellWorld && isFull == Fluids.springWater.get().blockID)
 			{
 				par1World.playSoundEffect(par2 + 0.5D, par4 + 0.5D, par6 + 0.5D, "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F);
 
@@ -145,13 +145,13 @@ public class ItemBOPBucket extends Item
 		switch (meta)
 		{
 			case 1:
-				return Liquids.springWater.get().blockID;
+				return Fluids.springWater.get().blockID;
 
 			case 2:
-				return Liquids.liquidPoison.get().blockID;
+				return Fluids.liquidPoison.get().blockID;
 
 			default:
-				return Liquids.liquidPoison.get().blockID;
+				return Fluids.liquidPoison.get().blockID;
 		}
 	}