From 4a9b24c9b7c40bfe756a7e2ca29717f5038afccf Mon Sep 17 00:00:00 2001 From: payonel Date: Mon, 27 Nov 2017 13:56:36 -0800 Subject: [PATCH] merge oops --- .../cil/oc/common/tileentity/Microcontroller.scala | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala b/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala index 3a135e872..c5532bd6e 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala @@ -261,18 +261,11 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C override def removeStackFromSlot(slot: Int) = null // Nope. - override def getAccessibleSlotsFromSide(side: Int): Array[Int] = Array() + override def canExtractItem(slot: Int, stack: ItemStack, side: EnumFacing) = false - override def canExtractItem(slot: Int, stack: ItemStack, side: Int) = false + override def canInsertItem(slot: Int, stack: ItemStack, side: EnumFacing) = false - override def canInsertItem(slot: Int, stack: ItemStack, side: Int) = false - - // Nope. - override def getAccessibleSlotsFromSide(side: Int): Array[Int] = Array() - - override def canExtractItem(slot: Int, stack: ItemStack, side: Int) = false - - override def canInsertItem(slot: Int, stack: ItemStack, side: Int) = false + override def getSlotsForFace(side: EnumFacing): Array[Int] = Array() // For hotswapping EEPROMs. def changeEEPROM(newEeprom: ItemStack) = {