From 4e1abdb756dc8e2a42b7a17f933c1892cca23b3e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 10 Jun 2016 23:09:02 +0200 Subject: [PATCH] Revert ic 2 stuff --- build.gradle | 5 ---- .../tile/controller/TileController.java | 24 +------------------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index a0be33cda..e42787d25 100755 --- a/build.gradle +++ b/build.gradle @@ -27,15 +27,10 @@ repositories { maven { url "http://dvs1.progwml6.com/files/maven" } - maven { - name = "ic2" - url = "http://maven.ic2.player.to/" - } } dependencies { deobfCompile "mezz.jei:jei_1.9.4:3.4.+" - compile "net.industrial-craft:industrialcraft-2:2.5.13-ex19:api" } processResources { diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index fca63a4f0..48f7a3963 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -2,8 +2,6 @@ package refinedstorage.tile.controller; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; -import ic2.api.energy.tile.IEnergyEmitter; -import ic2.api.energy.tile.IEnergySink; import io.netty.buffer.ByteBuf; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -37,7 +35,7 @@ import refinedstorage.tile.config.RedstoneMode; import java.util.*; -public class TileController extends TileBase implements IEnergyReceiver, IEnergySink, ISynchronizedContainer, IRedstoneModeConfig { +public class TileController extends TileBase implements IEnergyReceiver, ISynchronizedContainer, IRedstoneModeConfig { public static final int ENERGY_CAPACITY = 32000; public static final String NBT_CRAFTING_TASKS = "CraftingTasks"; @@ -683,24 +681,4 @@ public class TileController extends TileBase implements IEnergyReceiver, IEnergy public Class getContainer() { return ContainerController.class; } - - @Override - public double getDemandedEnergy() { - return ENERGY_CAPACITY; - } - - @Override - public int getSinkTier() { - return Integer.MAX_VALUE; - } - - @Override - public double injectEnergy(EnumFacing facing, double energy, double voltage) { - return this.energy.receiveEnergy((int) energy, false); - } - - @Override - public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing facing) { - return true; - } }