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

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source
This commit is contained in:
payonel 2021-05-14 19:08:08 -07:00
commit 0f3feaed3c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala
View File

@ -129,7 +129,11 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr
} }
val selectedEmptyContainer: Option[ItemStack] = inQueue.getItem.getContainerItem(inQueue) match { val selectedEmptyContainer: Option[ItemStack] = inQueue.getItem.getContainerItem(inQueue) match {
case requiredContainer if requiredContainer != null && requiredContainer.stackSize > 0 => previousSelectedItem match { case requiredContainer if requiredContainer != null && requiredContainer.stackSize > 0 => previousSelectedItem match {
case slotItem: ItemStack if slotItem != null && slotItem.stackSize > 0 && slotItem.getItem == requiredContainer.getItem => Option(slotItem.copy) case slotItem: ItemStack if
slotItem != null &&
slotItem.stackSize > 0 &&
slotItem.getItem == requiredContainer.getItem &&
ItemStack.areItemStackTagsEqual(slotItem, requiredContainer) => Option(slotItem.copy)
case _ => return result(false, "removing this fuel requires the appropriate container in the selected slot") case _ => return result(false, "removing this fuel requires the appropriate container in the selected slot")
} }
case _ => None // nothing to do, nothing required case _ => None // nothing to do, nothing required
@ -193,7 +197,7 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr
} }
} }
private def updateClient() = host match { private def updateClient(): Unit = host match {
case robot: internal.Robot => robot.synchronizeSlot(robot.componentSlot(node.address)) case robot: internal.Robot => robot.synchronizeSlot(robot.componentSlot(node.address))
case _ => case _ =>
} }
@ -240,6 +244,3 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr
} }
} }
} }
class GeneratorActionException extends Exception {
}