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

Fixes error with AE2 rv2 caused by use of wrong API class. Closes #847.

Browse Source
This commit is contained in:
Florian Nücke 2015-01-24 20:35:29 +01:00
parent c5e114e0ae
commit dbf99cdf4e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package li.cil.oc.integration.appeng package li.cil.oc.integration.appeng
import appeng.api.AEApi
import appeng.api.config.Actionable import appeng.api.config.Actionable
import appeng.api.networking.crafting.ICraftingLink import appeng.api.networking.crafting.ICraftingLink
import appeng.api.networking.crafting.ICraftingRequester import appeng.api.networking.crafting.ICraftingRequester
@ -44,10 +45,13 @@ object DriverController extends DriverTileEntity with EnvironmentAware {
private type AETile = TileEntity with IGridProxyable with IActionHost private type AETile = TileEntity with IGridProxyable with IActionHost
def getTileEntityClass = { def getTileEntityClass = {
if (Api.instance.blocks.blockController != null && Api.instance.blocks.blockController.item != null) if (AEApi.instance != null && AEApi.instance.blocks != null) {
classOf[TileController] if (AEApi.instance.blocks.blockController != null && AEApi.instance.blocks.blockController.item != null)
else classOf[TileController]
classOf[TileInterface] else
classOf[TileInterface]
}
else null
} }
def createEnvironment(world: World, x: Int, y: Int, z: Int): ManagedEnvironment = def createEnvironment(world: World, x: Int, y: Int, z: Int): ManagedEnvironment =
@ -55,10 +59,11 @@ object DriverController extends DriverTileEntity with EnvironmentAware {
override def providedEnvironment(stack: ItemStack) = override def providedEnvironment(stack: ItemStack) =
if (stack != null && if (stack != null &&
Api.instance != null && AEApi.instance != null &&
Api.instance.blocks != null && AEApi.instance.blocks != null &&
Api.instance.blocks.blockController != null && AEApi.instance.blocks.blockController != null &&
Block.getBlockFromItem(stack.getItem) == Api.instance.blocks.blockController.block) classOf[Environment] else null Block.getBlockFromItem(stack.getItem) == AEApi.instance.blocks.blockController.block) classOf[Environment]
else null
class Environment(tileEntity: AETile) extends ManagedTileEntityEnvironment[AETile](tileEntity, "me_controller") with NamedBlock { class Environment(tileEntity: AETile) extends ManagedTileEntityEnvironment[AETile](tileEntity, "me_controller") with NamedBlock {
override def preferredName = "me_controller" override def preferredName = "me_controller"