dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use hopper logic for exporter.

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-03-25 20:23:54 +01:00
parent af4f3e8b40
commit 69048d35fb
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -2,10 +2,10 @@ package refinedstorage.tile;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityHopper;
import refinedstorage.inventory.InventorySimple; import refinedstorage.inventory.InventorySimple;
import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.ICompareSetting;
import refinedstorage.util.InventoryUtils; import refinedstorage.util.InventoryUtils;
@@ -41,28 +41,10 @@ public class TileExporter extends TileMachine implements ICompareSetting {
ItemStack took = getController().take(toTake, compare); ItemStack took = getController().take(toTake, compare);
if (took != null) { if (took != null) {
if (connectedInventory instanceof ISidedInventory) { ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots(connectedInventory, took, getDirection().getOpposite());
ISidedInventory sided = (ISidedInventory) connectedInventory;
boolean pushedAny = false; if (remaining != null) {
getController().push(remaining);
for (int sidedSlot = 0; sidedSlot < connectedInventory.getSizeInventory(); ++sidedSlot) {
if (sided.canInsertItem(sidedSlot, took, getDirection().getOpposite()) && InventoryUtils.canPushToInventorySlot(connectedInventory, sidedSlot, took)) {
InventoryUtils.pushToInventorySlot(connectedInventory, sidedSlot, took);
pushedAny = true;
break;
}
}
if (!pushedAny) {
getController().push(took);
}
} else if (InventoryUtils.canPushToInventory(connectedInventory, took)) {
InventoryUtils.pushToInventory(connectedInventory, took);
} else {
getController().push(took);
} }
} }
} }