From b25d8f673be72cdc90c008075e213688fde2eec9 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 30 Sep 2014 22:08:40 +0100 Subject: [PATCH] Only use the EnergyNet-related interfaces if IC2 itself is loaded. Also add some extra safety to useIC2(). Conflicts: src/main/java/mekanism/common/util/MekanismUtils.java --- .../common/IAdvancedBoundingBlock.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 10 +++---- .../common/tile/TileEntityElectricBlock.java | 30 +++++++++---------- .../mekanism/common/util/MekanismUtils.java | 3 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java index f47f7307d..ba1ca1e7e 100644 --- a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java @@ -16,7 +16,7 @@ import dan200.computercraft.api.peripheral.IPeripheral; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 89ff5429b..df591a90e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -27,7 +27,7 @@ import dan200.computercraft.api.peripheral.IPeripheral; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) @@ -194,7 +194,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { if(getInv() == null) @@ -357,7 +357,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getDemandedEnergy() { if(getInv() == null) @@ -369,7 +369,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { if(getInv() == null) @@ -381,7 +381,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getSinkTier() { if(getInv() == null) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 7b3d44737..8b645b7fb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -33,8 +33,8 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), @Interface(iface = "buildcraft.api.power.IPowerEmitter", modid = "BuildCraftAPI|power") @@ -74,7 +74,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } - @Method(modid = "IC2API") + @Method(modid = "IC2") public void register() { if(!worldObj.isRemote) @@ -87,7 +87,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } } - @Method(modid = "IC2API") + @Method(modid = "IC2") public void deregister() { if(!worldObj.isRemote) @@ -307,21 +307,21 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getSinkTier() { return 4; } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public void setStored(int energy) { setEnergy(energy*Mekanism.FROM_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int addEnergy(int amount) { setEnergy(getEnergy() + amount*Mekanism.FROM_IC2); @@ -329,7 +329,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean isTeleporterCompatible(ForgeDirection side) { return getOutputtingSides().contains(side); @@ -342,35 +342,35 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { return !getOutputtingSides().contains(direction); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getStored() { return (int)Math.round(getEnergy()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getCapacity() { return (int)Math.round(getMaxEnergy()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getOutput() { return (int)Math.round(getMaxOutput()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getDemandedEnergy() { return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2; @@ -383,14 +383,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getOutputEnergyUnitsPerTick() { return getMaxOutput()*Mekanism.TO_IC2; } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double injectEnergy(ForgeDirection direction, double i, double v) { if(Coord4D.get(this).getFromSide(direction).getTileEntity(worldObj) instanceof IGridTransmitter) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 231286482..78004e571 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -76,6 +76,7 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; import buildcraft.api.tools.IToolWrench; +import ic2.api.energy.EnergyNet; /** * Utilities used by Mekanism. All miscellaneous methods are located here. @@ -1208,7 +1209,7 @@ public final class MekanismUtils */ public static boolean useIC2() { - return Mekanism.hooks.IC2Loaded && !Mekanism.blacklistIC2; + return Mekanism.hooks.IC2Loaded && EnergyNet.instance != null && !Mekanism.blacklistIC2; } /**