Fix some mod integrations not working.

Moved all mod id definitions to a constant value in MekanismHooks.
Fix integration with ComputerCraft, OpenComputers and IC2.

Fix #4603
This commit is contained in:
Tom Elfring committed 2017-08-07 19:59:32 +02:00
1 parent 7e43e1a628
commit 2e38fb9748
23 files changed
+169 -150

No files matched your search

@@ -7,8 +7,8 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.base.IAdvancedBoundingBlock;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.util.InventoryUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
@@ -26,7 +26,7 @@ import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID)
})
public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData
{
@@ -244,7 +244,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
IAdvancedBoundingBlock inv = getInv();
@@ -335,7 +335,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getDemandedEnergy()
{
IAdvancedBoundingBlock inv = getInv();
@@ -343,7 +343,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double injectEnergy(EnumFacing directionFrom, double amount, double voltage)
{
IAdvancedBoundingBlock inv = getInv();
@@ -356,7 +356,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSinkTier()
{
IAdvancedBoundingBlock inv = getInv();