diff --git a/common/buildcraft/energy/Engine.java b/common/buildcraft/energy/Engine.java index 911d5c52..2768642b 100644 --- a/common/buildcraft/energy/Engine.java +++ b/common/buildcraft/energy/Engine.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -110,6 +110,9 @@ public abstract class Engine { actualMax = max; } + if(actualMax < min) + return 0; + float extracted; if (energy >= actualMax) { diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 4e25a405..a161dbf1 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -15,7 +15,6 @@ import buildcraft.api.core.Orientations; import buildcraft.api.core.Position; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; -import buildcraft.factory.BlockMachineRoot; import net.minecraft.src.EntityLiving; import net.minecraft.src.ItemStack; @@ -69,13 +68,13 @@ public class BlockMiningWell extends BlockMachineRoot { world.setBlockMetadataWithNotify(i, j, k, orientation.reverse().ordinal()); } - - + + @Override public TileEntity createNewTileEntity(World var1) { return new TileMiningWell(); } - + @Override public String getTextureFile() { return DefaultProps.TEXTURE_BLOCKS; diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 6f251eed..85538df1 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -34,7 +34,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep public TileMiningWell() { powerProvider = PowerFramework.currentFramework.createPowerProvider(); - powerProvider.configure(50, 25, 25, 25, 1000); + powerProvider.configure(50, 1, 25, 25, 1000); } /** diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 35f75146..8b0761d3 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -53,7 +53,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor { public TilePump() { powerProvider = PowerFramework.currentFramework.createPowerProvider(); - powerProvider.configure(20, 10, 10, 10, 100); + powerProvider.configure(20, 1, 10, 10, 100); } // TODO, manage this by different levels (pump what's above first...) @@ -129,7 +129,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor { p.moveForwards(1); TileEntity tile = worldObj.getBlockTileEntity((int) p.x, (int) p.y, (int) p.z); - + if(tile instanceof ITankContainer) { internalLiquid -= ((ITankContainer)tile).fill(p.orientation.reverse(), new LiquidStack(liquidId, internalLiquid), true); if(internalLiquid <= 0) @@ -278,7 +278,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor { liquidId = nbttagcompound.getInteger("liquidId"); PowerFramework.currentFramework.loadPowerProvider(this, nbttagcompound); - powerProvider.configure(20, 10, 10, 10, 100); + powerProvider.configure(20, 1, 10, 10, 100); } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 6c191ac4..96586a9c 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -30,7 +30,7 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { super(new PipeTransportPower(), new PipeLogicWood(), itemID); powerProvider = PowerFramework.currentFramework.createPowerProvider(); - powerProvider.configure(50, 1, 1000, 1, 1000); + powerProvider.configure(50, 2, 1000, 1, 1000); powerProvider.configurePowerPerdition(1, 100); } @@ -38,7 +38,7 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { public String getTextureFile() { return DefaultProps.TEXTURE_BLOCKS; } - + @Override public int getTextureIndex(Orientations direction) { if (direction == Orientations.Unknown)