diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java index dfc63742a..6293bae4d 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -93,6 +93,10 @@ public abstract class TileBase extends TileEntity implements ITickable { return oldState.getBlock() != newState.getBlock(); } + public TileEntity getFacingTile() { + return worldObj.getTileEntity(pos.offset(direction)); + } + public IInventory getDroppedInventory() { return null; } diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 74a8d56c5..8fcfd0814 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -29,7 +29,7 @@ public class TileExporter extends TileMachine implements ICompareConfig { @Override public void updateMachine() { - IItemHandler handler = RefinedStorageUtils.getItemHandler(worldObj.getTileEntity(pos.offset(getDirection())), getDirection().getOpposite()); + IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); if (handler != null && ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { for (int i = 0; i < inventory.getSizeInventory(); ++i) { diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 98796cef7..dba59b086 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; @@ -162,16 +161,12 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider return false; } - public TileEntity getFront() { - return worldObj.getTileEntity(pos.offset(getDirection())); - } - public IDeepStorageUnit getStorageUnit() { - return getFront() instanceof IDeepStorageUnit ? (IDeepStorageUnit) getFront() : null; + return getFacingTile() instanceof IDeepStorageUnit ? (IDeepStorageUnit) getFacingTile() : null; } public IItemHandler getItemHandler() { - return RefinedStorageUtils.getItemHandler(getFront(), getDirection().getOpposite()); + return RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 20cd7b9bd..7de609688 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerImporter; @@ -32,10 +31,9 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo @Override public void updateMachine() { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - IItemHandler handler = RefinedStorageUtils.getItemHandler(tile, getDirection().getOpposite()); + IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); - if (tile instanceof TileDiskDrive || handler == null) { + if (getFacingTile() instanceof TileDiskDrive || handler == null) { return; }