From a5e3dc40906bb7061f30a2d7b89db07da2204975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 5 Nov 2014 19:33:13 +0100 Subject: [PATCH] Removed deprecated EIO capacitor driver, closes #652. --- .../scala/li/cil/oc/integration/Mods.scala | 1 - .../integration/enderio/DriverCapacitor.java | 38 ------------------- .../oc/integration/enderio/ModEnderIO.scala | 13 ------- 3 files changed, 52 deletions(-) delete mode 100644 src/main/scala/li/cil/oc/integration/enderio/DriverCapacitor.java delete mode 100644 src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala index 1cac96394..9b98c3dac 100644 --- a/src/main/scala/li/cil/oc/integration/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -76,7 +76,6 @@ object Mods { tryInit(integration.cofh.energy.ModCoFHEnergy) tryInit(integration.cofh.tileentity.ModCoFHTileEntity) tryInit(integration.cofh.transport.ModCoFHTransport) - tryInit(integration.enderio.ModEnderIO) tryInit(integration.enderstorage.ModEnderStorage) tryInit(integration.forestry.ModForestry) tryInit(integration.fmp.ModForgeMultipart) diff --git a/src/main/scala/li/cil/oc/integration/enderio/DriverCapacitor.java b/src/main/scala/li/cil/oc/integration/enderio/DriverCapacitor.java deleted file mode 100644 index 8378359a4..000000000 --- a/src/main/scala/li/cil/oc/integration/enderio/DriverCapacitor.java +++ /dev/null @@ -1,38 +0,0 @@ -package li.cil.oc.integration.enderio; - -import crazypants.enderio.machine.power.TileCapacitorBank; -import li.cil.oc.api.machine.Arguments; -import li.cil.oc.api.machine.Callback; -import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.ManagedEnvironment; -import li.cil.oc.api.prefab.DriverTileEntity; -import li.cil.oc.integration.ManagedTileEntityEnvironment; -import net.minecraft.world.World; - -public final class DriverCapacitor extends DriverTileEntity { - @Override - public Class getTileEntityClass() { - return TileCapacitorBank.class; - } - - @Override - public ManagedEnvironment createEnvironment(final World world, final int x, final int y, final int z) { - return new Environment((TileCapacitorBank) world.getTileEntity(x, y, z)); - } - - public static final class Environment extends ManagedTileEntityEnvironment { - public Environment(final TileCapacitorBank tileEntity) { - super(tileEntity, "enderio_capacitor"); - } - - @Callback(doc = "function():number -- Returns the amount of energy stored in the capacitor bank.") - public Object[] getEnergyStored(final Context context, final Arguments args) { - return new Object[]{tileEntity.getEnergyStored()}; - } - - @Callback(doc = "function():number -- Returns the maximum amount of energy the capacitor bank can store.") - public Object[] getMaxEnergyStored(final Context context, final Arguments args) { - return new Object[]{tileEntity.getMaxEnergyStored()}; - } - } -} diff --git a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala deleted file mode 100644 index 774420f06..000000000 --- a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala +++ /dev/null @@ -1,13 +0,0 @@ -package li.cil.oc.integration.enderio - -import li.cil.oc.api.Driver -import li.cil.oc.integration.ModProxy -import li.cil.oc.integration.Mods - -object ModEnderIO extends ModProxy { - override def getMod = Mods.EnderIO - - override def initialize() { - Driver.add(new DriverCapacitor) - } -} \ No newline at end of file