mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge remote-tracking branch 'upstream/1.11' into 1.12
This commit is contained in:
commit
5bcdb2b2be
23 files changed
+170
-150
No files matched your search
@@ -9,8 +9,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;
|
||||
@@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.Optional.Method;
|
||||
@InterfaceList({
|
||||
@Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = "redstoneflux"),
|
||||
@Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = "redstoneflux"),
|
||||
@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
|
||||
{
|
||||
@@ -246,7 +246,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();
|
||||
@@ -342,7 +342,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = IC2Integration.MODID)
|
||||
@Method(modid = MekanismHooks.IC2_MOD_ID)
|
||||
public double getDemandedEnergy()
|
||||
{
|
||||
IAdvancedBoundingBlock inv = getInv();
|
||||
@@ -350,7 +350,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();
|
||||
@@ -363,7 +363,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = IC2Integration.MODID)
|
||||
@Method(modid = MekanismHooks.IC2_MOD_ID)
|
||||
public int getSinkTier()
|
||||
{
|
||||
IAdvancedBoundingBlock inv = getInv();
|
||||
|
||||
Reference in new issue
Block a user