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

Make importer use capabilities for inventories

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-21 22:44:32 +02:00
parent 8b4b511d42
commit 092976b579
3 changed files with 34 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -312,14 +312,18 @@ public class RefinedStorageUtils {
world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 1 | 2);
}
public static IItemHandler getItemHandler(TileEntity te, EnumFacing side) {
IItemHandler handler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
public static IItemHandler getItemHandler(TileEntity tile, EnumFacing side) {
if (tile == null) {
return null;
}
IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
if (handler == null) {
if (side != null && te instanceof ISidedInventory) {
handler = new SidedInvWrapper((ISidedInventory) te, side);
} else if (te instanceof IInventory) {
handler = new InvWrapper((IInventory) te);
if (side != null && tile instanceof ISidedInventory) {
handler = new SidedInvWrapper((ISidedInventory) tile, side);
} else if (tile instanceof IInventory) {
handler = new InvWrapper((IInventory) tile);
}
}

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

@@ -49,7 +49,7 @@ public class TileExporter extends TileMachine implements ICompareConfig {
if (handler.insertItem(j, took, true) == null) {
handler.insertItem(j, took, false);
} else {
break;
controller.push(took);
}
}
} else if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) {

97
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -3,10 +3,10 @@ package refinedstorage.tile;
import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
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;
import refinedstorage.inventory.InventorySimple;
@@ -32,81 +32,33 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
@Override
public void updateMachine() {
TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection()));
TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection()));
IItemHandler handler = RefinedStorageUtils.getItemHandler(tile, getDirection().getOpposite());
// In order to avoid voiding of Storage Disks
if (connectedTile instanceof TileDiskDrive) {
connectedTile = null;
if (tile instanceof TileDiskDrive || handler == null) {
return;
}
if (connectedTile instanceof ISidedInventory) {
ISidedInventory sided = (ISidedInventory) connectedTile;
int[] availableSlots = sided.getSlotsForFace(getDirection().getOpposite());
if (currentSlot >= availableSlots.length) {
currentSlot = 0;
}
if (availableSlots.length > 0) {
int availableSlot = availableSlots[currentSlot];
ItemStack stack = sided.getStackInSlot(availableSlot);
if (stack == null) {
currentSlot++;
} else {
if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) {
ItemStack toTake = stack.copy();
toTake.stackSize = 1;
if (canImport(toTake) && sided.canExtractItem(availableSlot, toTake, getDirection().getOpposite())) {
if (controller.push(toTake)) {
sided.decrStackSize(availableSlot, 1);
sided.markDirty();
}
} else {
// If we can't import and/or extract, move on (otherwise we stay on the same slot forever)
currentSlot++;
}
}
}
}
} else if (connectedTile instanceof IInventory) {
IInventory inventory = (IInventory) connectedTile;
if (currentSlot >= inventory.getSizeInventory()) {
currentSlot = 0;
}
ItemStack stack = inventory.getStackInSlot(currentSlot);
if (stack != null) {
if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) {
// If we can't import and/ or push, move on (otherwise we stay on the same slot forever)
if (canImport(stack)) {
ItemStack taking = stack.copy();
taking.stackSize = 1;
if (controller.push(taking)) {
inventory.decrStackSize(currentSlot, 1);
inventory.markDirty();
} else {
currentSlot++;
}
} else {
currentSlot++;
}
}
} else {
currentSlot++;
}
} else {
if (currentSlot >= handler.getSlots()) {
currentSlot = 0;
}
if (handler.getSlots() > 0) {
ItemStack stack = handler.getStackInSlot(currentSlot);
if (stack == null) {
currentSlot++;
} else if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0 && mayImportStack(stack)) {
ItemStack result = handler.extractItem(currentSlot, 1, true);
if (result != null && controller.push(result)) {
handler.extractItem(currentSlot, 1, false);
}
}
}
}
public boolean canImport(ItemStack stack) {
private boolean mayImportStack(ItemStack stack) {
int slots = 0;
for (int i = 0; i < inventory.getSizeInventory(); ++i) {
@@ -125,11 +77,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
}
}
if (isWhitelist()) {
return slots == 0;
}
return true;
// @todo: this should be isBlacklist
return isWhitelist() ? (slots == 0) : true;
}
@Override