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

This commit is contained in:
Tom Elfring committed 2017-08-07 20:09:31 +02:00
commit 5bcdb2b2be
23 files changed
+170 -150

No files matched your search

@@ -36,9 +36,9 @@ import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.frequency.Frequency;
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;
@@ -138,7 +138,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
*/
@InterfaceList({
@Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = "redstoneflux"),
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID)
})
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem, IItemNetwork
{
@@ -806,7 +806,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);