diff --git a/build.gradle b/build.gradle
index 7a340655b..18403143c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,10 @@ repositories {
name 'hwyla'
url 'http://tehnut.info/maven'
}
+ maven {
+ name 'CoFH Maven'
+ url = 'http://maven.covers1624.net'
+ }
}
// Define properties file
@@ -91,6 +95,7 @@ dependencies {
compile "inventory-tweaks:InventoryTweaks:${config.invtweak_version}:api" // Not updated yet
compile "li.cil.oc:OpenComputers:MC1.11.2-${config.opencomputers_version}:api" // Not updated yet
deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}"
+ deobfCompile "cofh:RedstoneFlux:${config.minecraft_version}-${config.redstoneflux_version}:universal"
}
processResources
diff --git a/build.properties b/build.properties
index 5ad42f3ad..b1cb45ee3 100644
--- a/build.properties
+++ b/build.properties
@@ -8,3 +8,4 @@ tesla_version=1.0.59
invtweak_version=1.62+beta.89
opencomputers_version=1.7.0.24
hwyla_version=1.8.18-B32_1.12
+redstoneflux_version=2.0.0.1
diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java
deleted file mode 100644
index eb2e05ade..000000000
--- a/src/main/java/cofh/api/CoFHAPIProps.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cofh.api;
-
-public class CoFHAPIProps {
-
- private CoFHAPIProps() {
-
- }
-
- public static final String VERSION = "1.8.9R1.2.0B1";
-
-}
diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java
deleted file mode 100644
index eda6e2558..000000000
--- a/src/main/java/cofh/api/energy/EnergyStorage.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class EnergyStorage implements IEnergyStorage {
-
- protected int energy;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public EnergyStorage(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public EnergyStorage(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public EnergyStorage readFromNBT(NBTTagCompound nbt) {
-
- this.energy = nbt.getInteger("Energy");
-
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
-
- public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
-
- if (energy < 0) {
- energy = 0;
- }
- nbt.setInteger("Energy", energy);
- return nbt;
- }
-
- public EnergyStorage setCapacity(int capacity) {
-
- this.capacity = capacity;
-
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
-
- public EnergyStorage setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- return this;
- }
-
- public EnergyStorage setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- return this;
- }
-
- public EnergyStorage setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- return this;
- }
-
- public int getMaxReceive() {
-
- return maxReceive;
- }
-
- public int getMaxExtract() {
-
- return maxExtract;
- }
-
- /**
- * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers are
- * guaranteed to have it.
- *
- * @param energy
- */
- public void setEnergyStored(int energy) {
-
- this.energy = energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /**
- * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
- * externally, as not all IEnergyHandlers are guaranteed to have it.
- *
- * @param energy
- */
- public void modifyEnergyStored(int energy) {
-
- this.energy += energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /* IEnergyStorage */
- @Override
- public int receiveEnergy(int maxReceive, boolean simulate) {
-
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(int maxExtract, boolean simulate) {
-
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored() {
-
- return energy;
- }
-
- @Override
- public int getMaxEnergyStored() {
-
- return capacity;
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java
deleted file mode 100644
index 268721a92..000000000
--- a/src/main/java/cofh/api/energy/IEnergyConnection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-/**
- * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
- * accept it; otherwise just use IEnergyHandler.
- *
- * Note that {@link IEnergyHandler} is an extension of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyConnection {
-
- /**
- * Returns TRUE if the TileEntity can connect on a given side.
- */
- boolean canConnectEnergy(EnumFacing from);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java
deleted file mode 100644
index 3ef725765..000000000
--- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes that support external manipulation of their internal energy storages.
- *
- * A reference implementation is provided {@link ItemEnergyContainer}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyContainerItem {
-
- /**
- * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
- *
- * @param container
- * ItemStack to be charged.
- * @param maxReceive
- * Maximum amount of energy to be sent into the item.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received by the item.
- */
- int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
-
- /**
- * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
- * discharged.
- *
- * @param container
- * ItemStack to be discharged.
- * @param maxExtract
- * Maximum amount of energy to be extracted from the item.
- * @param simulate
- * If TRUE, the discharge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
- */
- int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
-
- /**
- * Get the amount of energy currently stored in the container item.
- */
- int getEnergyStored(ItemStack container);
-
- /**
- * Get the max amount of energy that can be stored in the container item.
- */
- int getMaxEnergyStored(ItemStack container);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java
deleted file mode 100644
index 16b236e7a..000000000
--- a/src/main/java/cofh/api/energy/IEnergyHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-/**
- * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyHandler extends IEnergyConnection {
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(EnumFacing from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(EnumFacing from);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java
deleted file mode 100644
index fbfa8a133..000000000
--- a/src/main/java/cofh/api/energy/IEnergyProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-/**
- * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyProvider extends IEnergyHandler {
-
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- int extractEnergy(EnumFacing from, int maxExtract, boolean simulate);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java
deleted file mode 100644
index 12a955381..000000000
--- a/src/main/java/cofh/api/energy/IEnergyReceiver.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-/**
- * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyReceiver extends IEnergyHandler {
-
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java
deleted file mode 100644
index 414b26566..000000000
--- a/src/main/java/cofh/api/energy/IEnergyStorage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cofh.api.energy;
-
-/**
- * An energy storage is the unit of interaction with Energy inventories.
- * This is not to be implemented on TileEntities. This is for internal use only.
- *
- * A reference implementation can be found at {@link EnergyStorage}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyStorage {
-
- /**
- * Adds energy to the storage. Returns quantity of energy that was accepted.
- *
- * @param maxReceive
- * Maximum amount of energy to be inserted.
- * @param simulate
- * If TRUE, the insertion will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
- */
- int receiveEnergy(int maxReceive, boolean simulate);
-
- /**
- * Removes energy from the storage. Returns quantity of energy that was removed.
- *
- * @param maxExtract
- * Maximum amount of energy to be extracted.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
- */
- int extractEnergy(int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored();
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored();
-
-}
diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java
deleted file mode 100644
index 1c9f542b8..000000000
--- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
-
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public ItemEnergyContainer() {
-
- }
-
- public ItemEnergyContainer(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public ItemEnergyContainer(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public ItemEnergyContainer setCapacity(int capacity) {
-
- this.capacity = capacity;
- return this;
- }
-
- public ItemEnergyContainer setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- return this;
- }
-
- public ItemEnergyContainer setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- return this;
- }
-
- public ItemEnergyContainer setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- return this;
- }
-
- /* IEnergyContainerItem */
- @Override
- public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
-
- if (!container.hasTagCompound()) {
- container.setTagCompound(new NBTTagCompound());
- }
- int energy = container.getTagCompound().getInteger("Energy");
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- container.getTagCompound().setInteger("Energy", energy);
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
-
- if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
- return 0;
- }
- int energy = container.getTagCompound().getInteger("Energy");
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- container.getTagCompound().setInteger("Energy", energy);
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored(ItemStack container) {
-
- if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
- return 0;
- }
- return container.getTagCompound().getInteger("Energy");
- }
-
- @Override
- public int getMaxEnergyStored(ItemStack container) {
-
- return capacity;
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java
deleted file mode 100644
index 190b8f606..000000000
--- a/src/main/java/cofh/api/energy/TileEnergyHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-
-/**
- * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own.
- *
- * This class is really meant to summarize how each interface is properly used.
- *
- * @author King Lemming
- *
- */
-public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider {
-
- protected EnergyStorage storage = new EnergyStorage(32000);
-
- @Override
- public void readFromNBT(NBTTagCompound nbt) {
-
- super.readFromNBT(nbt);
- storage.readFromNBT(nbt);
- }
-
- @Override
- public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
-
- super.writeToNBT(nbt);
- storage.writeToNBT(nbt);
- return nbt;
- }
-
- /* IEnergyConnection */
- @Override
- public boolean canConnectEnergy(EnumFacing from) {
-
- return true;
- }
-
- /* IEnergyReceiver */
- @Override
- public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
-
- return storage.receiveEnergy(maxReceive, simulate);
- }
-
- /* IEnergyProvider */
- @Override
- public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) {
-
- return storage.extractEnergy(maxExtract, simulate);
- }
-
- /* IEnergyHandler */
- @Override
- public int getEnergyStored(EnumFacing from) {
-
- return storage.getEnergyStored();
- }
-
- @Override
- public int getMaxEnergyStored(EnumFacing from) {
-
- return storage.getMaxEnergyStored();
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java
deleted file mode 100644
index bafe2ea41..000000000
--- a/src/main/java/cofh/api/energy/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
-package cofh.api.energy;
-
-import cofh.api.CoFHAPIProps;
-
-import net.minecraftforge.fml.common.API;
-
diff --git a/src/main/java/cofh/api/item/IAugmentItem.java b/src/main/java/cofh/api/item/IAugmentItem.java
deleted file mode 100644
index e17fa8dec..000000000
--- a/src/main/java/cofh/api/item/IAugmentItem.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cofh.api.item;
-
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
-
-public interface IAugmentItem {
-
- /**
- * Get the augmentation level for a given Augment and Augment Type.
- *
- * @param stack
- * ItemStack representing the Augment.
- * @param type
- * String containing the Augment type name.
- * @return The Augment level of the stack for the requested type - 0 if it does not affect that attribute.
- */
- int getAugmentLevel(ItemStack stack, String type);
-
- /**
- * Get the Augment Types for a given Augment. Set ensure that there are no duplicates.
- *
- * @param stack
- * ItemStack representing the Augment.
- * @return Set of the Augmentation Types. Should return an empty set if there are none (but this would be really stupid to make). DO NOT RETURN NULL.
- */
- Set getAugmentTypes(ItemStack stack);
-
-}
diff --git a/src/main/java/cofh/api/item/IInventoryContainerItem.java b/src/main/java/cofh/api/item/IInventoryContainerItem.java
deleted file mode 100644
index adadf10a7..000000000
--- a/src/main/java/cofh/api/item/IInventoryContainerItem.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cofh.api.item;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes that are themselves inventories.
- *
- * A reference implementation is provided {@link ItemInventoryContainer}.
- *
- * @author King Lemming
- *
- */
-public interface IInventoryContainerItem {
-
- /**
- * Get the size of this inventory of this container item.
- */
- int getSizeInventory(ItemStack container);
-
-}
diff --git a/src/main/java/cofh/api/item/IMultiModeItem.java b/src/main/java/cofh/api/item/IMultiModeItem.java
deleted file mode 100644
index 07cbf3f70..000000000
--- a/src/main/java/cofh/api/item/IMultiModeItem.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cofh.api.item;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes which have multiple modes - what that means is completely up to you. This just provides a uniform way of dealing
- * with them.
- *
- * @author King Lemming
- *
- */
-public interface IMultiModeItem {
-
- /**
- * Get the current mode of an item.
- */
- int getMode(ItemStack stack);
-
- /**
- * Attempt to set the empowered state of the item.
- *
- * @param stack
- * ItemStack to set the mode on.
- * @param mode
- * Desired mode.
- * @return TRUE if the operation was successful, FALSE if it was not.
- */
- boolean setMode(ItemStack stack, int mode);
-
- /**
- * Increment the current mode of an item.
- */
- boolean incrMode(ItemStack stack);
-
- /**
- * Decrement the current mode of an item.
- */
- boolean decrMode(ItemStack stack);
-
- /**
- * Returns the number of possible modes.
- */
- int getNumModes(ItemStack stack);
-
- /**
- * Callback method for reacting to a state change. Useful in KeyBinding handlers.
- *
- * @param player
- * Player holding the item, if applicable.
- * @param stack
- * The item being held.
- */
- void onModeChange(EntityPlayer player, ItemStack stack);
-
-}
diff --git a/src/main/java/cofh/api/item/ISpecialFilterFluid.java b/src/main/java/cofh/api/item/ISpecialFilterFluid.java
deleted file mode 100644
index 7e8d3d025..000000000
--- a/src/main/java/cofh/api/item/ISpecialFilterFluid.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cofh.api.item;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Fluiducts filter slots.
- *
- * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering.
- */
-public interface ISpecialFilterFluid {
-
- /**
- * This method is called to find out if the given FluidStack should be matched by the given Filter ItemStack.
- *
- * @param filter
- * ItemStack representing the filter.
- * @param fluid
- * FluidStack representing the queried fluid.
- * @return True if the filter should match the FluidStack. False if the default matching should be used.
- */
- public boolean matchesFluid(ItemStack filter, FluidStack fluid);
-
-}
diff --git a/src/main/java/cofh/api/item/ISpecialFilterItem.java b/src/main/java/cofh/api/item/ISpecialFilterItem.java
deleted file mode 100644
index ef9f953d8..000000000
--- a/src/main/java/cofh/api/item/ISpecialFilterItem.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cofh.api.item;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Itemducts filter slots.
- *
- * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering.
- */
-public interface ISpecialFilterItem {
-
- /**
- * This method is called to find out if the given ItemStack should be matched by the given Filter ItemStack.
- *
- * @param filter
- * ItemStack representing the filter.
- * @param item
- * ItemStack representing the queried item.
- * @return True if the filter should match. False if the default matching should be used.
- */
- public boolean matchesItem(ItemStack filter, ItemStack item);
-
-}
diff --git a/src/main/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java
deleted file mode 100644
index d300bef76..000000000
--- a/src/main/java/cofh/api/item/IToolHammer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cofh.api.item;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-
-/**
- * Implement this interface on subclasses of Item to have that item work as a tool for CoFH mods.
- */
-public interface IToolHammer {
-
- /**
- * Called to ensure that the tool can be used on a block.
- *
- * @param item
- * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools).
- * @param user
- * The entity using the tool.
- * @param pos
- * Coordinates of the block.
- * @return True if this tool can be used.
- */
- boolean isUsable(ItemStack item, EntityLivingBase user, BlockPos pos);
-
- /**
- * Called to ensure that the tool can be used on an entity.
- *
- * @param item
- * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools).
- * @param user
- * The entity using the tool.
- * @param entity
- * The entity the tool is being used on.
- * @return True if this tool can be used.
- */
- boolean isUsable(ItemStack item, EntityLivingBase user, Entity entity);
-
- /**
- * Callback for when the tool has been used reactively.
- *
- * @param item
- * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools).
- * @param user
- * The entity using the tool.
- * @param pos
- * Coordinates of the block.
- */
- void toolUsed(ItemStack item, EntityLivingBase user, BlockPos pos);
-
- /**
- * Callback for when the tool has been used reactively.
- *
- * @param item
- * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools).
- * @param user
- * The entity using the tool.
- * @param entity
- * The entity the tool is being used on.
- */
- void toolUsed(ItemStack item, EntityLivingBase user, Entity entity);
-
-}
diff --git a/src/main/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java
deleted file mode 100644
index 2e909baf5..000000000
--- a/src/main/java/cofh/api/item/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|item")
-package cofh.api.item;
-
-import cofh.api.CoFHAPIProps;
-
-import net.minecraftforge.fml.common.API;
-
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index a6b03a63e..ec04d2f7d 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -154,7 +154,9 @@ import com.mojang.authlib.GameProfile;
*
*/
@Mod(modid = "mekanism", name = "Mekanism", version = "9.3.3", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
- dependencies = "after:mcmultipart;" +
+ dependencies = "required-after:forge@[14.21.0.2373,);" +
+ "required-after:redstoneflux;" +
+ "after:mcmultipart;" +
"after:jei;" +
"after:buildcraft;" +
"after:buildcraftapi;" +
diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
index 465dc32ec..288e12609 100644
--- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
+++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
@@ -1,5 +1,6 @@
package mekanism.common.base;
+import cofh.redstoneflux.api.IEnergyReceiver;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergyTile;
@@ -14,7 +15,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
-import cofh.api.energy.IEnergyReceiver;
public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
{
@@ -247,4 +247,4 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
return forge*general.FROM_FORGE;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
index 74fd2764c..9697f71d6 100644
--- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
+++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
@@ -1,12 +1,13 @@
package mekanism.common.base;
+import cofh.redstoneflux.api.IEnergyProvider;
+import cofh.redstoneflux.api.IEnergyReceiver;
import ic2.api.energy.tile.IEnergySink;
import mekanism.api.IConfigCardAccess.ISpecialConfigData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.security.ISecurityTile;
-import net.minecraft.block.Block;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
@@ -14,8 +15,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
-import cofh.api.energy.IEnergyProvider;
-import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java
index d4e25adab..6a27d549a 100644
--- a/src/main/java/mekanism/common/base/IEnergyWrapper.java
+++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java
@@ -1,5 +1,8 @@
package mekanism.common.base;
+import cofh.redstoneflux.api.IEnergyProvider;
+import cofh.redstoneflux.api.IEnergyReceiver;
+
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.tile.IEnergyStorage;
@@ -13,8 +16,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
-import cofh.api.energy.IEnergyProvider;
-import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java
index 65c9452d6..a6fe3a2cc 100644
--- a/src/main/java/mekanism/common/entity/EntityRobit.java
+++ b/src/main/java/mekanism/common/entity/EntityRobit.java
@@ -1,5 +1,6 @@
package mekanism.common.entity;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -59,7 +60,6 @@ import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Optional.Interface;
-import cofh.api.energy.IEnergyContainerItem;
@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API")
public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable
diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
index 6d8d19c73..f8eef6c96 100644
--- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
+++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
@@ -1,5 +1,6 @@
package mekanism.common.item;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
@@ -55,7 +56,6 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java
index e7fde7e35..44aef4974 100644
--- a/src/main/java/mekanism/common/item/ItemBlockMachine.java
+++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java
@@ -1,5 +1,6 @@
package mekanism.common.item;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
import io.netty.buffer.ByteBuf;
@@ -39,7 +40,6 @@ import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.inventory.InventoryPersonalChest;
-import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.security.ISecurityItem;
import mekanism.common.security.ISecurityTile;
@@ -88,7 +88,6 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import cofh.api.energy.IEnergyContainerItem;
/**
* Item class for handling multiple machine block IDs.
diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java
index 876cdd7ce..c8925f17b 100644
--- a/src/main/java/mekanism/common/item/ItemConfigurator.java
+++ b/src/main/java/mekanism/common/item/ItemConfigurator.java
@@ -50,12 +50,11 @@ import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import buildcraft.api.tools.IToolWrench;
-import cofh.api.item.IToolHammer;
@InterfaceList({
@Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft")
})
-public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IToolHammer, IItemNetwork
+public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IItemNetwork
{
public final int ENERGY_PER_CONFIGURE = 400;
public final int ENERGY_PER_ITEM_DUMP = 8;
@@ -281,24 +280,6 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool
{
return getState(stack) == ConfiguratorMode.WRENCH;
}
-
- @Override
- public boolean isUsable(ItemStack item, EntityLivingBase user, BlockPos pos)
- {
- return user instanceof EntityPlayer && canUseWrench(item, (EntityPlayer)user, pos);
- }
-
- @Override
- public boolean isUsable(ItemStack item, EntityLivingBase user, Entity entity)
- {
- return user instanceof EntityPlayer && canUseWrench(item, (EntityPlayer)user, null);
- }
-
- @Override
- public void toolUsed(ItemStack item, EntityLivingBase user, BlockPos pos) {}
-
- @Override
- public void toolUsed(ItemStack item, EntityLivingBase user, Entity entity) {}
public static enum ConfiguratorMode
{
diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java
index 897facb21..78ae927b1 100644
--- a/src/main/java/mekanism/common/item/ItemEnergized.java
+++ b/src/main/java/mekanism/common/item/ItemEnergized.java
@@ -1,5 +1,6 @@
package mekanism.common.item;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
@@ -18,8 +19,6 @@ import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
@@ -29,7 +28,6 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
-import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java
index 99e7b6e2b..20de6e67f 100644
--- a/src/main/java/mekanism/common/item/ItemFreeRunners.java
+++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java
@@ -1,5 +1,6 @@
package mekanism.common.item;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
@@ -23,10 +24,8 @@ import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -43,7 +42,6 @@ import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
index c7bfee78f..276b3fc11 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
@@ -1,5 +1,7 @@
package mekanism.common.tile;
+import cofh.redstoneflux.api.IEnergyProvider;
+import cofh.redstoneflux.api.IEnergyReceiver;
import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink;
import mekanism.api.Coord4D;
@@ -21,8 +23,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
-import cofh.api.energy.IEnergyProvider;
-import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2")
diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java
index d769bfe39..636c0de80 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java
@@ -1,5 +1,6 @@
package mekanism.common.tile;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import io.netty.buffer.ByteBuf;
@@ -37,7 +38,6 @@ import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import cofh.api.energy.IEnergyContainerItem;
public class TileEntityChargepad extends TileEntityNoisyBlock
{
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java
index 6fddbf4c4..8a6ee79e6 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java
@@ -1,5 +1,7 @@
package mekanism.common.tile.transmitter;
+import cofh.redstoneflux.api.IEnergyProvider;
+import cofh.redstoneflux.api.IEnergyReceiver;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergyTile;
@@ -34,8 +36,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
-import cofh.api.energy.IEnergyProvider;
-import cofh.api.energy.IEnergyReceiver;
public class TileEntityUniversalCable extends TileEntityTransmitter implements IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver
{
diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java
index 6eeffd0d0..4e559dd2c 100644
--- a/src/main/java/mekanism/common/util/CableUtils.java
+++ b/src/main/java/mekanism/common/util/CableUtils.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import cofh.redstoneflux.api.IEnergyConnection;
+import cofh.redstoneflux.api.IEnergyProvider;
+import cofh.redstoneflux.api.IEnergyReceiver;
import mekanism.api.Coord4D;
import mekanism.api.energy.IStrictEnergyOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
@@ -19,9 +22,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
-import cofh.api.energy.IEnergyConnection;
-import cofh.api.energy.IEnergyProvider;
-import cofh.api.energy.IEnergyReceiver;
public final class CableUtils
{
diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java
index 7e4c570fc..a6791bbe9 100644
--- a/src/main/java/mekanism/common/util/ChargeUtils.java
+++ b/src/main/java/mekanism/common/util/ChargeUtils.java
@@ -1,5 +1,6 @@
package mekanism.common.util;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
@@ -17,7 +18,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
-import cofh.api.energy.IEnergyContainerItem;
public final class ChargeUtils
{
diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java
index ee4d3762c..5c7e05fe0 100644
--- a/src/main/java/mekanism/common/util/MekanismUtils.java
+++ b/src/main/java/mekanism/common/util/MekanismUtils.java
@@ -9,7 +9,6 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -71,8 +70,6 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumFacing.Axis;
@@ -93,7 +90,6 @@ import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
-import cofh.api.item.IToolHammer;
/**
* Utilities used by Mekanism. All miscellaneous methods are located here.
@@ -1493,7 +1489,7 @@ public final class MekanismUtils
return true;
}
- if(isCoFHHammer(tool.getItem()) && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos))
+ if(isCoFHHammer(tool.getItem())) // TODO Implement CoFH Hammer && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos))
{
return true;
}
diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
index f77fbd59d..110995b55 100644
--- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
+++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
@@ -1,5 +1,6 @@
package mekanism.generators.common.item;
+import cofh.redstoneflux.api.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
@@ -50,7 +51,6 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import cofh.api.energy.IEnergyContainerItem;
/**
* Item class for handling multiple generator block IDs.