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

Temporarily disabling AE2 integration for rv2-beta-20 and newer due to methods that were deprecated in the API crashing now.

Browse Source
This commit is contained in:
Florian Nücke 2015-03-29 13:24:43 +02:00
parent d2d51b9122
commit 5e9861d04a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/integration/Mods.scala
View File

@ -19,7 +19,7 @@ object Mods {
def All = knownMods.clone() def All = knownMods.clone()
val AppliedEnergistics2 = new SimpleMod(IDs.AppliedEnergistics2, version = "@[rv1,)", providesPower = true) val AppliedEnergistics2 = new SimpleMod(IDs.AppliedEnergistics2, version = "@[rv1,rv2-beta-19)", providesPower = true)
val BattleGear2 = new SimpleMod(IDs.BattleGear2) val BattleGear2 = new SimpleMod(IDs.BattleGear2)
val BloodMagic = new SimpleMod(IDs.BloodMagic) val BloodMagic = new SimpleMod(IDs.BloodMagic)
val BuildCraft = new SimpleMod(IDs.BuildCraft) val BuildCraft = new SimpleMod(IDs.BuildCraft)
@ -199,6 +199,10 @@ object Mods {
// This is called from the class transformer when injecting an interface of // This is called from the class transformer when injecting an interface of
// this power type fails, to avoid class not found / class cast exceptions. // this power type fails, to avoid class not found / class cast exceptions.
def disablePower() = powerDisabled = true def disablePower() = powerDisabled = true
def container = Option(Loader.instance.getIndexedModList.get(id))
def version = container.map(_.getProcessedVersion)
} }
class SimpleMod(val id: String, override val providesPower: Boolean = false, version: String = "") extends ModBase { class SimpleMod(val id: String, override val providesPower: Boolean = false, version: String = "") extends ModBase {

4
src/main/scala/li/cil/oc/integration/appeng/DriverController.scala
View File

@ -7,7 +7,6 @@ import appeng.api.networking.crafting.ICraftingRequester
import appeng.api.networking.security.IActionHost import appeng.api.networking.security.IActionHost
import appeng.api.networking.security.MachineSource import appeng.api.networking.security.MachineSource
import appeng.api.storage.data.IAEItemStack import appeng.api.storage.data.IAEItemStack
import appeng.core.Api
import appeng.me.helpers.IGridProxyable import appeng.me.helpers.IGridProxyable
import appeng.tile.misc.TileInterface import appeng.tile.misc.TileInterface
import appeng.tile.networking.TileController import appeng.tile.networking.TileController
@ -40,6 +39,7 @@ import scala.collection.convert.WrapAsScala._
import scala.collection.mutable import scala.collection.mutable
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future import scala.concurrent.Future
import scala.language.existentials
object DriverController extends DriverTileEntity with EnvironmentAware { object DriverController extends DriverTileEntity with EnvironmentAware {
private type AETile = TileEntity with IGridProxyable with IActionHost private type AETile = TileEntity with IGridProxyable with IActionHost
@ -210,7 +210,7 @@ object DriverController extends DriverTileEntity with EnvironmentAware {
}) })
} }
links ++= nbt.getTagList("links", NBT.TAG_COMPOUND).map( links ++= nbt.getTagList("links", NBT.TAG_COMPOUND).map(
(nbt: NBTTagCompound) => Api.instance.storage.loadCraftingLink(nbt, this)) (nbt: NBTTagCompound) => AEApi.instance.storage.loadCraftingLink(nbt, this))
} }
override def save(nbt: NBTTagCompound) { override def save(nbt: NBTTagCompound) {