From 2e38fb97485cae4a4439326992c5bcc5f3234ad3 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Mon, 7 Aug 2017 19:59:32 +0200 Subject: [PATCH] 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 --- src/main/java/mekanism/common/Mekanism.java | 6 +-- .../common/base/IAdvancedBoundingBlock.java | 4 +- .../mekanism/common/base/IEnergyWrapper.java | 10 ++-- .../mekanism/common/entity/EntityRobit.java | 3 +- .../common/integration/MekanismHooks.java | 50 ++++++++++++------- .../common/integration/OreDictManager.java | 3 +- .../common/integration/WailaDataProvider.java | 14 +++--- .../integration/computer/CCPeripheral.java | 15 +++--- .../integration/ic2/IC2Integration.java | 10 ++-- .../tesla/TeslaCableIntegration.java | 5 +- .../integration/tesla/TeslaIntegration.java | 15 +++--- .../integration/tesla/TeslaItemWrapper.java | 15 +++--- .../common/item/ItemBlockEnergyCube.java | 6 +-- .../common/item/ItemBlockMachine.java | 6 +-- .../common/item/ItemConfigurator.java | 7 +-- .../mekanism/common/item/ItemEnergized.java | 6 +-- .../mekanism/common/item/ItemFreeRunners.java | 6 +-- .../tile/TileEntityAdvancedBoundingBlock.java | 12 ++--- .../common/tile/TileEntityInductionPort.java | 44 ++++++++-------- .../tile/prefab/TileEntityBasicBlock.java | 4 +- .../tile/prefab/TileEntityElectricBlock.java | 36 ++++++------- .../common/item/ItemBlockGenerator.java | 6 +-- .../tile/turbine/TileEntityTurbineValve.java | 36 ++++++------- 23 files changed, 169 insertions(+), 150 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a928ecbe2..c37dafa6b 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1343,15 +1343,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(); } diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index e0ae676c7..b386d1f1b 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -4,8 +4,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; @@ -18,7 +18,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 interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile { diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 85b24dad9..6c4da770f 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -6,7 +6,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; @@ -15,10 +15,10 @@ 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.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 { diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 110c845a9..1b765fbea 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -18,6 +18,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; @@ -61,7 +62,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import cofh.api.energy.IEnergyContainerItem; -@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; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index d1b3c2195..ed9ee2ad9 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -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.integration.storagedrawer.StorageDrawerRecipeHandler; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; @@ -35,6 +34,21 @@ 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 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,20 +63,20 @@ 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(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("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) @@ -87,7 +101,7 @@ public final class MekanismHooks } } - @Method(modid = IC2Integration.MODID) + @Method(modid = MekanismHooks.IC2_MOD_ID) public void hookIC2Recipes() { for(MachineRecipe> entry : Recipes.macerator.getRecipes()) @@ -133,7 +147,7 @@ public final class MekanismHooks } catch(Exception e) {} } - @Method(modid = "ComputerCraft") + @Method(modid = COMPUTERCRAFT_MOD_ID) public void loadCCPeripheralProviders() { try { @@ -141,7 +155,7 @@ public final class MekanismHooks } catch(Exception e) {} } - @Method(modid = "opencomputers") + @Method(modid = OPENCOMPUTERS_MOD_ID) public void loadOCDrivers() { try { @@ -160,26 +174,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; } diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 3119d3562..4afa07c6a 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -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 { diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 4ea76c912..53b2c777e 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -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 getWailaHead(ItemStack itemStack, List 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 getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - @Method(modid = "Waila") + @Method(modid = MekanismHooks.WAILA_MOD_ID) public List getWailaTail(ItemStack itemStack, List 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; diff --git a/src/main/java/mekanism/common/integration/computer/CCPeripheral.java b/src/main/java/mekanism/common/integration/computer/CCPeripheral.java index 42f479a67..09f340c2d 100644 --- a/src/main/java/mekanism/common/integration/computer/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/computer/CCPeripheral.java @@ -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; diff --git a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java index f354ef1be..0d0ef6b0f 100644 --- a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java +++ b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java @@ -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()); diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java index 878a1d6f1..80bd7be00 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java @@ -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); diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java index a601e9a1c..73c872fcf 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java @@ -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)); diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java index 7c042d4e5..42898b7e4 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java @@ -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); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 9ad6a41a6..3aff342a7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -23,8 +23,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; @@ -57,7 +57,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @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 { @@ -325,7 +325,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); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 27ae43d59..dc7a5705d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -35,8 +35,8 @@ 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.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; @@ -133,7 +133,7 @@ import cofh.api.energy.IEnergyContainerItem; * */ @InterfaceList({ - @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 { @@ -779,7 +779,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); diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 56f7b9059..ea3bf4050 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -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 buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; @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, IToolHammer, IItemNetwork { @@ -259,14 +260,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 diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 6b6614c9b..1003d2bba 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -10,8 +10,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; @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @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 { @@ -172,7 +172,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); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 4d6045ef9..81e7af26d 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -12,8 +12,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; @@ -45,7 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @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 { @@ -207,7 +207,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); diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index bd5a92a00..776609130 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -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(); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 5f98bb3de..fd71ce051 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -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) @@ -280,28 +280,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); @@ -311,7 +311,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); @@ -324,49 +324,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; @@ -379,14 +379,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)); @@ -399,7 +399,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) @@ -533,4 +533,4 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return super.getCapability(capability, facing); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 75910b8e1..2b32bccf0 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -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. */ diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index f31105c7d..007f24f1e 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -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) @@ -251,28 +251,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); @@ -280,7 +280,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); @@ -293,49 +293,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; @@ -348,14 +348,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)); @@ -369,7 +369,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)); diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index dc0225949..b3df70fa6 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -16,8 +16,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; @@ -71,7 +71,7 @@ import cofh.api.energy.IEnergyContainerItem; */ @InterfaceList({ - @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 { @@ -412,7 +412,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); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 4f173c4d0..f817bc211 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -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) @@ -205,35 +205,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); @@ -246,49 +246,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; @@ -301,21 +301,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)