diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index 214b13cb3..ad23e1de8 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.block;
 
-import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
 import com.raoulvdberge.refinedstorage.block.info.IBlockInfo;
 import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockBase;
@@ -13,7 +12,6 @@ import com.raoulvdberge.refinedstorage.util.CollisionUtils;
 import com.raoulvdberge.refinedstorage.util.WorldUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -27,8 +25,9 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
@@ -41,17 +40,18 @@ public abstract class BlockBase extends Block {
     protected final IBlockInfo info;
 
     public BlockBase(IBlockInfo info) {
-        super(info.getMaterial());
+        super(Block.Properties
+            .create(info.getMaterial())
+            .hardnessAndResistance(info.getHardness())
+            .sound(info.getSoundType())
+        );
 
         this.info = info;
 
-        setHardness(info.getHardness());
         setRegistryName(info.getId());
-        setCreativeTab(RS.INSTANCE.tab);
-        setSoundType(info.getSoundType());
     }
 
-    @SideOnly(Side.CLIENT)
+    @OnlyIn(Dist.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
     }
 
@@ -193,6 +193,15 @@ public abstract class BlockBase extends Block {
         return false;
     }
 
+    @Override
+    public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
+        if (state.getBlock() != newState.getBlock()) {
+            worldIn.updateComparatorOutputLevel(pos, this);
+
+            super.onReplaced(state, worldIn, pos, newState, isMoving);
+        }
+    }
+
     public List<CollisionGroup> getCollisions(TileEntity tile, BlockState state) {
         return DEFAULT_COLLISION_GROUPS;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java
index 11f20a954..5e4f2d66e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java
@@ -4,14 +4,14 @@ import com.raoulvdberge.refinedstorage.block.BlockBase;
 import com.raoulvdberge.refinedstorage.tile.TileBase;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public class ItemBlockBase extends ItemBlock {
+public class ItemBlockBase extends BlockItem {
     private BlockBase block;
 
     public ItemBlockBase(BlockBase block, boolean subtypes) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
index 806e8b47e..a5bb73c83 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
@@ -4,15 +4,11 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
 import com.raoulvdberge.refinedstorage.tile.direction.DirectionHandlerTile;
 import com.raoulvdberge.refinedstorage.tile.direction.IDirectionHandler;
 import com.raoulvdberge.refinedstorage.util.WorldUtils;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.SPacketUpdateTileEntity;
+import net.minecraft.network.play.server.SUpdateTileEntityPacket;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 
 import javax.annotation.Nullable;
@@ -20,16 +16,16 @@ import javax.annotation.Nullable;
 public abstract class TileBase extends TileEntity {
     protected static final String NBT_DIRECTION = "Direction";
 
-    private EnumFacing clientDirection = EnumFacing.NORTH;
+    private Direction clientDirection = Direction.NORTH;
     protected IDirectionHandler directionHandler = new DirectionHandlerTile();
     protected TileDataManager dataManager = new TileDataManager(this);
 
-    public void setDirection(EnumFacing direction) {
+    public void setDirection(Direction direction) {
         clientDirection = direction;
 
         directionHandler.setDirection(direction);
 
-        world.notifyNeighborsOfStateChange(pos, world.getBlockState(pos).getBlock(), true);
+        world.notifyNeighborsOfStateChange(pos, world.getBlockState(pos).getBlock());
 
         markDirty();
     }
@@ -42,7 +38,10 @@ public abstract class TileBase extends TileEntity {
         return dataManager;
     }
 
+    @Override
     public CompoundNBT write(CompoundNBT tag) {
+        tag = super.write(tag);
+
         directionHandler.writeToTileNbt(tag);
 
         return tag;
@@ -54,14 +53,17 @@ public abstract class TileBase extends TileEntity {
         return tag;
     }
 
+    @Override
     public void read(CompoundNBT tag) {
+        super.read(tag);
+
         directionHandler.readFromTileNbt(tag);
     }
 
     public void readUpdate(CompoundNBT tag) {
         boolean doRender = canCauseRenderUpdate(tag);
 
-        clientDirection = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION));
+        clientDirection = Direction.byIndex(tag.getInt(NBT_DIRECTION));
 
         if (doRender) {
             WorldUtils.updateBlock(world, pos);
@@ -79,39 +81,22 @@ public abstract class TileBase extends TileEntity {
 
     @Nullable
     @Override
-    public final SPacketUpdateTileEntity getUpdatePacket() {
-        return new SPacketUpdateTileEntity(pos, 1, getUpdateTag());
+    public final SUpdateTileEntityPacket getUpdatePacket() {
+        return new SUpdateTileEntityPacket(pos, 1, getUpdateTag());
     }
 
     @Override
-    public final void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
+    public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket packet) {
         readUpdate(packet.getNbtCompound());
     }
 
     @Override
     public final void handleUpdateTag(CompoundNBT tag) {
-        super.readFromNBT(tag);
+        super.read(tag);
 
         readUpdate(tag);
     }
 
-    @Override
-    public final void readFromNBT(CompoundNBT tag) {
-        super.readFromNBT(tag);
-
-        read(tag);
-    }
-
-    @Override
-    public final CompoundNBT writeToNBT(CompoundNBT tag) {
-        return write(super.writeToNBT(tag));
-    }
-
-    @Override
-    public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) {
-        return oldState.getBlock() != newState.getBlock();
-    }
-
     @Nullable
     public IItemHandler getDrops() {
         return null;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index ae3714ba0..b4c4c33ea 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -663,7 +663,7 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityEnergy.ENERGY) {
             return CapabilityEnergy.ENERGY.cast(energyProxy);
         }
@@ -676,7 +676,7 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityEnergy.ENERGY
             || capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY
             || super.hasCapability(capability, facing);
@@ -690,7 +690,7 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
 
     @Override
     public void visit(Operator operator) {
-        for (EnumFacing facing : EnumFacing.VALUES) {
+        for (Direction facing : Direction.VALUES) {
             BlockPos pos = this.pos.offset(facing);
 
             TileEntity tile = world.getTileEntity(pos);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
index 9efe63bc8..2ec61bed9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
@@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafter;
 import com.raoulvdberge.refinedstorage.gui.TileDataParameterClientListenerCrafter;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -36,12 +36,12 @@ public class TileCrafter extends TileNode<NetworkNodeCrafter> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getPatternItems());
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
index 428fc2c96..784a5a9fb 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
@@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.tile.config.*;
 import com.raoulvdberge.refinedstorage.tile.data.RSSerializers;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -134,12 +134,12 @@ public class TileDiskDrive extends TileNode<NetworkNodeDiskDrive> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getDisks());
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
index 0587eabc0..e15a32953 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
@@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IType;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -57,7 +57,7 @@ public class TileDiskManipulator extends TileNode<NetworkNodeDiskManipulator> {
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getDisks());
         }
@@ -66,7 +66,7 @@ public class TileDiskManipulator extends TileNode<NetworkNodeDiskManipulator> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
index 6b4cc560c..dd00d67db 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidInterface;
 import com.raoulvdberge.refinedstorage.tile.data.RSSerializers;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -24,12 +24,12 @@ public class TileFluidInterface extends TileNode<NetworkNodeFluidInterface> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
             return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getNode().getTank());
         } else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
index dbabc3b85..2f8247e92 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeInterface;
 import com.raoulvdberge.refinedstorage.tile.config.IComparable;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -20,12 +20,12 @@ public class TileInterface extends TileNode<NetworkNodeInterface> {
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ? CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getItems()) : super.getCapability(capability, facing);
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
index d9a7bcb53..e9820c95d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeNetworkTransmitter;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -37,12 +37,12 @@ public class TileNetworkTransmitter extends TileNode<NetworkNodeNetworkTransmitt
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getNetworkCard());
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
index 032bdbb93..cbb307576 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
@@ -13,7 +13,7 @@ import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import com.raoulvdberge.refinedstorage.tile.direction.DirectionHandlerNetworkNode;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -69,7 +69,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
         getNode().setActive(tag.getBoolean(NBT_ACTIVE));
     }
 
-    private EnumFacing directionToMigrate;
+    private Direction directionToMigrate;
 
     @Override
     public void read(CompoundNBT tag) {
@@ -77,7 +77,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
 
         OneSixMigrationHelper.removalHook();
         if (tag.hasKey(NBT_DIRECTION)) {
-            directionToMigrate = EnumFacing.byIndex(tag.getInteger("Direction"));
+            directionToMigrate = Direction.byIndex(tag.getInteger("Direction"));
         }
     }
 
@@ -125,7 +125,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
     public abstract String getNodeId();
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing side) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction side) {
         if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) {
             return true;
         }
