diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 9c77d330..b9cd6ced 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -14,6 +14,7 @@ import net.minecraftforge.fluids.IFluidHandler; import appeng.api.networking.IGridHost; import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; @@ -22,7 +23,10 @@ import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.util.BlockCoord; -@Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2") +@InterfaceList({ + @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), + @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas") +}) public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost { TileEntity getEntity(); diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index 305eb37f..d616d911 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -5,7 +5,6 @@ import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; @@ -19,12 +18,7 @@ public final class GasUtil { public static boolean isGasConduitEnabled() { if(!useCheckPerformed) { if(Config.isGasConduitEnabled) { - if(Loader.isModLoaded("MekanismAPI|gas")) { - isGasConduitEnabled = true; - } else { - ModContainer mc = Loader.instance().getIndexedModList().get("Mekanism"); - isGasConduitEnabled = mc != null && mc.getVersion().startsWith("7"); - } + isGasConduitEnabled = Loader.isModLoaded("MekanismAPI|gas"); } else { isGasConduitEnabled = false; } @@ -71,5 +65,4 @@ public final class GasUtil { private GasUtil() { } - } diff --git a/src/api/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java similarity index 100% rename from src/api/java/mekanism/api/Chunk3D.java rename to src/main/java/mekanism/api/Chunk3D.java diff --git a/src/api/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java similarity index 100% rename from src/api/java/mekanism/api/Coord4D.java rename to src/main/java/mekanism/api/Coord4D.java diff --git a/src/api/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java similarity index 100% rename from src/api/java/mekanism/api/EnumColor.java rename to src/main/java/mekanism/api/EnumColor.java diff --git a/src/api/java/mekanism/api/IClientTicker.java b/src/main/java/mekanism/api/IClientTicker.java similarity index 100% rename from src/api/java/mekanism/api/IClientTicker.java rename to src/main/java/mekanism/api/IClientTicker.java diff --git a/src/api/java/mekanism/api/IConfigurable.java b/src/main/java/mekanism/api/IConfigurable.java similarity index 100% rename from src/api/java/mekanism/api/IConfigurable.java rename to src/main/java/mekanism/api/IConfigurable.java diff --git a/src/api/java/mekanism/api/IFilterAccess.java b/src/main/java/mekanism/api/IFilterAccess.java similarity index 100% rename from src/api/java/mekanism/api/IFilterAccess.java rename to src/main/java/mekanism/api/IFilterAccess.java diff --git a/src/api/java/mekanism/api/IHeatTransfer.java b/src/main/java/mekanism/api/IHeatTransfer.java similarity index 100% rename from src/api/java/mekanism/api/IHeatTransfer.java rename to src/main/java/mekanism/api/IHeatTransfer.java diff --git a/src/api/java/mekanism/api/IMekWrench.java b/src/main/java/mekanism/api/IMekWrench.java similarity index 100% rename from src/api/java/mekanism/api/IMekWrench.java rename to src/main/java/mekanism/api/IMekWrench.java diff --git a/src/api/java/mekanism/api/ISalinationSolar.java b/src/main/java/mekanism/api/ISalinationSolar.java similarity index 100% rename from src/api/java/mekanism/api/ISalinationSolar.java rename to src/main/java/mekanism/api/ISalinationSolar.java diff --git a/src/api/java/mekanism/api/ItemRetriever.java b/src/main/java/mekanism/api/ItemRetriever.java similarity index 100% rename from src/api/java/mekanism/api/ItemRetriever.java rename to src/main/java/mekanism/api/ItemRetriever.java diff --git a/src/api/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java similarity index 100% rename from src/api/java/mekanism/api/MekanismAPI.java rename to src/main/java/mekanism/api/MekanismAPI.java diff --git a/src/api/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java similarity index 100% rename from src/api/java/mekanism/api/MekanismConfig.java rename to src/main/java/mekanism/api/MekanismConfig.java diff --git a/src/api/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java similarity index 100% rename from src/api/java/mekanism/api/Pos3D.java rename to src/main/java/mekanism/api/Pos3D.java diff --git a/src/api/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java similarity index 100% rename from src/api/java/mekanism/api/Range4D.java rename to src/main/java/mekanism/api/Range4D.java diff --git a/src/api/java/mekanism/api/TabProxy.java b/src/main/java/mekanism/api/TabProxy.java similarity index 100% rename from src/api/java/mekanism/api/TabProxy.java rename to src/main/java/mekanism/api/TabProxy.java diff --git a/src/api/java/mekanism/api/energy/EnergizedItemManager.java b/src/main/java/mekanism/api/energy/EnergizedItemManager.java similarity index 100% rename from src/api/java/mekanism/api/energy/EnergizedItemManager.java rename to src/main/java/mekanism/api/energy/EnergizedItemManager.java diff --git a/src/api/java/mekanism/api/energy/ICableOutputter.java b/src/main/java/mekanism/api/energy/ICableOutputter.java similarity index 100% rename from src/api/java/mekanism/api/energy/ICableOutputter.java rename to src/main/java/mekanism/api/energy/ICableOutputter.java diff --git a/src/api/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java similarity index 100% rename from src/api/java/mekanism/api/energy/IEnergizedItem.java rename to src/main/java/mekanism/api/energy/IEnergizedItem.java diff --git a/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java similarity index 100% rename from src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java rename to src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java diff --git a/src/api/java/mekanism/api/energy/IStrictEnergyStorage.java b/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java similarity index 100% rename from src/api/java/mekanism/api/energy/IStrictEnergyStorage.java rename to src/main/java/mekanism/api/energy/IStrictEnergyStorage.java diff --git a/src/api/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java similarity index 100% rename from src/api/java/mekanism/api/energy/package-info.java rename to src/main/java/mekanism/api/energy/package-info.java diff --git a/src/api/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java similarity index 100% rename from src/api/java/mekanism/api/gas/Gas.java rename to src/main/java/mekanism/api/gas/Gas.java diff --git a/src/api/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java similarity index 100% rename from src/api/java/mekanism/api/gas/GasNetwork.java rename to src/main/java/mekanism/api/gas/GasNetwork.java diff --git a/src/api/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java similarity index 100% rename from src/api/java/mekanism/api/gas/GasRegistry.java rename to src/main/java/mekanism/api/gas/GasRegistry.java diff --git a/src/api/java/mekanism/api/gas/GasStack.java b/src/main/java/mekanism/api/gas/GasStack.java similarity index 100% rename from src/api/java/mekanism/api/gas/GasStack.java rename to src/main/java/mekanism/api/gas/GasStack.java diff --git a/src/api/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java similarity index 100% rename from src/api/java/mekanism/api/gas/GasTank.java rename to src/main/java/mekanism/api/gas/GasTank.java diff --git a/src/api/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java similarity index 100% rename from src/api/java/mekanism/api/gas/GasTransmission.java rename to src/main/java/mekanism/api/gas/GasTransmission.java diff --git a/src/api/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java similarity index 100% rename from src/api/java/mekanism/api/gas/IGasHandler.java rename to src/main/java/mekanism/api/gas/IGasHandler.java diff --git a/src/api/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java similarity index 100% rename from src/api/java/mekanism/api/gas/IGasItem.java rename to src/main/java/mekanism/api/gas/IGasItem.java diff --git a/src/api/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java similarity index 100% rename from src/api/java/mekanism/api/gas/IGasTransmitter.java rename to src/main/java/mekanism/api/gas/IGasTransmitter.java diff --git a/src/api/java/mekanism/api/gas/ITubeConnection.java b/src/main/java/mekanism/api/gas/ITubeConnection.java similarity index 100% rename from src/api/java/mekanism/api/gas/ITubeConnection.java rename to src/main/java/mekanism/api/gas/ITubeConnection.java diff --git a/src/api/java/mekanism/api/gas/OreGas.java b/src/main/java/mekanism/api/gas/OreGas.java similarity index 100% rename from src/api/java/mekanism/api/gas/OreGas.java rename to src/main/java/mekanism/api/gas/OreGas.java diff --git a/src/api/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java similarity index 100% rename from src/api/java/mekanism/api/gas/package-info.java rename to src/main/java/mekanism/api/gas/package-info.java diff --git a/src/api/java/mekanism/api/infuse/InfuseObject.java b/src/main/java/mekanism/api/infuse/InfuseObject.java similarity index 100% rename from src/api/java/mekanism/api/infuse/InfuseObject.java rename to src/main/java/mekanism/api/infuse/InfuseObject.java diff --git a/src/api/java/mekanism/api/infuse/InfuseRegistry.java b/src/main/java/mekanism/api/infuse/InfuseRegistry.java similarity index 100% rename from src/api/java/mekanism/api/infuse/InfuseRegistry.java rename to src/main/java/mekanism/api/infuse/InfuseRegistry.java diff --git a/src/api/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java similarity index 100% rename from src/api/java/mekanism/api/infuse/InfuseType.java rename to src/main/java/mekanism/api/infuse/InfuseType.java diff --git a/src/api/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java similarity index 100% rename from src/api/java/mekanism/api/infuse/package-info.java rename to src/main/java/mekanism/api/infuse/package-info.java diff --git a/src/api/java/mekanism/api/lasers/ILaserReceptor.java b/src/main/java/mekanism/api/lasers/ILaserReceptor.java similarity index 100% rename from src/api/java/mekanism/api/lasers/ILaserReceptor.java rename to src/main/java/mekanism/api/lasers/ILaserReceptor.java diff --git a/src/api/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java similarity index 100% rename from src/api/java/mekanism/api/lasers/package-info.java rename to src/main/java/mekanism/api/lasers/package-info.java diff --git a/src/api/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java similarity index 100% rename from src/api/java/mekanism/api/package-info.java rename to src/main/java/mekanism/api/package-info.java diff --git a/src/api/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java similarity index 100% rename from src/api/java/mekanism/api/reactor/IFusionReactor.java rename to src/main/java/mekanism/api/reactor/IFusionReactor.java diff --git a/src/api/java/mekanism/api/reactor/INeutronCapture.java b/src/main/java/mekanism/api/reactor/INeutronCapture.java similarity index 100% rename from src/api/java/mekanism/api/reactor/INeutronCapture.java rename to src/main/java/mekanism/api/reactor/INeutronCapture.java diff --git a/src/api/java/mekanism/api/reactor/IReactorBlock.java b/src/main/java/mekanism/api/reactor/IReactorBlock.java similarity index 100% rename from src/api/java/mekanism/api/reactor/IReactorBlock.java rename to src/main/java/mekanism/api/reactor/IReactorBlock.java diff --git a/src/api/java/mekanism/api/reactor/package-info.java b/src/main/java/mekanism/api/reactor/package-info.java similarity index 100% rename from src/api/java/mekanism/api/reactor/package-info.java rename to src/main/java/mekanism/api/reactor/package-info.java diff --git a/src/api/java/mekanism/api/recipe/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java similarity index 100% rename from src/api/java/mekanism/api/recipe/RecipeHelper.java rename to src/main/java/mekanism/api/recipe/RecipeHelper.java diff --git a/src/api/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java similarity index 100% rename from src/api/java/mekanism/api/recipe/package-info.java rename to src/main/java/mekanism/api/recipe/package-info.java diff --git a/src/api/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/DynamicNetwork.java rename to src/main/java/mekanism/api/transmitters/DynamicNetwork.java diff --git a/src/api/java/mekanism/api/transmitters/IBlockableConnection.java b/src/main/java/mekanism/api/transmitters/IBlockableConnection.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/IBlockableConnection.java rename to src/main/java/mekanism/api/transmitters/IBlockableConnection.java diff --git a/src/api/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/IGridTransmitter.java rename to src/main/java/mekanism/api/transmitters/IGridTransmitter.java diff --git a/src/api/java/mekanism/api/transmitters/INetworkDataHandler.java b/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/INetworkDataHandler.java rename to src/main/java/mekanism/api/transmitters/INetworkDataHandler.java diff --git a/src/api/java/mekanism/api/transmitters/ITransmitter.java b/src/main/java/mekanism/api/transmitters/ITransmitter.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/ITransmitter.java rename to src/main/java/mekanism/api/transmitters/ITransmitter.java diff --git a/src/api/java/mekanism/api/transmitters/ITransmitterNetwork.java b/src/main/java/mekanism/api/transmitters/ITransmitterNetwork.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/ITransmitterNetwork.java rename to src/main/java/mekanism/api/transmitters/ITransmitterNetwork.java diff --git a/src/api/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/TransmissionType.java rename to src/main/java/mekanism/api/transmitters/TransmissionType.java diff --git a/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java rename to src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java diff --git a/src/api/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java similarity index 100% rename from src/api/java/mekanism/api/transmitters/package-info.java rename to src/main/java/mekanism/api/transmitters/package-info.java diff --git a/src/api/java/mekanism/api/util/BlockInfo.java b/src/main/java/mekanism/api/util/BlockInfo.java similarity index 100% rename from src/api/java/mekanism/api/util/BlockInfo.java rename to src/main/java/mekanism/api/util/BlockInfo.java diff --git a/src/api/java/mekanism/api/util/ItemInfo.java b/src/main/java/mekanism/api/util/ItemInfo.java similarity index 100% rename from src/api/java/mekanism/api/util/ItemInfo.java rename to src/main/java/mekanism/api/util/ItemInfo.java diff --git a/src/api/java/mekanism/api/util/ListUtils.java b/src/main/java/mekanism/api/util/ListUtils.java similarity index 100% rename from src/api/java/mekanism/api/util/ListUtils.java rename to src/main/java/mekanism/api/util/ListUtils.java diff --git a/src/api/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java similarity index 100% rename from src/api/java/mekanism/api/util/StackUtils.java rename to src/main/java/mekanism/api/util/StackUtils.java diff --git a/src/api/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java similarity index 100% rename from src/api/java/mekanism/api/util/UnitDisplayUtils.java rename to src/main/java/mekanism/api/util/UnitDisplayUtils.java diff --git a/src/api/java/mekanism/api/util/package-info.java b/src/main/java/mekanism/api/util/package-info.java similarity index 100% rename from src/api/java/mekanism/api/util/package-info.java rename to src/main/java/mekanism/api/util/package-info.java