Finished RF support implementation

This commit is contained in:
bdew committed 2013-12-01 22:46:06 +02:00
1 parent 25fcb30866
commit 3ffd9298ca
5 files changed
+21 -6

No files matched your search

+1 -1
View File
@@ -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')) {
@@ -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
}
@@ -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) {
@@ -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)
}
}
@@ -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