tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some merge dodginess.

Browse source
This commit is contained in:
Ben Spiers 2014-11-13 22:18:26 +00:00
parent c5e8c866ce
commit 2507bd3ecb
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/mekanism/common/multipart/PartUniversalCable.java
View file

@ -110,30 +110,26 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
}
else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
{
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * Mekanism.FROM_TE;
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * general.FROM_TE;
double toDraw = received;
if(received > 0)
{
toDraw -= getTransmitterNetwork().emit(received, true);
}
<<<<<<< HEAD
((IEnergySource)acceptor).drawEnergy(toDraw*general.TO_IC2);
=======
((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)toDraw, false);
}
else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource)
{
double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * Mekanism.FROM_IC2, drawAmount);
double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, drawAmount);
double toDraw = received;
if(received > 0)
{
toDraw -= getTransmitterNetwork().emit(received, true);
}
((IEnergySource)outputter).drawEnergy(toDraw * Mekanism.TO_IC2);
>>>>>>> 92f1579... Make PULL mode actually, and exclusively, pull.
((IEnergySource)outputter).drawEnergy(toDraw * general.TO_IC2);
}
}
}

1
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
View file

@ -3,7 +3,6 @@ package mekanism.common.tile;
import java.util.ArrayList;
import mekanism.api.EnumColor;
import mekanism.api.StackUtils;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;

1
src/main/java/mekanism/common/tile/TileEntityFactory.java
View file

@ -8,7 +8,6 @@ import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.Range4D;
import mekanism.api.StackUtils;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;

2
src/main/java/mekanism/generators/common/MekanismGenerators.java
View file

@ -98,7 +98,7 @@ public class MekanismGenerators implements IModule
}
}
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * Mekanism.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * general.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
}
}

6
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
View file

@ -254,4 +254,10 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i
controlType = type;
MekanismUtils.saveChunk(this);
}
@Override
public boolean canPulse()
{
return false;
}
}