Recalcuation things.
This commit is contained in:
parent
83e41478e5
commit
c323969c87
5 changed files with 21 additions and 3 deletions
|
@ -414,7 +414,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||||
{
|
{
|
||||||
super.recalculateUpgradables(upgrade);
|
super.recalculateUpgradables(upgrade);
|
||||||
|
|
||||||
if(upgrade == Upgrade.SPEED || (upgradeableSecondaryEfficiency() && upgrade == Upgrade.ENERGY))
|
if(upgrade == Upgrade.SPEED || (upgradeableSecondaryEfficiency() && upgrade == Upgrade.GAS))
|
||||||
{
|
{
|
||||||
secondaryEnergyPerTick = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_SECONDARY_ENERGY_PER_TICK);
|
secondaryEnergyPerTick = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_SECONDARY_ENERGY_PER_TICK);
|
||||||
}
|
}
|
||||||
|
|
|
@ -219,9 +219,12 @@ public abstract class TileEntityBasicMachine<INPUT extends MachineInput<INPUT>,
|
||||||
{
|
{
|
||||||
case SPEED:
|
case SPEED:
|
||||||
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
||||||
case ENERGY: //and SPEED fall-through.
|
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
||||||
|
break;
|
||||||
|
case ENERGY:
|
||||||
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
||||||
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -476,9 +476,12 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock
|
||||||
{
|
{
|
||||||
case SPEED:
|
case SPEED:
|
||||||
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
||||||
|
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
||||||
|
break;
|
||||||
case ENERGY:
|
case ENERGY:
|
||||||
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
||||||
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -467,12 +467,18 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
|
||||||
|
|
||||||
switch(upgrade)
|
switch(upgrade)
|
||||||
{
|
{
|
||||||
case SPEED:
|
case GAS:
|
||||||
injectUsage = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_INJECT_USAGE);
|
injectUsage = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_INJECT_USAGE);
|
||||||
|
break;
|
||||||
|
case SPEED:
|
||||||
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
||||||
|
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
||||||
|
injectUsage = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_INJECT_USAGE);
|
||||||
|
break;
|
||||||
case ENERGY:
|
case ENERGY:
|
||||||
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
|
||||||
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1034,12 +1034,18 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||||
|
|
||||||
switch(upgrade)
|
switch(upgrade)
|
||||||
{
|
{
|
||||||
|
case GAS:
|
||||||
|
secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType);
|
||||||
|
break;
|
||||||
case SPEED:
|
case SPEED:
|
||||||
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
|
||||||
|
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
||||||
secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType);
|
secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType);
|
||||||
|
break;
|
||||||
case ENERGY:
|
case ENERGY:
|
||||||
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
|
||||||
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue