diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 8189d0c7d..f748aca0d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -22,6 +22,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -40,7 +41,7 @@ public abstract class TileEntityAdvancedElectricMachine recipe = recipeType.getRecipe(inventory[inputSlot]); @@ -540,7 +541,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { AdvancedMachineRecipe recipe = recipeType.getRecipe(inventory[inputSlot], gasTank.getGasType()); - recipe.operate(inventory, inputSlot, outputSlot, gasTank, secondaryEnergyPerTick); + recipe.operate(inventory, inputSlot, outputSlot, gasTank, (int)secondaryEnergyPerTick); } else { @@ -940,7 +941,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { case SPEED: ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); - secondaryEnergyPerTick = MekanismUtils.getSecondaryEnergyPerTick(this, recipeType.getSecondaryEnergyPerTick()); + secondaryEnergyPerTick = MekanismUtils.getSecondaryEnergyPerTickMean(this, recipeType.getSecondaryEnergyPerTick()); case ENERGY: energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 9ad6356b4..59d4c5db1 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -635,7 +635,18 @@ public final class MekanismUtils */ public static int getSecondaryEnergyPerTick(IUpgradeTile mgmt, int def) { - return (int)(def * Math.pow(general.maxUpgradeMultiplier, mgmt.getComponent().getUpgrades(Upgrade.SPEED)/(float)Upgrade.SPEED.getMax())); + return (int)getSecondaryEnergyPerTickMean(mgmt, def); + } + + /** + * Gets the secondary energy required per tick for a machine via upgrades. + * @param mgmt - tile containing upgrades + * @param def - the original, default secondary energy required + * @return max secondary energy per tick + */ + public static double getSecondaryEnergyPerTickMean(IUpgradeTile mgmt, int def) + { + return (def * Math.pow(general.maxUpgradeMultiplier, mgmt.getComponent().getUpgrades(Upgrade.SPEED)/(float)Upgrade.SPEED.getMax())); } /** diff --git a/src/main/java/mekanism/common/util/StatUtils.java b/src/main/java/mekanism/common/util/StatUtils.java new file mode 100644 index 000000000..f0657e09e --- /dev/null +++ b/src/main/java/mekanism/common/util/StatUtils.java @@ -0,0 +1,30 @@ +package mekanism.common.util; + +import java.util.Random; + +import static java.lang.Math.ceil; +import static java.lang.Math.sqrt; +import static java.lang.Math.exp; +import static java.lang.Math.pow; +import static java.lang.Math.PI; +import static java.lang.Math.E; + +public class StatUtils +{ + public static Random rand = new Random(); + + public static int inversePoisson(double mean) + { + double r = rand.nextDouble() * exp(mean); + int m = 0; + double p = 1; + double stirlingValue = mean * E; + double stirlingCoeff = 1 / sqrt(2 * PI); + while ((p < r) && (m < 3*ceil(mean))) + { + m ++; + p += stirlingCoeff/sqrt(m) * pow((stirlingValue/m), m); + } + return m; + } +}