AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-11 08:16:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tablets can now be disassembled.

Browse Source
This commit is contained in:
Florian Nücke 2014-09-24 09:46:03 +02:00
parent b2df4a4910
commit 9f7f22cfa1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
View File

@ -84,6 +84,7 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra
else if (api.Items.get(stack) == api.Items.get("server1")) enqueueServer(stack, 0) else if (api.Items.get(stack) == api.Items.get("server1")) enqueueServer(stack, 0)
else if (api.Items.get(stack) == api.Items.get("server2")) enqueueServer(stack, 1) else if (api.Items.get(stack) == api.Items.get("server2")) enqueueServer(stack, 1)
else if (api.Items.get(stack) == api.Items.get("server3")) enqueueServer(stack, 2) else if (api.Items.get(stack) == api.Items.get("server3")) enqueueServer(stack, 2)
else if (api.Items.get(stack) == api.Items.get("tablet")) enqueueTablet(stack)
else if (api.Items.get(stack) == api.Items.get("navigationUpgrade")) { else if (api.Items.get(stack) == api.Items.get("navigationUpgrade")) {
enqueueNavigationUpgrade(stack) enqueueNavigationUpgrade(stack)
} }
@ -116,6 +117,15 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra
queue ++= getIngredients(server) queue ++= getIngredients(server)
} }
private def enqueueTablet(tablet: ItemStack) {
val info = new ItemUtils.TabletData(tablet)
queue += api.Items.get("tabletCase").createItemStack(1)
queue ++= info.items.collect {
case Some(stack) => stack
}.drop(1) // Screen.
node.changeBuffer(info.energy)
}
private def enqueueNavigationUpgrade(stack: ItemStack) { private def enqueueNavigationUpgrade(stack: ItemStack) {
val info = new ItemUtils.NavigationUpgradeData(stack) val info = new ItemUtils.NavigationUpgradeData(stack)
val parts = getIngredients(stack) val parts = getIngredients(stack)
@ -223,5 +233,6 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra
override def isItemValidForSlot(i: Int, stack: ItemStack) = override def isItemValidForSlot(i: Int, stack: ItemStack) =
api.Items.get(stack) == api.Items.get("robot") || api.Items.get(stack) == api.Items.get("robot") ||
((Settings.get.disassembleAllTheThings || api.Items.get(stack) != null) && !getIngredients(stack).isEmpty) api.Items.get(stack) == api.Items.get("tablet") ||
((Settings.get.disassembleAllTheThings || api.Items.get(stack) != null) && getIngredients(stack).nonEmpty)
} }