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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-08-29 21:50:50 +02:00
commit f1e47015b3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/li/cil/oc/common/Slot.scala
View File

@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack
object Slot { object Slot {
val None = "none" val None = "none"
val Any = "any"
val Card = "card" val Card = "card"
val ComponentBus = "component_bus" val ComponentBus = "component_bus"
val Container = "container" val Container = "container"

2
src/main/scala/li/cil/oc/common/container/Player.scala
View File

@ -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 val index = inventorySlots.size
addSlotToContainer(new StaticComponentSlot(this, otherInventory, index, x, y, slot, tier)) addSlotToContainer(new StaticComponentSlot(this, otherInventory, index, x, y, slot, tier))
} }

2
src/main/scala/li/cil/oc/common/container/RobotAssembler.scala
View File

@ -13,7 +13,7 @@ class RobotAssembler(playerInventory: InventoryPlayer, val assembler: tileentity
// Computer case. // Computer case.
{ {
val index = inventorySlots.size 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 @SideOnly(Side.CLIENT) override
def func_111238_b() = !isAssembling && super.func_111238_b() def func_111238_b() = !isAssembling && super.func_111238_b()