Fixed Universal Cable IC2 interaction, Solar Evaporation Plants now cool down half as fast as they did previously, also continue to operate with internal heat at night
This commit is contained in:
parent
ebe48abd84
commit
b2be7ffe42
3 changed files with 10 additions and 3 deletions
|
@ -133,10 +133,12 @@ public class EnergyNetwork extends DynamicNetwork<EnergyAcceptorWrapper, EnergyN
|
|||
public double emit(double energyToSend, boolean doEmit)
|
||||
{
|
||||
double toUse = Math.min(getEnergyNeeded(), energyToSend);
|
||||
|
||||
if(doEmit)
|
||||
{
|
||||
buffer.amount += toUse;
|
||||
}
|
||||
|
||||
return energyToSend-toUse;
|
||||
}
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
|
|||
@Override
|
||||
public double transferEnergyToAcceptor(ForgeDirection side, double amount)
|
||||
{
|
||||
return acceptor.injectEnergy(side, toEU(amount), 0);
|
||||
return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -201,5 +201,10 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
|
|||
{
|
||||
return joules * general.TO_IC2;
|
||||
}
|
||||
|
||||
public double fromEU(double eu)
|
||||
{
|
||||
return eu * general.FROM_IC2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -195,7 +195,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
|
|||
|
||||
public boolean canOperate(SolarEvaporationRecipe recipe)
|
||||
{
|
||||
if(!structured || height < 3 || height > 18 || inputTank.getFluid() == null || getTempMultiplier() == 0)
|
||||
if(!structured || height < 3 || height > 18 || inputTank.getFluid() == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -314,7 +314,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
|
|||
|
||||
if(getTempMultiplier() == 0)
|
||||
{
|
||||
temperature = Math.max(0, getTemperature()-(max/WARMUP));
|
||||
temperature = Math.max(0, getTemperature()-(max/(WARMUP*2)));
|
||||
}
|
||||
else {
|
||||
temperature = Math.min(max, getTemperature()+incr);
|
||||
|
|
Loading…
Reference in a new issue