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

some checks to avoid class loader trying to load cc api when it's not present

Browse Source
This commit is contained in:
Florian Nücke 2014-03-29 16:51:41 +01:00
parent 93d1fb2b71
commit 5446f66f59
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala
View File

@ -1,5 +1,6 @@
package li.cil.oc.server.driver.item package li.cil.oc.server.driver.item
import cpw.mods.fml.common.Loader
import dan200.computercraft.api.media.IMedia import dan200.computercraft.api.media.IMedia
import li.cil.oc import li.cil.oc
import li.cil.oc.api.driver.Slot import li.cil.oc.api.driver.Slot
@ -12,10 +13,12 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
object FileSystem extends Item { object FileSystem extends Item {
override def worksWith(stack: ItemStack) = isOneOf(stack, Items.hdd1, Items.hdd2, Items.hdd3, Items.floppyDisk) || ComputerCraft.isDisk(stack) override def worksWith(stack: ItemStack) =
isOneOf(stack, Items.hdd1, Items.hdd2, Items.hdd3, Items.floppyDisk) ||
(Loader.isModLoaded("ComputerCraft") && ComputerCraft.isDisk(stack))
override def createEnvironment(stack: ItemStack, container: TileEntity) = override def createEnvironment(stack: ItemStack, container: TileEntity) =
if (ComputerCraft.isDisk(stack) && container != null) { if (Loader.isModLoaded("ComputerCraft") && ComputerCraft.isDisk(stack) && container != null) {
val address = addressFromTag(dataTag(stack)) val address = addressFromTag(dataTag(stack))
val mount = ComputerCraft.createDiskMount(stack, container.getWorldObj) val mount = ComputerCraft.createDiskMount(stack, container.getWorldObj)
Option(oc.api.FileSystem.asManagedEnvironment(mount, new ComputerCraftLabel(stack), container)) match { Option(oc.api.FileSystem.asManagedEnvironment(mount, new ComputerCraftLabel(stack), container)) match {
@ -24,14 +27,15 @@ object FileSystem extends Item {
environment environment
case _ => null case _ => null
} }
} else Items.multi.subItem(stack) match { }
else Items.multi.subItem(stack) match {
case Some(hdd: HardDiskDrive) => createEnvironment(stack, hdd.kiloBytes * 1024, container) case Some(hdd: HardDiskDrive) => createEnvironment(stack, hdd.kiloBytes * 1024, container)
case Some(disk: FloppyDisk) => createEnvironment(stack, Settings.get.floppySize * 1024, container) case Some(disk: FloppyDisk) => createEnvironment(stack, Settings.get.floppySize * 1024, container)
case _ => null case _ => null
} }
override def slot(stack: ItemStack) = override def slot(stack: ItemStack) =
if (ComputerCraft.isDisk(stack)) Slot.Disk if (Loader.isModLoaded("ComputerCraft") && ComputerCraft.isDisk(stack)) Slot.Disk
else Items.multi.subItem(stack) match { else Items.multi.subItem(stack) match {
case Some(hdd: HardDiskDrive) => Slot.HardDiskDrive case Some(hdd: HardDiskDrive) => Slot.HardDiskDrive
case Some(disk: FloppyDisk) => Slot.Disk case Some(disk: FloppyDisk) => Slot.Disk