Merge pull request #2054 from adudney/RedstoneEngine

Fixed redstone engines being 1/10th as effective as they should be
This commit is contained in:
Adrian Siekierka 2014-10-19 08:02:07 +02:00
commit 12e2cb0574
2 changed files with 4 additions and 4 deletions

View file

@ -83,7 +83,7 @@ public class TileEngineWood extends TileEngine {
if (isRedstonePowered) {
if (worldObj.getTotalWorldTime() % 16 == 0) {
addEnergy(1);
addEnergy(10);
}
}
}
@ -110,7 +110,7 @@ public class TileEngineWood extends TileEngine {
@Override
public int maxEnergyExtracted() {
return 1;
return 10;
}
// TODO: HACK

View file

@ -142,7 +142,7 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> implements IEnergyHa
for (ItemStack stack : extracted) {
if (stack == null || stack.stackSize == 0) {
battery.useEnergy(1, 1, false);
battery.useEnergy(10, 10, false);
continue;
}
@ -192,7 +192,7 @@ public class PipeItemsWood extends Pipe<PipeTransportItems> implements IEnergyHa
if (slot != null && slot.stackSize > 0 && inventory.canExtractItem(k, slot, from.ordinal())) {
if (doRemove) {
int stackSize = battery.useEnergy(1, slot.stackSize, false);
int stackSize = battery.useEnergy(10, slot.stackSize*10, false)/10;
return inventory.decrStackSize(k, stackSize);
} else {