diff --git a/src/main/java/biomesoplenty/api/block/BOPPlant.java b/src/main/java/biomesoplenty/api/block/BOPPlant.java
index 0e6a4cda3..f9c99f108 100644
--- a/src/main/java/biomesoplenty/api/block/BOPPlant.java
+++ b/src/main/java/biomesoplenty/api/block/BOPPlant.java
@@ -49,7 +49,7 @@ public class BOPPlant extends BOPBlock
 
     public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
     {
-        Block ground = world.getBlockState(pos.offsetDown()).getBlock();
+        Block ground = world.getBlockState(pos.down()).getBlock();
 
         return ground == Blocks.grass || ground == Blocks.dirt || ground == Blocks.farmland;
     }
diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java
index 03e934c43..49265ab9d 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java
@@ -32,7 +32,7 @@ public class BlockBOPFlower2 extends BOPPlant
     @Override
     public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
     {
-        Block ground = world.getBlockState(pos.offsetDown()).getBlock();
+        Block ground = world.getBlockState(pos.down()).getBlock();
         FlowerType type = (FlowerType) state.getValue(VARIANT_PROP);
 
         switch (type)
diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java
index d940d5017..f8f57ecfc 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java
@@ -45,7 +45,7 @@ public class BlockBOPMushroom extends BOPPlant
     @Override
     public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
     {
-        Block ground = world.getBlockState(pos.offsetDown()).getBlock();
+        Block ground = world.getBlockState(pos.down()).getBlock();
         MushroomType type = (MushroomType) state.getValue(VARIANT_PROP);
 
         switch (type)
diff --git a/src/main/java/biomesoplenty/common/block/BlockBamboo.java b/src/main/java/biomesoplenty/common/block/BlockBamboo.java
index 9f0db7c6b..12a3f0927 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBamboo.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBamboo.java
@@ -32,7 +32,7 @@ public class BlockBamboo extends BOPPlant
     @Override
     public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
     {
-        Block ground = world.getBlockState(pos.offsetDown()).getBlock();
+        Block ground = world.getBlockState(pos.down()).getBlock();
 
         return ground == Blocks.grass || ground == Blocks.dirt || ground == this;
     }
diff --git a/src/main/java/biomesoplenty/common/block/BlockCoral.java b/src/main/java/biomesoplenty/common/block/BlockCoral.java
index 199a15f98..1765917c0 100644
--- a/src/main/java/biomesoplenty/common/block/BlockCoral.java
+++ b/src/main/java/biomesoplenty/common/block/BlockCoral.java
@@ -52,8 +52,8 @@ public class BlockCoral extends BOPPlant
     @Override
     public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
     {
-        Block ground = world.getBlockState(pos.offsetDown()).getBlock();
-        Block cover = world.getBlockState(pos.offsetUp()).getBlock();
+        Block ground = world.getBlockState(pos.down()).getBlock();
+        Block cover = world.getBlockState(pos.up()).getBlock();
         boolean hasWater = cover == Blocks.water || cover == Blocks.flowing_water;
 
         // TODO: Make all types depend on mud
diff --git a/src/main/java/biomesoplenty/common/handler/BlockModelRegisterEventHandler.java b/src/main/java/biomesoplenty/common/handler/BlockModelRegisterEventHandler.java
index 853b4085f..7d3c431b6 100644
--- a/src/main/java/biomesoplenty/common/handler/BlockModelRegisterEventHandler.java
+++ b/src/main/java/biomesoplenty/common/handler/BlockModelRegisterEventHandler.java
@@ -35,7 +35,7 @@ public class BlockModelRegisterEventHandler
 
         for (Entry<Block, Set<IProperty>> entry : hiddenProperties.entrySet())
         {
-            modelShapes.func_178121_a(entry.getKey(), (new StateMap.Builder()).func_178442_a(entry.getValue().toArray(new IProperty[] {})).build());
+            modelShapes.registerBlockWithStateMapper(entry.getKey(), (new StateMap.Builder()).addPropertiesToIgnore(entry.getValue().toArray(new IProperty[] {})).build());
         }
     }
 
diff --git a/src/main/java/biomesoplenty/common/handler/DrawScreenEventHandler.java b/src/main/java/biomesoplenty/common/handler/DrawScreenEventHandler.java
index 2a5b2b898..2f21dace8 100644
--- a/src/main/java/biomesoplenty/common/handler/DrawScreenEventHandler.java
+++ b/src/main/java/biomesoplenty/common/handler/DrawScreenEventHandler.java
@@ -32,8 +32,8 @@ public class DrawScreenEventHandler
         if (screenGui instanceof GuiCreateWorld)
         {
             GuiCreateWorld createWorldGui = (GuiCreateWorld) screenGui;
-            GuiButton mapTypeButton = createWorldGui.field_146320_D;
-            int worldTypeIndex = createWorldGui.field_146331_K;
+            GuiButton mapTypeButton = createWorldGui.btnMapType;
+            int worldTypeIndex = createWorldGui.selectedIndex;
 
             if (mapTypeButton.isMouseOver() && WorldType.worldTypes[worldTypeIndex] == ModBiomes.worldTypeBOP)
             {
diff --git a/src/main/java/biomesoplenty/common/mixin/decoration/MixinWorldGenCactus.java b/src/main/java/biomesoplenty/common/mixin/decoration/MixinWorldGenCactus.java
index 4dcb60378..cb3ba81da 100644
--- a/src/main/java/biomesoplenty/common/mixin/decoration/MixinWorldGenCactus.java
+++ b/src/main/java/biomesoplenty/common/mixin/decoration/MixinWorldGenCactus.java
@@ -37,7 +37,7 @@ public abstract class MixinWorldGenCactus extends WorldGenerator //implements IE
         {
             int x = random.nextInt(16) + 8;
             int z = random.nextInt(16) + 8;
-            int y = random.nextInt(world.getHorizon(pos.add(x, 0, z)).getY() * 2);
+            int y = random.nextInt(world.getHeight(pos.add(x, 0, z)).getY() * 2);
             
             this.generate(world, random, pos.add(x, y, z));
         }