Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replaced old ISpecialInventory in transport.

Browse source
This commit is contained in:
SirSengir 2012-07-20 09:19:46 +02:00
parent 4efd07332a
commit 22d7a716fe
2 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
View file

@ -18,10 +18,10 @@ import net.minecraft.src.NBTTagList;
import net.minecraft.src.Packet;
import net.minecraft.src.mod_BuildCraftTransport;
import net.minecraft.src.buildcraft.api.APIProxy;
import net.minecraft.src.buildcraft.api.ISpecialInventory;
import net.minecraft.src.buildcraft.api.Orientations;
import net.minecraft.src.buildcraft.api.SafeTimeTracker;
import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.GuiIds;
@ -79,13 +79,12 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory {
/* ISPECIALINVENTORY */
@Override
public boolean addItem(ItemStack stack, boolean doAdd, Orientations from) {
return false;
public int addItem(ItemStack stack, boolean doAdd, Orientations from) {
return 0;
}
@Override
public ItemStack extractItem(boolean doRemove, Orientations from) {
return null;
public ItemStack[] extractItem(boolean doRemove, Orientations from, int maxItemCount) {
return new ItemStack[0];
}
/* IINVENTORY IMPLEMENTATION */

50
common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java
View file

@ -14,10 +14,10 @@ import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
import net.minecraft.src.buildcraft.api.EntityPassiveItem;
import net.minecraft.src.buildcraft.api.ILiquidContainer;
import net.minecraft.src.buildcraft.api.ISpecialInventory;
import net.minecraft.src.buildcraft.api.Orientations;
import net.minecraft.src.buildcraft.api.Position;
import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
import net.minecraft.src.buildcraft.api.power.IPowerProvider;
import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
import net.minecraft.src.buildcraft.api.power.PowerFramework;
@ -95,28 +95,30 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
int blockId = w.getBlockId((int) pos.x, (int) pos.y, (int) pos.z);
TileEntity tile = w.getBlockTileEntity((int) pos.x, (int) pos.y, (int) pos.z);
if (tile == null || !(tile instanceof IInventory || tile instanceof ILiquidContainer)
if (tile == null || !(tile instanceof IInventory || tile instanceof ITankContainer)
|| PipeLogicWood.isExcludedFromExtraction(Block.blocksList[blockId]))
return;
if (tile instanceof IInventory) {
IInventory inventory = (IInventory) tile;
ItemStack stack = checkExtract(inventory, true, pos.orientation.reverse());
ItemStack[] extracted = checkExtract(inventory, true, pos.orientation.reverse());
if (stack == null || stack.stackSize == 0) {
powerProvider.useEnergy(1, 1, false);
return;
for(ItemStack stack : extracted) {
if (stack == null || stack.stackSize == 0) {
powerProvider.useEnergy(1, 1, false);
continue;
}
Position entityPos = new Position(pos.x + 0.5, pos.y + Utils.getPipeFloorOf(stack), pos.z + 0.5,
pos.orientation.reverse());
entityPos.moveForwards(0.5);
EntityPassiveItem entity = new EntityPassiveItem(w, entityPos.x, entityPos.y, entityPos.z, stack);
((PipeTransportItems) transport).entityEntering(entity, entityPos.orientation);
}
Position entityPos = new Position(pos.x + 0.5, pos.y + Utils.getPipeFloorOf(stack), pos.z + 0.5,
pos.orientation.reverse());
entityPos.moveForwards(0.5);
EntityPassiveItem entity = new EntityPassiveItem(w, entityPos.x, entityPos.y, entityPos.z, stack);
((PipeTransportItems) transport).entityEntering(entity, entityPos.orientation);
}
}
@ -125,10 +127,10 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
* inventory, null if none. On certain cases, the extractable slot depends
* on the position of the pipe.
*/
public ItemStack checkExtract(IInventory inventory, boolean doRemove, Orientations from) {
public ItemStack[] checkExtract(IInventory inventory, boolean doRemove, Orientations from) {
if (inventory instanceof ISpecialInventory)
// TAKE INTO ACCOUNT SPECIAL INVENTORIES!!!
return ((ISpecialInventory) inventory).extractItem(doRemove, from);
return ((ISpecialInventory) inventory).extractItem(doRemove, from, 1);
if (inventory instanceof ISidedInventory) {
ISidedInventory sidedInv = (ISidedInventory) inventory;
@ -141,7 +143,7 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
ItemStack result = checkExtractGeneric(inv, doRemove, from, first, last);
if (result != null)
return result;
return new ItemStack[] { result };
} else if (inventory.getSizeInventory() == 2) {
// This is an input-output inventory
@ -156,9 +158,9 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
if (slot != null && slot.stackSize > 0)
if (doRemove)
return inventory.decrStackSize(slotIndex, (int) powerProvider.useEnergy(1, slot.stackSize, true));
return new ItemStack[] { inventory.decrStackSize(slotIndex, (int) powerProvider.useEnergy(1, slot.stackSize, true)) };
else
return slot;
return new ItemStack[] { slot };
} else if (inventory.getSizeInventory() == 3) {
// This is a furnace-like inventory
@ -175,9 +177,9 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
if (slot != null && slot.stackSize > 0)
if (doRemove)
return inventory.decrStackSize(slotIndex, (int) powerProvider.useEnergy(1, slot.stackSize, true));
return new ItemStack[] { inventory.decrStackSize(slotIndex, (int) powerProvider.useEnergy(1, slot.stackSize, true)) };
else
return slot;
return new ItemStack[] { slot };
} else {
// This is a generic inventory
IInventory inv = Utils.getInventory(inventory);
@ -185,7 +187,7 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
ItemStack result = checkExtractGeneric(inv, doRemove, from, 0, inv.getSizeInventory() - 1);
if (result != null)
return result;
return new ItemStack[] { result };
}
return null;