From 5e9861d04a51c179da5ed5ba1f5a7a05591bcae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 29 Mar 2015 13:24:43 +0200 Subject: [PATCH] Temporarily disabling AE2 integration for rv2-beta-20 and newer due to methods that were deprecated in the API crashing now. --- src/main/scala/li/cil/oc/integration/Mods.scala | 6 +++++- .../li/cil/oc/integration/appeng/DriverController.scala | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala index a3d8d034e..db071c751 100644 --- a/src/main/scala/li/cil/oc/integration/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -19,7 +19,7 @@ object Mods { 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 BloodMagic = new SimpleMod(IDs.BloodMagic) 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 power type fails, to avoid class not found / class cast exceptions. 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 { diff --git a/src/main/scala/li/cil/oc/integration/appeng/DriverController.scala b/src/main/scala/li/cil/oc/integration/appeng/DriverController.scala index c7698aec7..e6b5bb58c 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverController.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverController.scala @@ -7,7 +7,6 @@ import appeng.api.networking.crafting.ICraftingRequester import appeng.api.networking.security.IActionHost import appeng.api.networking.security.MachineSource import appeng.api.storage.data.IAEItemStack -import appeng.core.Api import appeng.me.helpers.IGridProxyable import appeng.tile.misc.TileInterface import appeng.tile.networking.TileController @@ -40,6 +39,7 @@ import scala.collection.convert.WrapAsScala._ import scala.collection.mutable import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future +import scala.language.existentials object DriverController extends DriverTileEntity with EnvironmentAware { 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( - (nbt: NBTTagCompound) => Api.instance.storage.loadCraftingLink(nbt, this)) + (nbt: NBTTagCompound) => AEApi.instance.storage.loadCraftingLink(nbt, this)) } override def save(nbt: NBTTagCompound) {