diff --git a/build.gradle b/build.gradle index 6a551ac..9bf7c39 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' apply plugin: 'scala' version = "0.9.2" -ext.bdlibver = "0.9.0.2" +ext.bdlibver = "0.9.1.5" ext.versuffix = "mc164" if (project.hasProperty('buildnum')) { diff --git a/resources/assets/gendustry/gendustry-tuning.cfg b/resources/assets/gendustry/gendustry-tuning.cfg index 806c0ab..2609331 100644 --- a/resources/assets/gendustry/gendustry-tuning.cfg +++ b/resources/assets/gendustry/gendustry-tuning.cfg @@ -7,6 +7,7 @@ // MinReceivedEnergy: // Min energy received into buffer in a single pulse // Should be reasonably high to prevent small update spam +// Applies to power recieved as MJ only // // MaxReceivedEnergy: // Max energy received into buffer in a single pulse @@ -23,6 +24,7 @@ // PowerLoss, PowerLossInterval: // Power loss from internal buffer, will loose on average PowerLoss/PowerLossInterval MJ/tick // Cannot be set below 0.01, this is enforced by BC API +// Applies to the intermediate MJ buffer only // // MjPerItem: // Cost of a single operation in MJ, for most machines this means processing 1 item @@ -235,4 +237,8 @@ cfg Upgrades { energy *= 1.25 collectingPollen = Y } +} + +cfg Power { + RF_MJ_Ratio = 10 } \ No newline at end of file diff --git a/src/net/bdew/gendustry/power/DataSlotPower.scala b/src/net/bdew/gendustry/power/DataSlotPower.scala index 7c60ddc..a477b46 100644 --- a/src/net/bdew/gendustry/power/DataSlotPower.scala +++ b/src/net/bdew/gendustry/power/DataSlotPower.scala @@ -20,9 +20,10 @@ case class DataSlotPower(name: String, parent: TileDataSlots, kind: PowerHandler var stored = 0F var capacity = 0F + var maxReceive = 0F def inject(v: Float, simulate: Boolean): Float = { - val canAdd = Misc.clamp(v, 0F, capacity - stored) + val canAdd = Misc.clamp(v, 0F, Misc.min(capacity - stored, maxReceive)) if ((canAdd > 0) && !simulate) { stored += canAdd parent.dataSlotChanged(this) @@ -41,6 +42,7 @@ case class DataSlotPower(name: String, parent: TileDataSlots, kind: PowerHandler def configure(cfg: PoweredMachine) { capacity = cfg.maxStoredEnergy + maxReceive = cfg.maxReceivedEnergy } def save(t: NBTTagCompound, kind: UpdateKind.Value) { diff --git a/src/net/bdew/gendustry/power/TilePoweredMJ.scala b/src/net/bdew/gendustry/power/TilePoweredMJ.scala index be0bd75..53e88b0 100644 --- a/src/net/bdew/gendustry/power/TilePoweredMJ.scala +++ b/src/net/bdew/gendustry/power/TilePoweredMJ.scala @@ -21,13 +21,20 @@ trait TilePoweredMJ extends TilePoweredBase with IPowerReceptor { def getWorld = worldObj serverTick.listen(() => { - val transfer = power.inject(powerHandler.getEnergyStored, false) - powerHandler.useEnergy(transfer, transfer, true) + if (power.stored < power.capacity && powerHandler.getEnergyStored > 0) { + // this is needed because perdition is stupid and can get applied after getEnergyStored and ninja-reduce the value >.> + val canSend = powerHandler.useEnergy(0, power.capacity - power.stored, false) + val transferred = power.inject(canSend, false) + powerHandler.useEnergy(transferred, transferred, true) + } }) + persistSave.listen(t => powerHandler.writeToNBT(t, "bcPower")) + persistLoad.listen(t => if (t.hasKey("bcPower")) powerHandler.readFromNBT(t, "bcPower")) + override def configurePower(cfg: PoweredMachine) { super.configurePower(cfg) - powerHandler.configure(cfg.minReceivedEnergy, cfg.maxReceivedEnergy, cfg.activationEnergy, cfg.maxStoredEnergy) + powerHandler.configure(cfg.minReceivedEnergy, cfg.maxReceivedEnergy, cfg.activationEnergy, cfg.maxReceivedEnergy * 10) powerHandler.configurePowerPerdition(cfg.powerLoss, cfg.powerLossInterval) } } diff --git a/src/net/bdew/gendustry/power/TilePoweredRF.scala b/src/net/bdew/gendustry/power/TilePoweredRF.scala index 7ba382c..3804a98 100644 --- a/src/net/bdew/gendustry/power/TilePoweredRF.scala +++ b/src/net/bdew/gendustry/power/TilePoweredRF.scala @@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection import net.bdew.gendustry.config.Tuning trait TilePoweredRF extends TilePoweredBase with IEnergyHandler { - lazy val ratio = Tuning.getSection("Power").getFloat("RF/MJ Ratio") + lazy val ratio = Tuning.getSection("Power").getFloat("RF_MJ_Ratio") def receiveEnergy(from: ForgeDirection, maxReceive: Int, simulate: Boolean) = (power.inject(maxReceive / ratio, simulate) * ratio).floor.toInt