Fixed a few more things, down to 984 errors

src/main/java/biomesoplenty/api/biome/BOPBiome.java

@@ -51,7 +51,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome
     public boolean canGenerateVillages = true;
     public boolean canGenerateRivers = true;
     
-    public int beachBiomeId = Biomes.beach.biomeID;
+    public int beachBiomeId = BiomeGenBase.getIdForBiome(Biomes.beach);
     
     public TerrainSettings terrainSettings = new TerrainSettings();
     public boolean noNeighborTerrainInfuence = false;
@@ -89,7 +89,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome
         this.fillerBlock = conf.getBlockState("fillerBlock", this.fillerBlock);
         this.seaFloorBlock = conf.getBlockState("seaFloorBlock", this.seaFloorBlock);
         
-        this.minHeight = conf.getFloat("rootHeight", this.minHeight);
+        this.minHeight = conf.getFloat("rootHeight", this.getBaseHeight());
         this.maxHeight = conf.getFloat("variation", this.maxHeight);
         this.temperature = conf.getFloat("temperature", this.temperature);
         this.rainfall = conf.getFloat("rainfall", this.rainfall);

src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java

@@ -16,6 +16,7 @@ import java.util.Random;
 import biomesoplenty.api.biome.BOPBiome;
 import biomesoplenty.api.item.BOPItems;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
@@ -31,7 +32,7 @@ public class BlockBOPBiomeBlock extends BlockBOPGeneric
     public BlockBOPBiomeBlock() {
         super(Material.glass);
         this.setHardness(0.6F);
-        this.setStepSound(Block.soundTypeGlass);
+        this.setStepSound(SoundType.GLASS);
     }
     
     // list of biomes which have an associated essence (possible drops when this block is broken)

src/main/java/biomesoplenty/common/block/BlockBOPBones.java

@@ -11,6 +11,7 @@ package biomesoplenty.common.block;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -82,7 +83,7 @@ public class BlockBOPBones extends Block implements IBOPBlock
         // set some defaults
         this.setHardness(3.0F);
         this.setResistance(5.0F);
-        this.setStepSound(Block.soundTypeStone);
+        this.setStepSound(SoundType.STONE);
      
         this.setDefaultState(this.blockState.getBaseState().withProperty(AXIS, EnumFacing.Axis.Y).withProperty(VARIANT, BoneType.LARGE));
     }

src/main/java/biomesoplenty/common/block/BlockBOPCoral.java

@@ -12,6 +12,7 @@ import static net.minecraft.block.BlockLiquid.LEVEL;
 
 import biomesoplenty.api.block.BlockQueries;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -67,7 +68,7 @@ public class BlockBOPCoral extends BlockBOPDecoration
         
         // set some defaults
         this.setHardness(0.6F);
-        this.setStepSound(Block.soundTypeSand);
+        this.setStepSound(SoundType.SAND);
         this.setDefaultState( this.blockState.getBaseState().withProperty(LEVEL, 15).withProperty(VARIANT, CoralType.PINK) );       
 
     }

src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java

@@ -14,6 +14,7 @@ import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -45,7 +46,7 @@ public class BlockBOPCrystal extends Block implements IBOPBlock
         this.setHardness(0.15F);
         this.setResistance(5.0F);
         this.setLightLevel(1.0F);
-        this.setStepSound(Block.soundTypeGlass);
+        this.setStepSound(SoundType.GLASS);
     }
     
     @Override

src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java

@@ -13,6 +13,7 @@ import java.util.Random;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -54,7 +55,7 @@ public class BlockBOPDecoration extends Block implements IBOPBlock
         // set some defaults
         this.setTickRandomly(true);
         this.setHardness(0.0F);
-        this.setStepSound(Block.soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
 
         this.setDefaultState(this.blockState.getBaseState());     
     }

src/main/java/biomesoplenty/common/block/BlockBOPDirt.java

