From 3ef8f2fc14218f66ce749e0422a4d576e866dc3a Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Mon, 16 May 2016 16:44:34 +0200
Subject: [PATCH] Fix importer importing from disk drives + server issues

---
 CHANGELOG.md                                  |  3 +-
 .../MessageControllerEnergyUpdate.java        |  4 +-
 .../network/MessageDetectorPoweredUpdate.java |  4 +-
 .../MessageMachineConnectedUpdate.java        |  4 +-
 .../network/MessageSoldererWorkingUpdate.java |  4 +-
 .../network/MessageTileContainerUpdate.java   |  3 +-
 .../refinedstorage/proxy/ClientProxy.java     |  6 +++
 .../refinedstorage/proxy/CommonProxy.java     | 53 +++++++++----------
 .../refinedstorage/tile/TileImporter.java     |  5 ++
 9 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa7ab06f4..0703c1fb1 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,12 @@
 - Fixed picking up from crafting result slot
 - Fixed being able to use right click on crafting result slot
 - Fixed item duplication issue with the Interface
-- Fixed Importers not working when changing facing with a wrench
+- Fixed Importers and Exporters not working when changing facing with a wrench
 - Fixed Crafting Grid not respecting remainder in recipes
 - Fixed Crafting Grid giving back the wrong amount of items when shift clicking
 - Fixed items disappearing in Grid when doing a weird combination of inputs
 - Fixed Solderer not stacking items
+- Fixed Importer voiding Storage Disks from the Disk Drive
 
 **Features**
 - Added autocrafting
