AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-03-26 07:40:12 +01:00
commit 52deb48670
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/common/tileentity/Assembler.scala
View File

@ -113,16 +113,14 @@ class Assembler extends traits.Environment with traits.PowerAcceptor with traits
super.updateEntity() super.updateEntity()
if (output.isDefined && world.getTotalWorldTime % Settings.get.tickFrequency == 0) { if (output.isDefined && world.getTotalWorldTime % Settings.get.tickFrequency == 0) {
val want = math.max(1, math.min(requiredEnergy, Settings.get.assemblerTickAmount * Settings.get.tickFrequency)) val want = math.max(1, math.min(requiredEnergy, Settings.get.assemblerTickAmount * Settings.get.tickFrequency))
val success = Settings.get.ignorePower || node.tryChangeBuffer(-want) val have = want + (if (Settings.get.ignorePower) 0 else node.changeBuffer(-want))
if (success) { requiredEnergy -= have
requiredEnergy -= want
}
if (requiredEnergy <= 0) { if (requiredEnergy <= 0) {
setInventorySlotContents(0, output.get) setInventorySlotContents(0, output.get)
output = None output = None
requiredEnergy = 0 requiredEnergy = 0
} }
ServerPacketSender.sendRobotAssembling(this, success && output.isDefined) ServerPacketSender.sendRobotAssembling(this, have > 0.5 && output.isDefined)
} }
} }

8
src/main/scala/li/cil/oc/common/tileentity/Printer.scala
View File

@ -228,10 +228,8 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
if (output.isDefined) { if (output.isDefined) {
val want = math.max(1, math.min(requiredEnergy, Settings.get.printerTickAmount)) val want = math.max(1, math.min(requiredEnergy, Settings.get.printerTickAmount))
val success = Settings.get.ignorePower || node.tryChangeBuffer(-want) val have = want + (if (Settings.get.ignorePower) 0 else node.changeBuffer(-want))
if (success) { requiredEnergy -= have
requiredEnergy -= want
}
if (requiredEnergy <= 0) { if (requiredEnergy <= 0) {
val result = getStackInSlot(slotOutput) val result = getStackInSlot(slotOutput)
if (result == null) { if (result == null) {
@ -247,7 +245,7 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
requiredEnergy = 0 requiredEnergy = 0
output = None output = None
} }
ServerPacketSender.sendPrinting(this, success && output.isDefined) ServerPacketSender.sendPrinting(this, have > 0.5 && output.isDefined)
} }
if (maxAmountMaterial - amountMaterial >= materialPerItem) { if (maxAmountMaterial - amountMaterial >= materialPerItem) {

2
src/main/scala/li/cil/oc/server/network/Network.scala
View File

@ -392,7 +392,7 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
} }
} }
} }
remaining -remaining
} }
else /* if (delta > 0) */ { else /* if (delta > 0) */ {
var remaining = delta var remaining = delta