Merge remote-tracking branch 'upstream/1.11' into 1.12

This commit is contained in:
Tom Elfring committed 2017-08-04 18:49:20 +02:00
commit c9dc4c0ac0
468 files changed
+1602 -9935

No files matched your search

@@ -25,6 +25,7 @@ import mekanism.common.base.ITierItem;
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.network.PacketTileEntity.TileEntityMessage;
@@ -58,8 +59,8 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = "redstoneflux")
@Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = "redstoneflux"),
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem, ITierItem
{
@@ -331,7 +332,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);