diff --git a/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java b/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java
index 423c9542d..123fca91f 100755
--- a/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java
@@ -1,7 +1,6 @@
 package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -9,6 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.proxy.ClientProxy;
 import refinedstorage.tile.TileController;
 
 public class MessageControllerEnergyUpdate implements IMessage, IMessageHandler<MessageControllerEnergyUpdate, IMessage> {
@@ -49,7 +49,7 @@ public class MessageControllerEnergyUpdate implements IMessage, IMessageHandler<
     public IMessage onMessage(MessageControllerEnergyUpdate message, MessageContext ctx) {
         BlockPos pos = new BlockPos(message.x, message.y, message.z);
 
-        World world = Minecraft.getMinecraft().theWorld;
+        World world = ClientProxy.getWorld();
 
         TileEntity tile = world.getTileEntity(pos);
 
diff --git a/src/main/java/refinedstorage/network/MessageDetectorPoweredUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorPoweredUpdate.java
index 1e8b30d43..727a0b67a 100755
--- a/src/main/java/refinedstorage/network/MessageDetectorPoweredUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageDetectorPoweredUpdate.java
@@ -1,7 +1,6 @@
 package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -9,6 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.proxy.ClientProxy;
 import refinedstorage.tile.TileDetector;
 
 public class MessageDetectorPoweredUpdate implements IMessage, IMessageHandler<MessageDetectorPoweredUpdate, IMessage> {
@@ -47,7 +47,7 @@ public class MessageDetectorPoweredUpdate implements IMessage, IMessageHandler<M
     public IMessage onMessage(MessageDetectorPoweredUpdate message, MessageContext ctx) {
         BlockPos pos = new BlockPos(message.x, message.y, message.z);
 
-        World world = Minecraft.getMinecraft().theWorld;
+        World world = ClientProxy.getWorld();
 
         TileEntity tile = world.getTileEntity(pos);
 
diff --git a/src/main/java/refinedstorage/network/MessageMachineConnectedUpdate.java b/src/main/java/refinedstorage/network/MessageMachineConnectedUpdate.java
index 258b6a554..8b7f08635 100755
--- a/src/main/java/refinedstorage/network/MessageMachineConnectedUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageMachineConnectedUpdate.java
@@ -1,7 +1,6 @@
 package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -9,6 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.proxy.ClientProxy;
 import refinedstorage.tile.TileMachine;
 
 public class MessageMachineConnectedUpdate implements IMessage, IMessageHandler<MessageMachineConnectedUpdate, IMessage> {
@@ -47,7 +47,7 @@ public class MessageMachineConnectedUpdate implements IMessage, IMessageHandler<
     public IMessage onMessage(MessageMachineConnectedUpdate message, MessageContext ctx) {
         BlockPos pos = new BlockPos(message.x, message.y, message.z);
 
-        World world = Minecraft.getMinecraft().theWorld;
+        World world = ClientProxy.getWorld();
 
         TileEntity tile = world.getTileEntity(pos);
 
diff --git a/src/main/java/refinedstorage/network/MessageSoldererWorkingUpdate.java b/src/main/java/refinedstorage/network/MessageSoldererWorkingUpdate.java
index 22fe87ac7..47f9c8000 100755
--- a/src/main/java/refinedstorage/network/MessageSoldererWorkingUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageSoldererWorkingUpdate.java
@@ -1,7 +1,6 @@
 package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -9,6 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.proxy.ClientProxy;
 import refinedstorage.tile.solderer.TileSolderer;
 
 public class MessageSoldererWorkingUpdate implements IMessage, IMessageHandler<MessageSoldererWorkingUpdate, IMessage> {
@@ -47,7 +47,7 @@ public class MessageSoldererWorkingUpdate implements IMessage, IMessageHandler<M
     public IMessage onMessage(MessageSoldererWorkingUpdate message, MessageContext ctx) {
         BlockPos pos = new BlockPos(message.x, message.y, message.z);
 
-        World world = Minecraft.getMinecraft().theWorld;
+        World world = ClientProxy.getWorld();
 
         TileEntity tile = world.getTileEntity(pos);
 
diff --git a/src/main/java/refinedstorage/network/MessageTileContainerUpdate.java b/src/main/java/refinedstorage/network/MessageTileContainerUpdate.java
index e881c115c..887785b77 100755
--- a/src/main/java/refinedstorage/network/MessageTileContainerUpdate.java
+++ b/src/main/java/refinedstorage/network/MessageTileContainerUpdate.java
@@ -7,6 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import refinedstorage.proxy.ClientProxy;
 import refinedstorage.tile.ISynchronizedContainer;
 
 public class MessageTileContainerUpdate implements IMessage, IMessageHandler<MessageTileContainerUpdate, IMessage> {
@@ -29,7 +30,7 @@ public class MessageTileContainerUpdate implements IMessage, IMessageHandler<Mes
         z = buf.readInt();
 
         if (Minecraft.getMinecraft().theWorld != null) {
-            tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(x, y, z));
+            tile = ClientProxy.getWorld().getTileEntity(new BlockPos(x, y, z));
 
             if (tile instanceof ISynchronizedContainer) {
                 ((ISynchronizedContainer) tile).receiveContainerData(buf);
diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java
index 56c8f0d5d..935eae1e2 100755
--- a/src/main/java/refinedstorage/proxy/ClientProxy.java
+++ b/src/main/java/refinedstorage/proxy/ClientProxy.java
@@ -1,10 +1,12 @@
 package refinedstorage.proxy;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import refinedstorage.RefinedStorageBlocks;
@@ -15,6 +17,10 @@ import refinedstorage.block.EnumStorageType;
 import refinedstorage.item.*;
 
 public class ClientProxy extends CommonProxy {
+    public static World getWorld() {
+        return Minecraft.getMinecraft().theWorld;
+    }
+
     @Override
     public void preInit(FMLPreInitializationEvent e) {
         super.preInit(e);
diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java
index e5cee8d58..f81103b1d 100755
--- a/src/main/java/refinedstorage/proxy/CommonProxy.java
+++ b/src/main/java/refinedstorage/proxy/CommonProxy.java
@@ -33,33 +33,32 @@ import static refinedstorage.RefinedStorage.ID;
 
 public class CommonProxy {
     public void preInit(FMLPreInitializationEvent e) {
-        int id = 0;
-        RefinedStorage.NETWORK.registerMessage(MessageMachineConnectedUpdate.class, MessageMachineConnectedUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageControllerEnergyUpdate.class, MessageControllerEnergyUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageSoldererWorkingUpdate.class, MessageSoldererWorkingUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageDetectorPoweredUpdate.class, MessageDetectorPoweredUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridStoragePush.class, MessageGridStoragePush.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridStoragePull.class, MessageGridStoragePull.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridItems.class, MessageWirelessGridItems.class, id++, Side.CLIENT);
-        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePush.class, MessageWirelessGridStoragePush.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePull.class, MessageWirelessGridStoragePull.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingShift.class, MessageGridCraftingShift.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridCraftingStart.class, MessageWirelessGridCraftingStart.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER);
-        RefinedStorage.NETWORK.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageMachineConnectedUpdate.class, MessageMachineConnectedUpdate.class, 0, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, 1, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageControllerEnergyUpdate.class, MessageControllerEnergyUpdate.class, 2, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageSoldererWorkingUpdate.class, MessageSoldererWorkingUpdate.class, 3, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageDetectorPoweredUpdate.class, MessageDetectorPoweredUpdate.class, 4, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 5, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridStoragePush.class, MessageGridStoragePush.class, 6, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridStoragePull.class, MessageGridStoragePull.class, 7, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 8, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 9, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 10, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 11, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 12, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 13, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, 14, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, 15, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, 16, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, 17, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridItems.class, MessageWirelessGridItems.class, 18, Side.CLIENT);
+        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePush.class, MessageWirelessGridStoragePush.class, 19, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePull.class, MessageWirelessGridStoragePull.class, 20, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingShift.class, MessageGridCraftingShift.class, 21, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, 22, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageWirelessGridCraftingStart.class, MessageWirelessGridCraftingStart.class, 23, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, 24, Side.SERVER);
+        RefinedStorage.NETWORK.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, 25, Side.SERVER);
 
         NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler());
 
diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java
index 9e7f6fe8a..5bf81bbb0 100755
--- a/src/main/java/refinedstorage/tile/TileImporter.java
+++ b/src/main/java/refinedstorage/tile/TileImporter.java
@@ -34,6 +34,11 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
     public void updateMachine() {
         TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection()));
 
+        // In order to avoid voiding of Storage Disks
+        if (connectedTile instanceof TileDiskDrive) {
+            connectedTile = null;
+        }
+
         if (connectedTile instanceof ISidedInventory) {
             ISidedInventory sided = (ISidedInventory) connectedTile;