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

port wooden/emerald/emzuli item pipes

Browse source
This commit is contained in:
asiekierka 2014-09-03 20:17:04 +02:00
parent f477d66b00
commit 13368007f7
3 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/buildcraft/transport/pipes/PipeItemsEmerald.java
View file

@ -131,10 +131,9 @@ public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGu
}
if (doRemove) {
double energyUsed = mjStored > stack.stackSize ? stack.stackSize : mjStored;
mjStored -= energyUsed;
stack = inventory.decrStackSize(k, (int) Math.floor(energyUsed));
int stackSize = battery.useEnergy(1, stack.stackSize, false);
stack = inventory.decrStackSize(k, stackSize);
}
return new ItemStack[] {stack};

7
common/buildcraft/transport/pipes/PipeItemsEmzuli.java
View file

@ -124,10 +124,9 @@ public class PipeItemsEmzuli extends PipeItemsWood implements IGuiReturnHandler
continue;
}
if (doRemove) {
double energyUsed = mjStored > stack.stackSize ? stack.stackSize : mjStored;
mjStored -= energyUsed;
return inventory.decrStackSize(i, (int) energyUsed);
int stackSize = battery.useEnergy(1, stack.stackSize, false);
return inventory.decrStackSize(i, stackSize);
} else {
return stack;
}

54
common/buildcraft/transport/pipes/PipeItemsWood.java
View file

@ -8,24 +8,22 @@
*/
package buildcraft.transport.pipes;
import cofh.api.energy.IEnergyHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport;
import buildcraft.api.core.IIconProvider;
import buildcraft.api.core.Position;
import buildcraft.api.mj.MjBattery;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeManager;
import buildcraft.core.RFBattery;
import buildcraft.core.inventory.InvUtils;
import buildcraft.core.inventory.InventoryWrapper;
import buildcraft.transport.Pipe;
@ -33,11 +31,9 @@ import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportItems;
import buildcraft.transport.TravelingItem;
public class PipeItemsWood extends Pipe<PipeTransportItems> {
@MjBattery (maxCapacity = 64, maxReceivedPerCycle = 64, minimumConsumption = 0)
public double mjStored = 0;
public class PipeItemsWood extends Pipe<PipeTransportItems> implements IEnergyHandler {
protected RFBattery battery = new RFBattery(640, 640, 0);
protected int standardIconIndex = PipeIconProvider.TYPE.PipeItemsWood_Standard.ordinal();
protected int solidIconIndex = PipeIconProvider.TYPE.PipeAllWood_Solid.ordinal();
@ -107,12 +103,12 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> {
return;
}
if (mjStored > 0) {
if (battery.getEnergyStored() > 0) {
if (transport.getNumberOfStacks() < PipeTransportItems.MAX_PIPE_STACKS) {
extractItems();
}
mjStored = 0;
battery.setEnergy(0);
}
}
@ -142,7 +138,7 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> {
for (ItemStack stack : extracted) {
if (stack == null || stack.stackSize == 0) {
mjStored = mjStored > 1 ? mjStored - 1 : 0;
battery.useEnergy(1, 1, false);
continue;
}
@ -192,10 +188,9 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> {
if (slot != null && slot.stackSize > 0 && inventory.canExtractItem(k, slot, from.ordinal())) {
if (doRemove) {
double energyUsed = mjStored > slot.stackSize ? slot.stackSize : mjStored;
mjStored -= energyUsed;
return inventory.decrStackSize(k, (int) energyUsed);
int stackSize = battery.useEnergy(1, slot.stackSize, false);
return inventory.decrStackSize(k, stackSize);
} else {
return slot;
}
@ -204,4 +199,31 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> {
return null;
}
@Override
public boolean canConnectEnergy(ForgeDirection from) {
return true;
}
@Override
public int receiveEnergy(ForgeDirection from, int maxReceive,
boolean simulate) {
return battery.receiveEnergy(maxReceive, simulate);
}
@Override
public int extractEnergy(ForgeDirection from, int maxExtract,
boolean simulate) {
return 0;
}
@Override
public int getEnergyStored(ForgeDirection from) {
return battery.getEnergyStored();
}
@Override
public int getMaxEnergyStored(ForgeDirection from) {
return battery.getMaxEnergyStored();
}
}