diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
index 0d1b3fc03..822f9e848 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
@@ -104,7 +104,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
                     player.inventory.setInventorySlotContents(player.inventory.currentItem, tile.slots[0].copy());
                 }
                 else{
-                    player.getActiveItemStack().stackSize += tile.slots[0].stackSize;
+                    stackPlayer.stackSize += tile.slots[0].stackSize;
                 }
                 tile.slots[0] = null;
                 tile.markDirty();
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
index eddb0f905..d08afdb18 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
@@ -111,7 +111,7 @@ public abstract class BlockContainerBase extends BlockContainer{
     }
 
     public boolean tryToggleRedstone(World world, BlockPos pos, EntityPlayer player){
-        ItemStack stack = player.getActiveItemStack();
+        ItemStack stack = player.getHeldItemMainhand();
         if(stack != null && Block.getBlockFromItem(stack.getItem()) instanceof BlockRedstoneTorch){
             TileEntity tile = world.getTileEntity(pos);
             if(tile instanceof IRedstoneToggle){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
index d80ced6df..cc732218e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
@@ -42,7 +42,7 @@ public class ItemGrowthRing extends ItemEnergy{
         }
 
         EntityPlayer player = (EntityPlayer)entity;
-        ItemStack equipped = player.getActiveItemStack();
+        ItemStack equipped = player.getHeldItemMainhand();
 
         int energyUse = 300;
         if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
index 0e377c54c..843e4d49e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
@@ -63,7 +63,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{
         if(!world.isRemote && stack.getItemDamage() < allRings.length){
             if(player instanceof EntityPlayer){
                 EntityPlayer thePlayer = (EntityPlayer)player;
-                ItemStack equippedStack = ((EntityPlayer)player).getActiveItemStack();
+                ItemStack equippedStack = ((EntityPlayer)player).getHeldItemMainhand();
 
                 ThePotionRings effect = ThePotionRings.values()[stack.getItemDamage()];
                 Potion potion = Potion.getPotionById(effect.effectID);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
index b9e2a57cf..b4852521b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
@@ -36,7 +36,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{
         }
 
         EntityPlayer player = (EntityPlayer)entity;
-        ItemStack equipped = player.getActiveItemStack();
+        ItemStack equipped = player.getHeldItemMainhand();
 
         int energyUse = 350;
         if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
index 08abd037f..906cba5dc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
@@ -354,7 +354,7 @@ public class WorldUtil{
         Block block = PosUtil.getBlock(pos, world);
         IBlockState state = world.getBlockState(pos);
         TileEntity tile = world.getTileEntity(pos);
-        ItemStack stack = player.getActiveItemStack();
+        ItemStack stack = player.getHeldItemMainhand();
 
         //If the Block can be harvested or not
         boolean canHarvest = block.canHarvestBlock(world, pos, player);