From b46d49e269a428e23a1a0c24ebfafe156751a034 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sat, 15 Jun 2019 22:49:35 +0200 Subject: [PATCH] +fixed Solar crash Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- .../emt/tile/solar/TileEntitySolarBase.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index bc9a1e8..f467ac7 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -292,7 +292,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW this.aspect = subtag.getByte("aspect"); this.output = subtag.getDouble("Output"); long capacity = (long) (output * 1000); - this.energySource = new DefinitelyNotAIC2Source(this, capacity, (int) Math.floor(Math.log10(capacity) - 1D)); + this.energySource = new DefinitelyNotAIC2Source(this, capacity, (int) getTierFromCapacity(capacity)); this.maxstorage = this.getEUCapacity(); this.energySource.setEnergyStored(nbttagcompound.getLong("storage")); this.storage = this.energySource.getEnergyStored(); @@ -424,25 +424,26 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } public long getOutputAmperage() { - long ret; - if (this.energySource.getSourceTier() <= 4) { - if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 2]) { - ret = 1L; - } - if (this.generating % GT_Values.V[this.energySource.getSourceTier() - 2] == 0.0D) { - ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]); - } else - ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2])); - } else { - if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 1]) { - ret = 1L; - } - if (this.generating % GT_Values.V[this.energySource.getSourceTier()] == 0.0D) { - ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]); - } else - ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1])); - } - return ret; + return calculateMaxVoltAmp()[1]; +// long ret; +// if (this.energySource.getSourceTier() <= 4) { +// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 2]) { +// ret = 1L; +// } +// if (this.generating % GT_Values.V[this.energySource.getSourceTier() - 2] == 0.0D) { +// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2]); +// } else +// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 2])); +// } else { +// if (this.generating <= GT_Values.V[this.energySource.getSourceTier() - 1]) { +// ret = 1L; +// } +// if (this.generating % GT_Values.V[this.energySource.getSourceTier()] == 0.0D) { +// ret = (long) (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1]); +// } else +// ret = (long) (1L + (this.generating / GT_Values.V[this.energySource.getSourceTier() - 1])); +// } +// return ret; } public long getOutputVoltage() {