Made Spring Water no longer able to be picked up by hand (results in regular water)

This commit is contained in:
Adubbz 2013-07-04 16:19:37 +10:00
parent d73cb58325
commit 5cf4d7515e
4 changed files with 1 additions and 13 deletions

View File

@ -14,7 +14,6 @@ import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenFungi;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenSwampTall;
import biomesoplenty.worldgen.WorldGenThickTree2;
import biomesoplenty.worldgen.WorldGenThickTree3;

View File

@ -10,7 +10,6 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenMystic1;
import biomesoplenty.worldgen.WorldGenMystic2;
import biomesoplenty.worldgen.WorldGenMystic3;

View File

@ -20,7 +20,6 @@ public class BOPConfiguration {
public static boolean dungeonLoot;
public static boolean vanillaEnhanced;
public static boolean netherOverride;
public static boolean springWaterPickup;
public static boolean rainCreatesPuddles;
public static int villageDistance;
@ -505,7 +504,6 @@ public class BOPConfiguration {
biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4, "Default World Type has 4. Large Biomes World Type has 6.").getInt();
achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false);
dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false);
springWaterPickup = config.get("Miscellanious Settings", "Enable Spring Water Pickup", false).getBoolean(true);
vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false);
promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt();
netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true);

View File

@ -12,7 +12,6 @@ import net.minecraftforge.event.entity.player.FillBucketEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.liquids.LiquidDictionary;
import biomesoplenty.api.Liquids;
import biomesoplenty.configuration.BOPConfiguration;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -52,14 +51,7 @@ public class BOPLiquidHelper
{
world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0);
if (BOPConfiguration.springWaterPickup)
{
return new ItemStack(Liquids.bopBucket.get(), 1, 0);
}
else
{
return new ItemStack(Item.bucketWater);
}
return new ItemStack(Item.bucketWater);
}
if ((blockID == Liquids.liquidPoison.get().blockID) && meta == 0)