From 89072101f4ba9054b0c5ab79bc828292fc33506d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 29 Aug 2014 21:50:34 +0200 Subject: [PATCH] Fixed some slots being invisible due to the last commit. --- src/main/scala/li/cil/oc/common/Slot.scala | 1 + src/main/scala/li/cil/oc/common/container/Player.scala | 2 +- src/main/scala/li/cil/oc/common/container/RobotAssembler.scala | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/Slot.scala b/src/main/scala/li/cil/oc/common/Slot.scala index 07922fb6a..5c989dd11 100644 --- a/src/main/scala/li/cil/oc/common/Slot.scala +++ b/src/main/scala/li/cil/oc/common/Slot.scala @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack object Slot { val None = "none" + val Any = "any" val Card = "card" val ComponentBus = "component_bus" val Container = "container" diff --git a/src/main/scala/li/cil/oc/common/container/Player.scala b/src/main/scala/li/cil/oc/common/container/Player.scala index d006ad416..88ab357cf 100644 --- a/src/main/scala/li/cil/oc/common/container/Player.scala +++ b/src/main/scala/li/cil/oc/common/container/Player.scala @@ -86,7 +86,7 @@ abstract class Player(val playerInventory: InventoryPlayer, val otherInventory: } } - def addSlotToContainer(x: Int, y: Int, slot: String = common.Slot.None, tier: Int = common.Tier.Any) { + def addSlotToContainer(x: Int, y: Int, slot: String = common.Slot.Any, tier: Int = common.Tier.Any) { val index = inventorySlots.size addSlotToContainer(new StaticComponentSlot(this, otherInventory, index, x, y, slot, tier)) } diff --git a/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala b/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala index aae69d5bd..d2dad74b2 100644 --- a/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala +++ b/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala @@ -13,7 +13,7 @@ class RobotAssembler(playerInventory: InventoryPlayer, val assembler: tileentity // Computer case. { val index = inventorySlots.size - addSlotToContainer(new StaticComponentSlot(this, otherInventory, index, 12, 12, common.Slot.None, common.Tier.Any) { + addSlotToContainer(new StaticComponentSlot(this, otherInventory, index, 12, 12, common.Slot.Any, common.Tier.Any) { @SideOnly(Side.CLIENT) override def func_111238_b() = !isAssembling && super.func_111238_b()