@@ -16,6 +16,7 @@ import biomesoplenty.api.block.ISustainsPlantType;
 import biomesoplenty.common.item.ItemBOPBlock;
 import biomesoplenty.common.util.block.VariantPagingHelper;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -76,7 +77,7 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType
         this.setTickRandomly(true);
         this.setHardness(0.5F);
         this.setHarvestLevel("shovel", 0);
-        this.setStepSound(Block.soundTypeGravel);
+        this.setStepSound(SoundType.GROUND);
         this.setDefaultState( this.blockState.getBaseState().withProperty(COARSE, Boolean.valueOf(false)).withProperty(VARIANT, BOPDirtType.LOAMY) );
 
     }

src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java

@@ -18,6 +18,7 @@ import biomesoplenty.common.enums.BOPPlants;
 import biomesoplenty.common.util.block.BlockStateUtils;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockStateBase;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -56,7 +57,7 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
     };
     public static final PropertyEnum VARIANT = PropertyEnum.create("variant", DoublePlantType.class);
     @Override
-    protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { HALF, VARIANT });}
+    protected BlockState createBlockState() {return new BlockStateBase(this, new IProperty[] { HALF, VARIANT });}
     
     
     // implement IBOPBlock

src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java

@@ -17,6 +17,7 @@ import biomesoplenty.common.util.block.VariantPagingHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirt;
 import net.minecraft.block.BlockFarmland;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -86,7 +87,7 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock
         this.useNeighborBrightness = true;
         this.setHardness(0.6F);
         this.setHarvestLevel("shovel", 0);
-        this.setStepSound(soundTypeGravel);
+        this.setStepSound(SoundType.GROUND);
         this.setDefaultState(this.blockState.getBaseState().withProperty(MOISTURE, Integer.valueOf(0)));
     }
 

src/main/java/biomesoplenty/common/block/BlockBOPFence.java

@@ -15,6 +15,7 @@ import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.enums.BOPWoods;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.BlockFence;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -61,7 +62,7 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock
         
         this.setHardness(2.0F);
         this.setResistance(5.0F);
-        this.setStepSound(soundTypeWood);
+        this.setStepSound(SoundType.WOOD);
     }
     
     @Override

src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java

@@ -16,6 +16,7 @@ import biomesoplenty.common.enums.BOPWoods;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.BlockFenceGate;
 import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -64,7 +65,7 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
         
         this.setHardness(2.0F);
         this.setResistance(5.0F);
-        this.setStepSound(soundTypeWood);
+        this.setStepSound(SoundType.WOOD);
     }
     
     public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face)

src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java

@@ -14,6 +14,7 @@ import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -47,7 +48,7 @@ public class BlockBOPFlesh extends Block implements IBOPBlock
     public BlockBOPFlesh() {
         super(Material.sponge);
         this.setHardness(0.4F);
-        this.setStepSound(Block.soundTypeGravel);
+        this.setStepSound(SoundType.GROUND);
     }
     
     @Override

src/main/java/biomesoplenty/common/block/BlockBOPGem.java

@@ -12,6 +12,7 @@ import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.enums.BOPGems;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -49,7 +50,7 @@ public class BlockBOPGem extends Block implements IBOPBlock
         // set some defaults
         this.setHardness(5.0F);
         this.setResistance(10.0F);
-        this.setStepSound(Block.soundTypeMetal);
+        this.setStepSound(SoundType.METAL);
         this.setHarvestLevel("pickaxe", 2);
         this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, BOPGems.AMETHYST) );        
     }

src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java

@@ -18,6 +18,7 @@ import biomesoplenty.common.enums.BOPGems;
 import biomesoplenty.common.item.ItemBOPBlock;
 import biomesoplenty.common.util.block.BlockStateUtils;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -59,7 +60,7 @@ public class BlockBOPGemOre extends Block implements IBOPBlock
         // set some defaults
         this.setHardness(3.0F);
         this.setResistance(5.0F);
