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

Don't display empty stacks.

Browse Source
This commit is contained in:
Vexatos 2017-05-24 18:26:35 +02:00
parent a766c6f213
commit ac756b6770
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/item/Drone.scala
View File

@ -36,7 +36,7 @@ class Drone(val parent: Delegator) extends traits.Delegate with CustomModel {
override protected def tooltipExtended(stack: ItemStack, tooltip: util.List[String]): Unit = { override protected def tooltipExtended(stack: ItemStack, tooltip: util.List[String]): Unit = {
if (KeyBindings.showExtendedTooltips) { if (KeyBindings.showExtendedTooltips) {
val info = new DroneData(stack) val info = new DroneData(stack)
for (component <- info.components if component != null) { for (component <- info.components if !component.isEmpty) {
tooltip.add("- " + component.getDisplayName) tooltip.add("- " + component.getDisplayName)
} }
} }

3
src/main/scala/li/cil/oc/util/ResultWrapper.scala
View File

@ -1,11 +1,14 @@
package li.cil.oc.util package li.cil.oc.util
import net.minecraft.item.ItemStack
import scala.math.ScalaNumber import scala.math.ScalaNumber
object ResultWrapper { object ResultWrapper {
def result(args: Any*): Array[AnyRef] = { def result(args: Any*): Array[AnyRef] = {
def unwrap(arg: Any): AnyRef = arg match { def unwrap(arg: Any): AnyRef = arg match {
case x: ScalaNumber => x.underlying case x: ScalaNumber => x.underlying
case x: ItemStack if x.isEmpty => null
case x => x.asInstanceOf[AnyRef] case x => x.asInstanceOf[AnyRef]
} }
Array(args map unwrap: _*) Array(args map unwrap: _*)