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

RS Engines can no longer power pipes.

Browse source
This commit is contained in:
CovertJaguar 2012-10-18 01:57:39 -07:00
parent bba98ed3c2
commit 6b96ce7fd2
5 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/buildcraft/energy/Engine.java
View file

@ -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) {

13
common/buildcraft/factory/BlockMiningWell.java
View file

@ -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;

8
common/buildcraft/factory/TileMiningWell.java
View file

@ -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);
}
/**

12
common/buildcraft/factory/TilePump.java
View file

@ -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);
}

4
common/buildcraft/transport/pipes/PipePowerWood.java
View file

@ -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)