Fixed IC2 integration

This commit is contained in:
aidancbrady committed 2017-07-31 19:41:24 -07:00
1 parent d4b6728d19
commit 5bd67b37b2
23 files changed
+137 -100

No files matched your search

@@ -17,7 +17,6 @@ import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismClient;
import mekanism.client.MekanismKeyHandler;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FluidTankTier;
import mekanism.common.Upgrade;
@@ -37,10 +36,10 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
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;
@@ -134,7 +133,7 @@ import cofh.api.energy.IEnergyContainerItem;
*
*/
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem, IItemNetwork
{
@@ -780,7 +779,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);