-        this.setStepSound(Block.soundTypePiston);        
+        this.setStepSound(SoundType.STONE);        
         this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, BOPGems.AMETHYST) );
 
         // all variants need pickaxe:2 to harvest, except amethyst which needs pickaxe:3

src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java

@@ -15,6 +15,7 @@ import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.api.block.ISustainsPlantType;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -50,7 +51,7 @@ public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantT
         super(material);
         // set some defaults
         this.setHardness(1.0F);
-        this.setStepSound(Block.soundTypePiston);
+        this.setStepSound(SoundType.STONE);
     }
     
     

src/main/java/biomesoplenty/common/block/BlockBOPGrass.java

@@ -18,6 +18,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirt;
 import net.minecraft.block.BlockGrass;
 import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -92,7 +93,7 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla
         // set some defaults
         this.setHardness(0.6F);
         this.setHarvestLevel("shovel", 0);
-        this.setStepSound(Block.soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
         this.setDefaultState(this.blockState.getBaseState().withProperty(SNOWY, Boolean.valueOf(false)).withProperty(VARIANT, BOPGrassType.LOAMY));
         
     }

src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java

@@ -17,6 +17,7 @@ import biomesoplenty.common.enums.BOPWoods;
 import biomesoplenty.common.util.block.BlockStateUtils;
 import biomesoplenty.common.util.block.VariantPagingHelper;
 import net.minecraft.block.BlockSlab;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -88,7 +89,7 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock
     {
         super(Material.wood);
         this.useNeighborBrightness = true;
-        this.setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood);
+        this.setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD);
         this.setHarvestLevel("axe", 0);
         this.setDefaultState(this.blockState.getBaseState().withProperty(HALF, BlockSlab.EnumBlockHalf.BOTTOM));
     }

src/main/java/biomesoplenty/common/block/BlockBOPHive.java

@@ -15,6 +15,7 @@ import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.common.entities.EntityWasp;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -69,7 +70,7 @@ public class BlockBOPHive extends Block implements IBOPBlock
                 
         // set some defaults
         this.setHardness(0.5F);
-        this.setStepSound(Block.soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
         this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, HiveType.HIVE) );
     }
 

src/main/java/biomesoplenty/common/block/BlockBOPHoney.java

@@ -11,6 +11,7 @@ package biomesoplenty.common.block;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -36,7 +37,7 @@ public class BlockBOPHoney extends Block implements IBOPBlock
     public BlockBOPHoney() {
         super(Material.glass);
         this.setHardness(0.5F);
-        this.setStepSound(soundTypePiston);
+        this.setStepSound(SoundType.STONE);
     }
     
     @Override

src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java

@@ -11,6 +11,7 @@ package biomesoplenty.common.block;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPLilypad;
 import net.minecraft.block.BlockLilyPad;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
@@ -66,7 +67,7 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock
     
     public BlockBOPLilypad()
     {        
-        this.setStepSound(soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
         this.setDefaultState(this.blockState.getBaseState().withProperty(VARIANT, LilypadType.MEDIUM));
     }
     

src/main/java/biomesoplenty/common/block/BlockBOPMud.java

@@ -15,6 +15,7 @@ import biomesoplenty.api.block.ISustainsPlantType;
 import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -77,7 +78,7 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType
         
         // set some defaults
         this.setHardness(0.6F);
-        this.setStepSound(Block.soundTypeSand);
+        this.setStepSound(SoundType.SAND);
         this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, MudType.MUD) );
         
     }    

src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java

@@ -13,6 +13,7 @@ import biomesoplenty.common.enums.BOPWoods;
 import biomesoplenty.common.item.ItemBOPBlock;
 import biomesoplenty.common.util.block.VariantPagingHelper;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
