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

+3 -3
View File
@@ -785,15 +785,15 @@ public class Mekanism
addEntities();
//Integrate with Waila
FMLInterModComms.sendMessage("Waila", "register", "mekanism.common.integration.WailaDataProvider.register");
FMLInterModComms.sendMessage(MekanismHooks.WAILA_MOD_ID, "register", "mekanism.common.integration.WailaDataProvider.register");
//Integrate with OpenComputers
if(Loader.isModLoaded("OpenComputers"))
if(Loader.isModLoaded(MekanismHooks.OPENCOMPUTERS_MOD_ID))
{
hooks.loadOCDrivers();
}
if(Loader.isModLoaded("appliedenergistics2"))
if(Loader.isModLoaded(MekanismHooks.APPLIED_ENERGISTICS_2_MOD_ID))
{
hooks.registerAE2P2P();
}
@@ -6,8 +6,8 @@ import ic2.api.energy.tile.IEnergySink;
import mekanism.api.IConfigCardAccess.ISpecialConfigData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.security.ISecurityTile;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -20,7 +20,7 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
@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 interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile
{
@@ -9,7 +9,7 @@ import ic2.api.tile.IEnergyStorage;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyOutputter;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.MekanismHooks;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional.Interface;
@@ -18,10 +18,10 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
@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.IEnergySource", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = MekanismHooks.IC2_MOD_ID)
})
public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory
{
@@ -19,6 +19,7 @@ import mekanism.common.capabilities.Capabilities;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.entity.ai.RobitAIFollow;
import mekanism.common.entity.ai.RobitAIPickup;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.item.ItemConfigurator;
import mekanism.common.item.ItemRobit;
import mekanism.common.tile.TileEntityChargepad;
@@ -60,7 +61,7 @@ import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Optional.Interface;
@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API")
@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = MekanismHooks.GALACTICRAFT_MOD_ID)
public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable
{
public double MAX_ELECTRICITY = 100000;
@@ -16,7 +16,6 @@ import mekanism.common.Resource;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.integration.computer.CCPeripheral;
import mekanism.common.integration.computer.OCDriver;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.util.MekanismUtils;
import net.minecraft.init.Items;
@@ -34,6 +33,22 @@ import dan200.computercraft.api.ComputerCraftAPI;
*/
public final class MekanismHooks
{
public static final String COFH_CORE_MOD_ID = "cofhcore";
public static final String IC2_MOD_ID = "ic2";
public static final String RAILCRAFT_MOD_ID = "railcraft";
public static final String THERMALEXPANSION_MOD_ID = "thermalexpansion";
public static final String COMPUTERCRAFT_MOD_ID = "computercraft";
public static final String APPLIED_ENERGISTICS_2_MOD_ID = "appliedenergistics2";
public static final String TESLA_MOD_ID = "tesla";
public static final String MCMULTIPART_MOD_ID = "mcmultipart";
public static final String REDSTONEFLUX_MOD_ID = "redstoneflux";
public static final String METALLURGY_3_CORE_MOD_ID = "Metallurgy3Core";
public static final String METALLURGY_3_BASE_MOD_ID = "Metallurgy3Base";
public static final String OPENCOMPUTERS_MOD_ID = "opencomputers";
public static final String GALACTICRAFT_MOD_ID = "Galacticraft API";
public static final String WAILA_MOD_ID = "Waila";
public static final String BUILDCRAFT_MOD_ID = "BuildCraft";
public boolean IC2Loaded = false;
public boolean RailcraftLoaded = false;
public boolean CoFHCoreLoaded = false;
@@ -49,21 +64,21 @@ public final class MekanismHooks
public void hook()
{
if(Loader.isModLoaded("cofhcore")) CoFHCoreLoaded = true;
if(Loader.isModLoaded("ic2")) IC2Loaded = true;
if(Loader.isModLoaded("railcraft")) RailcraftLoaded = true;
if(Loader.isModLoaded("thermalexpansion")) TELoaded = true;
if(Loader.isModLoaded("ComputerCraft")) CCLoaded = true;
if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true;
if(Loader.isModLoaded("tesla")) TeslaLoaded = true;
if(Loader.isModLoaded("mcmultipart")) MCMPLoaded = true;
if(Loader.isModLoaded("redstoneflux")) RFLoaded = true;
if(Loader.isModLoaded(COFH_CORE_MOD_ID)) CoFHCoreLoaded = true;
if(Loader.isModLoaded(IC2_MOD_ID)) IC2Loaded = true;
if(Loader.isModLoaded(RAILCRAFT_MOD_ID)) RailcraftLoaded = true;
if(Loader.isModLoaded(THERMALEXPANSION_MOD_ID)) TELoaded = true;
if(Loader.isModLoaded(COMPUTERCRAFT_MOD_ID)) CCLoaded = true;
if(Loader.isModLoaded(APPLIED_ENERGISTICS_2_MOD_ID)) AE2Loaded = true;
if(Loader.isModLoaded(TESLA_MOD_ID)) TeslaLoaded = true;
if(Loader.isModLoaded(MCMULTIPART_MOD_ID)) MCMPLoaded = true;
if(Loader.isModLoaded(REDSTONEFLUX_MOD_ID)) RFLoaded = true;
if(Loader.isModLoaded("Metallurgy3Core"))
if(Loader.isModLoaded(METALLURGY_3_CORE_MOD_ID))
{
MetallurgyCoreLoaded = true;
if(Loader.isModLoaded("Metallurgy3Base")) MetallurgyBaseLoaded = true;
if(Loader.isModLoaded(METALLURGY_3_BASE_MOD_ID)) MetallurgyBaseLoaded = true;
}
if(IC2Loaded)
@@ -78,7 +93,7 @@ public final class MekanismHooks
}
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void hookIC2Recipes()
{
for(MachineRecipe<IRecipeInput, Collection<ItemStack>> entry : Recipes.macerator.getRecipes())
@@ -124,7 +139,7 @@ public final class MekanismHooks
} catch(Exception e) {}
}
@Method(modid = "ComputerCraft")
@Method(modid = COMPUTERCRAFT_MOD_ID)
public void loadCCPeripheralProviders()
{
try {
@@ -132,7 +147,7 @@ public final class MekanismHooks
} catch(Exception e) {}
}
@Method(modid = "opencomputers")
@Method(modid = OPENCOMPUTERS_MOD_ID)
public void loadOCDrivers()
{
try {
@@ -151,26 +166,26 @@ public final class MekanismHooks
FMLInterModComms.sendMessage("mekanism", "PulverizerRecipe", nbtTags);
}
@Method(modid = "appliedenergistics2")
@Method(modid = APPLIED_ENERGISTICS_2_MOD_ID)
public void registerAE2P2P()
{
for(TransmitterType type : TransmitterType.values())
{
if(type.getTransmission().equals(TransmissionType.ITEM))
{
FMLInterModComms.sendMessage("appliedenergistics2", "add-p2p-attunement-item", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage(APPLIED_ENERGISTICS_2_MOD_ID, "add-p2p-attunement-item", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
if(type.getTransmission().equals(TransmissionType.FLUID))
{
FMLInterModComms.sendMessage("appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage(APPLIED_ENERGISTICS_2_MOD_ID, "add-p2p-attunement-fluid", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
if(type.getTransmission().equals(TransmissionType.ENERGY))
{
FMLInterModComms.sendMessage("appliedenergistics2", "add-p2p-attunement-forge-power", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage(APPLIED_ENERGISTICS_2_MOD_ID, "add-p2p-attunement-forge-power", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
@@ -13,7 +13,6 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.MekanismItems;
import mekanism.common.Resource;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils;
@@ -287,7 +286,7 @@ public final class OreDictManager
} catch(Exception e) {}
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public static void addIC2BronzeRecipe()
{
try {
@@ -27,10 +27,10 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.Method;
@Interface(iface = "mcp.mobius.waila.api.IWailaDataProvider", modid = "Waila")
@Interface(iface = "mcp.mobius.waila.api.IWailaDataProvider", modid = MekanismHooks.WAILA_MOD_ID)
public class WailaDataProvider implements IWailaDataProvider
{
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public static void register(IWailaRegistrar registrar)
{
WailaDataProvider provider = new WailaDataProvider();
@@ -47,14 +47,14 @@ public class WailaDataProvider implements IWailaDataProvider
}
@Override
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return ItemStack.EMPTY;
}
@Override
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
TileEntity tile = accessor.getTileEntity();
@@ -102,21 +102,21 @@ public class WailaDataProvider implements IWailaDataProvider
}
@Override
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
@Method(modid = "Waila")
@Method(modid = MekanismHooks.WAILA_MOD_ID)
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos)
{
return tag;
@@ -1,5 +1,6 @@
package mekanism.common.integration.computer;
import mekanism.common.integration.MekanismHooks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -14,7 +15,7 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
/**
* Created by aidancbrady on 7/20/15.
*/
@Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft")
@Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public class CCPeripheral implements IPeripheral
{
public IComputerIntegration computerTile;
@@ -25,21 +26,21 @@ public class CCPeripheral implements IPeripheral
}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public String getType()
{
return computerTile.getName();
}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public String[] getMethodNames()
{
return computerTile.getMethods();
}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException
{
try {
@@ -53,15 +54,15 @@ public class CCPeripheral implements IPeripheral
}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public void attach(IComputerAccess computer) {}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public void detach(IComputerAccess computer) {}
@Override
@Optional.Method(modid = "ComputerCraft")
@Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID)
public boolean equals(IPeripheral other)
{
return this == other;
@@ -6,15 +6,15 @@ import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergyTile;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional.Method;
public class IC2Integration
{
public static final String MODID = "ic2";
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public static boolean isOutputter(TileEntity tileEntity, EnumFacing side)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -27,7 +27,7 @@ public class IC2Integration
return false;
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -43,7 +43,7 @@ public class IC2Integration
return false;
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public static double emitEnergy(IEnergyWrapper from, TileEntity tileEntity, EnumFacing side, double currentSending)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -1,13 +1,14 @@
package mekanism.common.integration.tesla;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.Method;
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = MekanismHooks.TESLA_MOD_ID)
public class TeslaCableIntegration implements ITeslaConsumer
{
public TileEntityUniversalCable tileEntity;
@@ -21,7 +22,7 @@ public class TeslaCableIntegration implements ITeslaConsumer
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long givePower(long power, boolean simulated)
{
return (long)Math.round(tileEntity.acceptEnergy(side, power*general.FROM_TESLA, simulated)*general.TO_TESLA);
@@ -2,6 +2,7 @@ package mekanism.common.integration.tesla;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.darkhax.tesla.api.ITeslaHolder;
import net.darkhax.tesla.api.ITeslaProducer;
@@ -11,9 +12,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = MekanismHooks.TESLA_MOD_ID),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = MekanismHooks.TESLA_MOD_ID),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = MekanismHooks.TESLA_MOD_ID)
})
public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaProducer
{
@@ -28,28 +29,28 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long getStoredPower()
{
return (long)Math.round(tileEntity.getEnergy()*general.TO_TESLA);
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long getCapacity()
{
return (long)Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA);
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long takePower(long power, boolean simulated)
{
return rfToTesla(tileEntity.extractEnergy(side, teslaToRF(power), simulated));
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long givePower(long power, boolean simulated)
{
return rfToTesla(tileEntity.receiveEnergy(side, teslaToRF(power), simulated));
@@ -4,6 +4,7 @@ import mekanism.api.energy.IEnergizedItem;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.ItemCapabilityWrapper.ItemCapability;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.darkhax.tesla.api.ITeslaHolder;
import net.darkhax.tesla.api.ITeslaProducer;
@@ -13,9 +14,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = MekanismHooks.TESLA_MOD_ID),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = MekanismHooks.TESLA_MOD_ID),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = MekanismHooks.TESLA_MOD_ID)
})
public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, ITeslaConsumer, ITeslaProducer
{
@@ -33,7 +34,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long takePower(long power, boolean simulated)
{
if(getItem().canSend(getStack()))
@@ -53,7 +54,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long givePower(long power, boolean simulated)
{
if(getItem().canReceive(getStack()))
@@ -73,14 +74,14 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long getStoredPower()
{
return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA);
}
@Override
@Method(modid = "tesla")
@Method(modid = MekanismHooks.TESLA_MOD_ID)
public long getCapacity()
{
return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA);
@@ -24,8 +24,8 @@ import mekanism.common.base.ISustainedInventory;
import mekanism.common.base.ITierItem;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
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;
@@ -60,7 +60,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 ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem, ITierItem
{
@@ -332,7 +332,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -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);
@@ -18,6 +18,7 @@ import mekanism.common.SideData;
import mekanism.common.base.IItemNetwork;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.prefab.TileEntityBasicBlock;
@@ -52,7 +53,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@InterfaceList({
@Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft")
@Interface(iface = "buildcraft.api.tools.IToolWrench", modid = MekanismHooks.BUILDCRAFT_MOD_ID)
})
public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IItemNetwork
{
@@ -260,14 +261,14 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool
}
@Override
@Method(modid = "BuildCraft")
@Method(modid = MekanismHooks.BUILDCRAFT_MOD_ID)
public boolean canWrench(EntityPlayer player, EnumHand hand, ItemStack wrench, RayTraceResult rayTrace)
{
return canUseWrench(wrench, player, rayTrace.getBlockPos());
}
@Override
@Method(modid = "BuildCraft")
@Method(modid = MekanismHooks.BUILDCRAFT_MOD_ID)
public void wrenchUsed(EntityPlayer player, EnumHand hand, ItemStack wrench, RayTraceResult rayTrace) {}
@Override
@@ -11,8 +11,8 @@ import mekanism.api.energy.IEnergizedItem;
import mekanism.common.Mekanism;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
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.util.ItemDataUtils;
@@ -35,7 +35,7 @@ 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 = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID)
})
public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
{
@@ -179,7 +179,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -13,8 +13,8 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel;
import mekanism.common.Mekanism;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
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.util.ItemDataUtils;
@@ -47,7 +47,7 @@ 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 = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID)
})
public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
{
@@ -215,7 +215,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -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();
@@ -21,8 +21,8 @@ import mekanism.common.base.IEnergyWrapper;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.CableUtils;
@@ -44,9 +44,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = MekanismHooks.IC2_MOD_ID)
})
public class TileEntityInductionPort extends TileEntityInductionCasing implements IEnergyWrapper, IConfigurable, IActiveState
{
@@ -98,7 +98,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
return (structure != null && !mode);
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void register()
{
if(!world.isRemote)
@@ -120,7 +120,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void deregister()
{
if(!world.isRemote)
@@ -285,28 +285,28 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int addEnergy(int amount)
{
double toUse = Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), amount*general.FROM_IC2);
@@ -316,7 +316,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return canOutputEnergy(side);
@@ -329,49 +329,49 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return sideIsConsumer(direction);
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getDemandedEnergy()
{
return (getMaxEnergy() - getEnergy())*general.TO_IC2;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -384,14 +384,14 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
@@ -404,7 +404,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void drawEnergy(double amount)
{
if(structure != null)
@@ -19,7 +19,7 @@ import mekanism.common.config.MekanismConfig.general;
import mekanism.common.frequency.Frequency;
import mekanism.common.frequency.FrequencyManager;
import mekanism.common.frequency.IFrequencyHandler;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.security.ISecurityTile;
@@ -35,7 +35,7 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Optional.Interface;
@Interface(iface = "ic2.api.tile.IWrenchable", modid = IC2Integration.MODID)
@Interface(iface = "ic2.api.tile.IWrenchable", modid = MekanismHooks.IC2_MOD_ID)
public abstract class TileEntityBasicBlock extends TileEntity implements ITileNetwork, IChunkLoadHandler, IFrequencyHandler, ITickable
{
/** The direction this block is facing. */
@@ -15,8 +15,8 @@ import mekanism.common.base.IEnergyWrapper;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.util.CapabilityUtils;
import mekanism.common.util.MekanismUtils;
@@ -56,7 +56,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
maxEnergy = BASE_MAX_ENERGY;
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void register()
{
if(!world.isRemote)
@@ -78,7 +78,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void deregister()
{
if(!world.isRemote)
@@ -256,28 +256,28 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int addEnergy(int amount)
{
setEnergy(getEnergy() + amount*general.FROM_IC2);
@@ -285,7 +285,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return sideIsOutput(side);
@@ -298,49 +298,49 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return sideIsConsumer(direction);
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getDemandedEnergy()
{
return (getMaxEnergy() - getEnergy())*general.TO_IC2;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -353,14 +353,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
@@ -374,7 +374,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void drawEnergy(double amount)
{
setEnergy(Math.max(getEnergy() - (amount*general.FROM_IC2), 0));
@@ -17,8 +17,8 @@ import mekanism.common.base.ISustainedInventory;
import mekanism.common.base.ISustainedTank;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.MekanismHooks;
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.security.ISecurityItem;
@@ -74,7 +74,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 ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, ISustainedTank, IEnergyContainerItem, ISecurityItem
{
@@ -419,7 +419,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -15,9 +15,9 @@ import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.generators;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.tile.TileEntityGasTank.GasMode;
import mekanism.common.util.CableUtils;
@@ -87,7 +87,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
return false;
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void register()
{
if(!world.isRemote)
@@ -109,7 +109,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
}
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void deregister()
{
if(!world.isRemote)
@@ -210,35 +210,35 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int addEnergy(int amount)
{
return 0;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return canOutputEnergy(side);
@@ -251,49 +251,49 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return false;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getDemandedEnergy()
{
return 0;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -306,21 +306,21 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
return amount;
}
@Override
@Method(modid = IC2Integration.MODID)
@Method(modid = MekanismHooks.IC2_MOD_ID)
public void drawEnergy(double amount)
{
if(structure != null)