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

Use IItemHandler in ProcessingCraftingTask too

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-22 00:45:48 +02:00
parent dd4be87f60
commit 5099be6311
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java
View File

@@ -1,11 +1,9 @@
package refinedstorage.tile.autocrafting.task; package refinedstorage.tile.autocrafting.task;
import net.minecraft.inventory.IInventory;
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.TileEntityHopper;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorageUtils; import refinedstorage.RefinedStorageUtils;
import refinedstorage.tile.TileController; import refinedstorage.tile.TileController;
import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.autocrafting.CraftingPattern;
@@ -45,20 +43,26 @@ public class ProcessingCraftingTask implements ICraftingTask {
@Override @Override
public boolean update(TileController controller) { public boolean update(TileController controller) {
TileCrafter crafter = pattern.getCrafter(controller.getWorld()); TileCrafter crafter = pattern.getCrafter(controller.getWorld());
TileEntity crafterFacing = crafter.getWorld().getTileEntity(crafter.getPos().offset(crafter.getDirection())); IItemHandler handler = RefinedStorageUtils.getItemHandler(crafter.getFacingTile(), crafter.getDirection().getOpposite());
if (crafterFacing instanceof IInventory) { if (handler != null) {
for (int i = 0; i < inserted.length; ++i) { for (int i = 0; i < inserted.length; ++i) {
if (!inserted[i]) { if (!inserted[i]) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
ItemStack took = controller.take(input); ItemStack took = controller.take(input);
if (took != null) { if (took != null) {
ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots((IInventory) crafterFacing, took, crafter.getDirection().getOpposite()); for (int j = 0; j < handler.getSlots(); ++j) {
if (handler.insertItem(j, took, true) == null) {
handler.insertItem(j, took, false);
if (remaining == null) { inserted[i] = true;
inserted[i] = true;
} else { break;
}
}
if (!inserted[i]) {
controller.push(took); controller.push(took);
} }
} else if (!childTasks[i]) { } else if (!childTasks[i]) {