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

make uC a sided inventory and deny item extract and insert

Browse Source 
fixes interaction with enderio item conduits

closes #2641
This commit is contained in:
payonel 2017-11-24 23:45:18 -08:00
parent 9cb94d391d
commit 4730f44bf7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
View File

@ -18,6 +18,7 @@ import li.cil.oc.common.item.data.MicrocontrollerData
import li.cil.oc.util.ExtendedArguments._ import li.cil.oc.util.ExtendedArguments._
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.ISidedInventory
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.EnumFacing import net.minecraft.util.EnumFacing
@ -27,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
import scala.collection.convert.WrapAsJava._ import scala.collection.convert.WrapAsJava._
class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.Computer with internal.Microcontroller with DeviceInfo { class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.Computer with ISidedInventory with internal.Microcontroller with DeviceInfo {
val info = new MicrocontrollerData() val info = new MicrocontrollerData()
override def node = null override def node = null
@ -146,7 +147,7 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
override protected def connectItemNode(node: Node) { override protected def connectItemNode(node: Node) {
if (machine.node != null && node != null) { if (machine != null && machine.node != null && node != null) {
api.Network.joinNewNetwork(machine.node) api.Network.joinNewNetwork(machine.node)
machine.node.connect(node) machine.node.connect(node)
} }
@ -259,6 +260,13 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
// Nope. // Nope.
override def removeStackFromSlot(slot: Int) = null override def removeStackFromSlot(slot: Int) = null
// 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
// For hotswapping EEPROMs. // For hotswapping EEPROMs.
def changeEEPROM(newEeprom: ItemStack) = { def changeEEPROM(newEeprom: ItemStack) = {
val oldEepromIndex = info.components.indexWhere(api.Items.get(_) == api.Items.get(Constants.ItemName.EEPROM)) val oldEepromIndex = info.components.indexWhere(api.Items.get(_) == api.Items.get(Constants.ItemName.EEPROM))