From 3251a8ba2fa91b0015712a7276b93a32f4e95baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 4 Apr 2015 19:50:54 +0200 Subject: [PATCH] Adjusted export bus driver for AE2 API changes. Closes #997. Also got rid of another use of an internal class. --- .../li/cil/oc/integration/appeng/DriverExportBus.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala b/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala index 0ef408ed1..bf4860703 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala +++ b/src/main/scala/li/cil/oc/integration/appeng/DriverExportBus.scala @@ -1,5 +1,6 @@ package li.cil.oc.integration.appeng +import appeng.api.AEApi import appeng.api.config.Actionable import appeng.api.config.FuzzyMode import appeng.api.config.Settings @@ -7,7 +8,6 @@ import appeng.api.config.Upgrades import appeng.api.networking.security.MachineSource import appeng.parts.automation.PartExportBus import appeng.util.Platform -import appeng.util.item.AEItemStack import li.cil.oc.api.driver import li.cil.oc.api.driver.NamedBlock import li.cil.oc.api.internal.Database @@ -98,11 +98,15 @@ object DriverExportBus extends driver.Block { case 4 => 96 case _ => 1 } - val fuzzyMode = export.getConfigManager.getSetting(Settings.FUZZY_MODE).asInstanceOf[FuzzyMode] + // We need reflection here to avoid compiling against the return type, + // which has changed in rv2-beta-20 or so. + val fuzzyMode = export.getConfigManager. + getClass.getMethod("getSetting", classOf[Enum[_]]). + invoke(export.getConfigManager, Settings.FUZZY_MODE).asInstanceOf[FuzzyMode] val source = new MachineSource(export) var didSomething = false for (slot <- 0 until config.getSizeInventory if count > 0) { - val filter = AEItemStack.create(config.getStackInSlot(slot)) + val filter = AEApi.instance.storage.createItemStack(config.getStackInSlot(slot)) val stacks = if (export.getInstalledUpgrades(Upgrades.FUZZY) > 0) itemStorage.getStorageList.findFuzzy(filter, fuzzyMode).toSeq