@@ -134,7 +134,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing side) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction side) {
         if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) {
             return CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY.cast(this);
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java
index 43ca264d7..efe6b4534 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java
@@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.GuiReaderWriter;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -35,7 +35,7 @@ public class TileReader extends TileNode<NetworkNodeReader> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         if (super.hasCapability(capability, facing)) {
             return true;
         }
@@ -56,7 +56,7 @@ public class TileReader extends TileNode<NetworkNodeReader> {
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         T foundCapability = super.getCapability(capability, facing);
 
         if (foundCapability == null) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java
index 0c736ee22..2e6eb5db6 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java
@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.tile.config.IComparable;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -60,7 +60,7 @@ public class TileStorageMonitor extends TileNode<NetworkNodeStorageMonitor> {
 
     @Override
     protected boolean canCauseRenderUpdate(CompoundNBT tag) {
-        EnumFacing receivedDirection = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION));
+        Direction receivedDirection = Direction.byIndex(tag.getInteger(NBT_DIRECTION));
         boolean receivedActive = tag.getBoolean(NBT_ACTIVE);
 
         return receivedDirection != getDirection() || receivedActive != getNode().isActive();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
index 2415edf3f..93fe92c90 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
@@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeWriter;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -23,7 +23,7 @@ public class TileWriter extends TileNode<NetworkNodeWriter> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         if (super.hasCapability(capability, facing)) {
             return true;
         }
@@ -44,7 +44,7 @@ public class TileWriter extends TileNode<NetworkNodeWriter> {
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         T foundCapability = super.getCapability(capability, facing);
 
         if (foundCapability == null) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java
index 25c129e5a..091775de9 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerNetworkNode.java
@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.tile.direction;
 
 import com.raoulvdberge.refinedstorage.tile.TileNode;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 public class DirectionHandlerNetworkNode implements IDirectionHandler {
     private TileNode tile;
@@ -12,12 +12,12 @@ public class DirectionHandlerNetworkNode implements IDirectionHandler {
     }
 
     @Override
-    public void setDirection(EnumFacing direction) {
+    public void setDirection(Direction direction) {
         tile.getNode().setDirection(direction);
     }
 
     @Override
-    public EnumFacing getDirection() {
+    public Direction getDirection() {
         return tile.getNode().getDirection();
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java
index a79796a6b..4088dbcc8 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/DirectionHandlerTile.java
@@ -1,20 +1,20 @@
 package com.raoulvdberge.refinedstorage.tile.direction;
 
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 public class DirectionHandlerTile implements IDirectionHandler {
     public static final String NBT_DIRECTION = "Direction";
 
-    private EnumFacing direction = EnumFacing.NORTH;
+    private Direction direction = Direction.NORTH;
 
     @Override
-    public void setDirection(EnumFacing direction) {
+    public void setDirection(Direction direction) {
         this.direction = direction;
     }
 
     @Override
-    public EnumFacing getDirection() {
+    public Direction getDirection() {
         return direction;
     }
 
@@ -26,7 +26,7 @@ public class DirectionHandlerTile implements IDirectionHandler {
     @Override
     public void readFromTileNbt(CompoundNBT tag) {
         if (tag.hasKey(NBT_DIRECTION)) {
-            direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION));
+            direction = Direction.byIndex(tag.getInteger(NBT_DIRECTION));
         }
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java
index e744a40d1..5ed0a1834 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/direction/IDirectionHandler.java
@@ -1,12 +1,12 @@
 package com.raoulvdberge.refinedstorage.tile.direction;
 
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 public interface IDirectionHandler {
-    void setDirection(EnumFacing direction);
+    void setDirection(Direction direction);
 
-    EnumFacing getDirection();
+    Direction getDirection();
 
     void writeToTileNbt(CompoundNBT tag);
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java
index 66e479ed2..36fb9077a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java
@@ -9,7 +9,7 @@ import com.raoulvdberge.refinedstorage.tile.TileNode;
 import com.raoulvdberge.refinedstorage.tile.config.IType;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -101,12 +101,12 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing side) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction side) {
         return (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) || super.hasCapability(capability, side);
     }
 
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing side) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction side) {
         if (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getPatterns());
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
index edeec8029..0fc43694f 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
@@ -49,7 +49,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
 import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.energy.CapabilityEnergy;
@@ -698,13 +698,13 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
     }
 
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
         return capability == CapabilityEnergy.ENERGY || super.hasCapability(capability, facing);
     }
 
     @Nullable
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
         return capability == CapabilityEnergy.ENERGY ? CapabilityEnergy.ENERGY.cast(energyStorage) : super.getCapability(capability, facing);
     }