diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
index 502df151d..56e255cd4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
@@ -62,7 +62,7 @@ public class BlockLampPowerer extends BlockBase{
     private void updateLamp(World world, BlockPos pos){
         if(!world.isRemote){
             IBlockState state = world.getBlockState(pos);
-            BlockPos coords = pos.offset(WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state)));
+            BlockPos coords = pos.offset(WorldUtil.getDirectionByPistonRotation(state));
             this.updateLampsAtPos(world, coords, world.isBlockIndirectlyGettingPowered(pos) > 0, new ArrayList<BlockPos>());
         }
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
index 5de7a21a5..2d1d160ab 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
@@ -112,7 +112,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple
     @Override
     public EnumFacing getOrientation(){
         IBlockState state = this.world.getBlockState(this.pos);
-        return WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state));
+        return WorldUtil.getDirectionByPistonRotation(state);
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
index afd76ffb0..8e2cceac5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
@@ -78,7 +78,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase{
 
     private void doWork(){
         IBlockState state = this.world.getBlockState(this.pos);
-        EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state));
+        EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state);
 
         BlockPos coordsBlock = this.pos.offset(sideToManipulate);
         IBlockState stateToBreak = this.world.getBlockState(coordsBlock);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
index 511463c46..13469f62f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
@@ -77,7 +77,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase{
     private void doWork(){
         if(this.storage.getEnergyStored() >= ENERGY_USE*RANGE){
             IBlockState state = this.world.getBlockState(this.pos);
-            EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state));
+            EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state);
 
             for(int i = 0; i < RANGE; i++){
                 BlockPos coordsBlock = this.pos.offset(sideToManipulate, i+1);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
index 6483c67cc..05f1d3abb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
@@ -67,7 +67,7 @@ public class TileEntityDropper extends TileEntityInventoryBase{
         ItemStack theoreticalRemove = this.removeFromInventory(false);
         if(StackUtil.isValid(theoreticalRemove)){
             IBlockState state = this.world.getBlockState(this.pos);
-            WorldUtil.dropItemAtSide(WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state)), this.world, this.pos, StackUtil.setStackSize(theoreticalRemove.copy(), 1));
+            WorldUtil.dropItemAtSide(WorldUtil.getDirectionByPistonRotation(state), this.world, this.pos, StackUtil.setStackSize(theoreticalRemove.copy(), 1));
                 this.removeFromInventory(true);
         }
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
index 64e1db4be..311868067 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
@@ -163,7 +163,7 @@ public class TileEntityFarmer extends TileEntityInventoryBase implements IFarmer
     @Override
     public EnumFacing getOrientation(){
         IBlockState state = this.world.getBlockState(this.pos);
-        return WorldUtil.getDirectionByPistonRotation(state.getBlock().getMetaFromState(state));
+        return WorldUtil.getDirectionByPistonRotation(state);
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
index 515643e30..2e141dafc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
@@ -68,8 +68,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing
 
     private void doWork(){
         IBlockState state = this.world.getBlockState(this.pos);
-        Block block = state.getBlock();
-        EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(block.getMetaFromState(state));
+        EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state);
         BlockPos coordsBlock = this.pos.offset(sideToManipulate);
 
         IBlockState stateToBreak = this.world.getBlockState(coordsBlock);
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 3d2368c98..0e1d590e8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
@@ -19,6 +19,7 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
 import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirectional;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
@@ -260,8 +261,8 @@ public final class WorldUtil {
 		}
 	}
 
-	public static EnumFacing getDirectionByPistonRotation(int meta) {
-		return EnumFacing.values()[meta];
+	public static EnumFacing getDirectionByPistonRotation(IBlockState state) {
+		return state.getValue(BlockDirectional.FACING);
 	}
 
 	public static ArrayList<Material> getMaterialsAround(World world, BlockPos pos) {