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

Added limiting to number of blocks printed, defaults to one, optional parameter to printer3d.commit().

Browse Source
This commit is contained in:
Florian Nücke 2015-03-24 22:37:19 +01:00
parent f150db952e
commit b9b7f41884
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
var data = new PrintData() var data = new PrintData()
var isActive = false var isActive = false
var limit = 0
var output: Option[ItemStack] = None var output: Option[ItemStack] = None
var totalRequiredEnergy = 0.0 var totalRequiredEnergy = 0.0
var requiredEnergy = 0.0 var requiredEnergy = 0.0
@ -167,12 +168,13 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
@Callback(doc = """function():number -- Get the maximum allowed number of shapes.""") @Callback(doc = """function():number -- Get the maximum allowed number of shapes.""")
def getMaxShapeCount(context: Context, args: Arguments): Array[Object] = result(Settings.get.maxPrintComplexity) def getMaxShapeCount(context: Context, args: Arguments): Array[Object] = result(Settings.get.maxPrintComplexity)
@Callback(doc = """function():boolean -- Commit and begin printing the current configuration.""") @Callback(doc = """function([count:number]):boolean -- Commit and begin printing the current configuration.""")
def commit(context: Context, args: Arguments): Array[Object] = { def commit(context: Context, args: Arguments): Array[Object] = {
if (!canPrint) { if (!canPrint) {
return result(null, "model invalid") return result(null, "model invalid")
} }
isActive = true isActive = true
limit = (args.optDouble(0, 1) max 0 min Integer.MAX_VALUE).toInt
result(true) result(true)
} }
@ -210,7 +212,9 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
if (amountMaterial >= materialRequired && amountInk >= inkRequired) { if (amountMaterial >= materialRequired && amountInk >= inkRequired) {
amountMaterial -= materialRequired amountMaterial -= materialRequired
amountInk -= inkRequired amountInk -= inkRequired
limit -= 1
output = Option(data.createItemStack()) output = Option(data.createItemStack())
if (limit < 1) isActive = false
ServerPacketSender.sendPrinting(this, printing = true) ServerPacketSender.sendPrinting(this, printing = true)
} }
} }
@ -261,6 +265,7 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
amountInk = nbt.getInteger(Settings.namespace + "amountInk") amountInk = nbt.getInteger(Settings.namespace + "amountInk")
data.load(nbt.getCompoundTag(Settings.namespace + "data")) data.load(nbt.getCompoundTag(Settings.namespace + "data"))
isActive = nbt.getBoolean(Settings.namespace + "active") isActive = nbt.getBoolean(Settings.namespace + "active")
limit = nbt.getInteger(Settings.namespace + "limit")
if (nbt.hasKey(Settings.namespace + "output")) { if (nbt.hasKey(Settings.namespace + "output")) {
output = Option(ItemUtils.loadStack(nbt.getCompoundTag(Settings.namespace + "output"))) output = Option(ItemUtils.loadStack(nbt.getCompoundTag(Settings.namespace + "output")))
} }
@ -274,6 +279,7 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat
nbt.setInteger(Settings.namespace + "amountInk", amountInk) nbt.setInteger(Settings.namespace + "amountInk", amountInk)
nbt.setNewCompoundTag(Settings.namespace + "data", data.save) nbt.setNewCompoundTag(Settings.namespace + "data", data.save)
nbt.setBoolean(Settings.namespace + "active", isActive) nbt.setBoolean(Settings.namespace + "active", isActive)
nbt.setInteger(Settings.namespace + "limit", limit)
output.foreach(stack => nbt.setNewCompoundTag(Settings.namespace + "output", stack.writeToNBT)) output.foreach(stack => nbt.setNewCompoundTag(Settings.namespace + "output", stack.writeToNBT))
nbt.setDouble(Settings.namespace + "total", totalRequiredEnergy) nbt.setDouble(Settings.namespace + "total", totalRequiredEnergy)
nbt.setDouble(Settings.namespace + "remaining", requiredEnergy) nbt.setDouble(Settings.namespace + "remaining", requiredEnergy)