@@ -79,7 +80,8 @@ public class BlockBOPPlanks extends Block implements IBOPBlock
     {
         super(Material.wood);
         this.setDefaultState(this.blockState.getBaseState());
-        this.setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood);
+        this.setHardness(2.0F).setResistance(5.0F);
+        this.setStepSound(SoundType.WOOD);
         this.setHarvestLevel("axe", 0);
     }
     

src/main/java/biomesoplenty/common/block/BlockBOPSand.java

@@ -13,6 +13,7 @@ import biomesoplenty.api.block.ISustainsPlantType;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -71,7 +72,7 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl
         
         // set some defaults
         this.setHardness(0.6F);
-        this.setStepSound(Block.soundTypeSand);
+        this.setStepSound(SoundType.SAND);
         this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, SandType.QUICKSAND) );
         
     }

src/main/java/biomesoplenty/common/block/BlockBOPSapling.java

@@ -27,6 +27,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockOldLeaf;
 import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.IGrowable;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
@@ -93,7 +94,7 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable {
     public BlockBOPSapling()
     {
         super();
-        this.setStepSound(Block.soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
         this.setBlockBoundsByRadiusAndHeight(0.4F, 0.8F);
         this.setDefaultState(this.blockState.getBaseState().withProperty(STAGE, Integer.valueOf(0)));
     }

src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java

@@ -14,6 +14,7 @@ import biomesoplenty.api.block.BlockQueries;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
@@ -88,7 +89,7 @@ public class BlockBOPSeaweed extends BlockBOPDecoration implements IBOPBlock
         super(Material.water);
         
         // set some defaults
-        this.setStepSound(Block.soundTypeSand);
+        this.setStepSound(SoundType.PLANT);
         this.setDefaultState( this.blockState.getBaseState().withProperty(LEVEL, 15).withProperty(POSITION, SeaweedPosition.SINGLE).withProperty(VARIANT, SeaweedType.KELP) );
     }
     

src/main/java/biomesoplenty/common/block/BlockBOPStone.java

@@ -11,6 +11,7 @@ package biomesoplenty.common.block;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -68,7 +69,7 @@ public class BlockBOPStone extends Block implements IBOPBlock
         super(Material.rock);
 
         // set some defaults
-        this.setStepSound(Block.soundTypeStone);
+        this.setStepSound(SoundType.STONE);
         this.setHarvestLevel("pickaxe", 1, this.getDefaultState().withProperty(VARIANT, StoneType.LIMESTONE));
         this.setHarvestLevel("pickaxe", 2, this.getDefaultState().withProperty(VARIANT, StoneType.SILTSTONE));
         this.setHarvestLevel("pickaxe", 3, this.getDefaultState().withProperty(VARIANT, StoneType.SHALE));

src/main/java/biomesoplenty/common/block/BlockBOPVine.java

@@ -11,6 +11,7 @@ package biomesoplenty.common.block;
 import biomesoplenty.api.block.IBOPBlock;
 import biomesoplenty.common.item.ItemBOPBlock;
 import net.minecraft.block.BlockVine;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -43,7 +44,7 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock
 
     public BlockBOPVine(boolean useGreyScaleTextures)
     {
-        this.setStepSound(soundTypeGrass);
+        this.setStepSound(SoundType.PLANT);
         this.setHardness(0.2F);
         this.useGreyScaleTextures = useGreyScaleTextures;
     }

src/main/java/biomesoplenty/common/entities/EntityButterfly.java

@@ -45,7 +45,8 @@ public class EntityButterfly extends EntityFlying implements IMob {
         this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(1.0D);
     }
     
-    protected void entityInit()
+    @Override
+	protected void entityInit()
     {
         super.entityInit();
         this.dataWatcher.addObject(18, Byte.valueOf((byte)0));

src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java

@@ -277,7 +277,7 @@ public class AchievementEventHandler
                 int biomeIdToFind = stack.getTagCompound().getInteger("biomeIDToFind");
 
                 //If the current biome id is the id on the radar, award the achievement and stop searching
-                if (biomeIdToFind == currentBiome.biomeID) 
+                if (biomeIdToFind == BiomeGenBase.getIdForBiome(currentBiome)) 
                 {
                     player.triggerAchievement(BOPAchievements.use_biome_finder);
                     return;
@@ -289,7 +289,7 @@ public class AchievementEventHandler
     private void updateBiomesExplored(EntityPlayerMP player)
     {
         BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(player.posX), 0, MathHelper.floor_double(player.posZ)));
-        String biomeName = currentBiome.biomeName;
+        String biomeName = currentBiome.getBiomeName();
         //Get a list of the current explored biomes
         JsonSerializableSet exploredBiomeNames = (JsonSerializableSet)player.getStatFile().func_150870_b(BOPAchievements.explore_all_biomes);
 
@@ -317,7 +317,7 @@ public class AchievementEventHandler
                 {
                     BiomeGenBase biome = (BiomeGenBase)iterator.next();
 
-                    if (biome.biomeName.equals(exploredBiomeName))
+                    if (biome.getBiomeName().equals(exploredBiomeName))
                     {
                         iterator.remove();
                     }

src/main/java/biomesoplenty/common/init/ModBiomes.java

@@ -299,23 +299,23 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
 
         // Add vanilla sub biomes
         
-        setSubBiome(BiomeGenBase.desert, BiomeGenBase.desertHills);
+        setSubBiome(Biomes.desert, Biomes.desertHills);
-        setSubBiome(BiomeGenBase.forest, BiomeGenBase.forestHills);
+        setSubBiome(Biomes.forest, Biomes.forestHills);
-        setSubBiome(BiomeGenBase.birchForest, BiomeGenBase.birchForestHills);
+        setSubBiome(Biomes.birchForest, Biomes.birchForestHills);
-        setSubBiome(BiomeGenBase.roofedForest, BiomeGenBase.plains);
+        setSubBiome(Biomes.roofedForest, Biomes.plains);
-        setSubBiome(BiomeGenBase.taiga, BiomeGenBase.taigaHills);
+        setSubBiome(Biomes.taiga, Biomes.taigaHills);
-        setSubBiome(BiomeGenBase.megaTaiga, BiomeGenBase.megaTaigaHills);
+        setSubBiome(Biomes.megaTaiga, Biomes.megaTaigaHills);
-        setSubBiome(BiomeGenBase.coldTaiga, BiomeGenBase.coldTaigaHills);
+        setSubBiome(Biomes.coldTaiga, Biomes.coldTaigaHills);
-        setSubBiome(BiomeGenBase.plains, BiomeGenBase.forestHills, BiomeGenBase.forest);
+        setSubBiome(Biomes.plains, Biomes.forestHills, Biomes.forest);
-        setSubBiome(BiomeGenBase.icePlains, BiomeGenBase.iceMountains);
+        setSubBiome(Biomes.icePlains, Biomes.iceMountains);
-        setSubBiome(BiomeGenBase.jungle, BiomeGenBase.jungleHills);
+        setSubBiome(Biomes.jungle, Biomes.jungleHills);
-        setSubBiome(BiomeGenBase.extremeHills, BiomeGenBase.extremeHillsPlus);
+        setSubBiome(Biomes.extremeHills, Biomes.extremeHillsPlus);
-        setSubBiome(BiomeGenBase.savanna, BiomeGenBase.savannaPlateau);
+        setSubBiome(Biomes.savanna, Biomes.savannaPlateau);
-        setSubBiome(BiomeGenBase.mesaPlateau_F, BiomeGenBase.mesa);
+        setSubBiome(Biomes.mesaPlateau_F, Biomes.mesa);
         
         // oceans get occasional patches of deep ocean
         // don't add any islands - those are done per climate in GenLayerBiomeIslands
-        setSubBiome(BiomeGenBase.ocean, BiomeGenBase.deepOcean);
+        setSubBiome(Biomes.ocean, Biomes.deepOcean);
         
     }