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

Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor

Browse source
This commit is contained in:
Krapht 2012-07-24 21:36:37 +02:00
commit 414b6e5aa4
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java
View file

@ -18,13 +18,14 @@ import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.IMachine;
import net.minecraft.src.buildcraft.core.StackUtil;
import net.minecraft.src.buildcraft.core.Utils;
import net.minecraft.src.buildcraft.core.network.PacketIds;
import net.minecraft.src.buildcraft.core.network.PacketUpdate;
import net.minecraft.src.buildcraft.core.network.TilePacketWrapper;
public class TileAssemblyTable extends TileEntity implements IInventory, IPipeConnection {
public class TileAssemblyTable extends TileEntity implements IMachine, IInventory, IPipeConnection {
ItemStack[] items = new ItemStack[12];
@ -433,4 +434,24 @@ public class TileAssemblyTable extends TileEntity implements IInventory, IPipeCo
iCrafting.updateCraftingInventoryInfo(container, 1, (int) energyStored);
}
@Override
public boolean isActive() {
return currentRecipe != null;
}
@Override
public boolean manageLiquids() {
return false;
}
@Override
public boolean manageSolids() {
return false;
}
@Override
public boolean allowActions() {
return false;
}
}

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

@ -102,6 +102,8 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
IInventory inventory = (IInventory) tile;
ItemStack[] extracted = checkExtract(inventory, true, pos.orientation.reverse());
if (extracted == null)
return;
for(ItemStack stack : extracted) {
if (stack == null || stack.stackSize == 0) {