From 82ac6b6e1ba71d7bd8dcf6a4b112e223b652eeff Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 14 Jul 2015 17:14:59 -0400 Subject: [PATCH] Remove Mekanism API from shipped APIs. This is only somewhat tested. --- build.gradle | 1 + src/{main => api}/java/mekanism/api/Chunk3D.java | 0 src/{main => api}/java/mekanism/api/Coord4D.java | 0 src/{main => api}/java/mekanism/api/EnumColor.java | 0 .../java/mekanism/api/IClientTicker.java | 0 .../java/mekanism/api/IConfigurable.java | 0 .../java/mekanism/api/IFilterAccess.java | 0 .../java/mekanism/api/IHeatTransfer.java | 0 .../java/mekanism/api/IMekWrench.java | 0 .../java/mekanism/api/ISalinationSolar.java | 0 .../java/mekanism/api/ItemRetriever.java | 0 .../java/mekanism/api/MekanismAPI.java | 0 .../java/mekanism/api/MekanismConfig.java | 0 src/{main => api}/java/mekanism/api/Pos3D.java | 0 src/{main => api}/java/mekanism/api/Range4D.java | 0 src/{main => api}/java/mekanism/api/TabProxy.java | 0 .../mekanism/api/energy/EnergizedItemManager.java | 0 .../java/mekanism/api/energy/EnergyStack.java | 0 .../java/mekanism/api/energy/ICableOutputter.java | 0 .../java/mekanism/api/energy/IEnergizedItem.java | 0 .../mekanism/api/energy/IStrictEnergyAcceptor.java | 0 .../mekanism/api/energy/IStrictEnergyStorage.java | 0 .../java/mekanism/api/energy/package-info.java | 0 src/{main => api}/java/mekanism/api/gas/Gas.java | 0 .../java/mekanism/api/gas/GasNetwork.java | 0 .../java/mekanism/api/gas/GasRegistry.java | 0 .../java/mekanism/api/gas/GasStack.java | 0 .../java/mekanism/api/gas/GasTank.java | 0 .../java/mekanism/api/gas/GasTransmission.java | 0 .../java/mekanism/api/gas/IGasHandler.java | 0 .../java/mekanism/api/gas/IGasItem.java | 0 .../java/mekanism/api/gas/IGasTransmitter.java | 0 .../java/mekanism/api/gas/ITubeConnection.java | 0 .../java/mekanism/api/gas/OreGas.java | 0 .../java/mekanism/api/gas/package-info.java | 0 .../java/mekanism/api/infuse/InfuseObject.java | 0 .../java/mekanism/api/infuse/InfuseRegistry.java | 0 .../java/mekanism/api/infuse/InfuseType.java | 0 .../java/mekanism/api/infuse/package-info.java | 0 .../java/mekanism/api/lasers/ILaserReceptor.java | 0 .../java/mekanism/api/lasers/package-info.java | 0 .../java/mekanism/api/package-info.java | 0 .../java/mekanism/api/reactor/IFusionReactor.java | 0 .../java/mekanism/api/reactor/INeutronCapture.java | 0 .../java/mekanism/api/reactor/IReactorBlock.java | 0 .../java/mekanism/api/reactor/package-info.java | 0 .../java/mekanism/api/recipe/RecipeHelper.java | 0 .../java/mekanism/api/recipe/package-info.java | 0 .../mekanism/api/transmitters/DynamicNetwork.java | 0 .../api/transmitters/IBlockableConnection.java | 0 .../api/transmitters/IGridTransmitter.java | 0 .../api/transmitters/INetworkDataHandler.java | 0 .../mekanism/api/transmitters/ITransmitter.java | 0 .../api/transmitters/ITransmitterTile.java | 0 .../api/transmitters/TransmissionType.java | 0 .../transmitters/TransmitterNetworkRegistry.java | 0 .../mekanism/api/transmitters/package-info.java | 0 .../java/mekanism/api/util/BlockInfo.java | 0 .../java/mekanism/api/util/ItemInfo.java | 0 .../java/mekanism/api/util/ListUtils.java | 0 .../java/mekanism/api/util/StackUtils.java | 0 .../java/mekanism/api/util/UnitDisplayUtils.java | 0 .../java/mekanism/api/util/package-info.java | 0 .../enderio/conduit/gas/AbstractGasConduit.java | 3 +++ .../conduit/gas/AbstractGasTankConduit.java | 3 +++ .../enderio/conduit/gas/ConduitGasTank.java | 3 +++ .../crazypants/enderio/conduit/gas/GasConduit.java | 7 +++++++ .../crazypants/enderio/conduit/gas/GasUtil.java | 14 ++++++++------ .../enderio/conduit/gas/IGasConduit.java | 2 ++ 69 files changed, 27 insertions(+), 6 deletions(-) rename src/{main => api}/java/mekanism/api/Chunk3D.java (100%) rename src/{main => api}/java/mekanism/api/Coord4D.java (100%) rename src/{main => api}/java/mekanism/api/EnumColor.java (100%) rename src/{main => api}/java/mekanism/api/IClientTicker.java (100%) rename src/{main => api}/java/mekanism/api/IConfigurable.java (100%) rename src/{main => api}/java/mekanism/api/IFilterAccess.java (100%) rename src/{main => api}/java/mekanism/api/IHeatTransfer.java (100%) rename src/{main => api}/java/mekanism/api/IMekWrench.java (100%) rename src/{main => api}/java/mekanism/api/ISalinationSolar.java (100%) rename src/{main => api}/java/mekanism/api/ItemRetriever.java (100%) rename src/{main => api}/java/mekanism/api/MekanismAPI.java (100%) rename src/{main => api}/java/mekanism/api/MekanismConfig.java (100%) rename src/{main => api}/java/mekanism/api/Pos3D.java (100%) rename src/{main => api}/java/mekanism/api/Range4D.java (100%) rename src/{main => api}/java/mekanism/api/TabProxy.java (100%) rename src/{main => api}/java/mekanism/api/energy/EnergizedItemManager.java (100%) rename src/{main => api}/java/mekanism/api/energy/EnergyStack.java (100%) rename src/{main => api}/java/mekanism/api/energy/ICableOutputter.java (100%) rename src/{main => api}/java/mekanism/api/energy/IEnergizedItem.java (100%) rename src/{main => api}/java/mekanism/api/energy/IStrictEnergyAcceptor.java (100%) rename src/{main => api}/java/mekanism/api/energy/IStrictEnergyStorage.java (100%) rename src/{main => api}/java/mekanism/api/energy/package-info.java (100%) rename src/{main => api}/java/mekanism/api/gas/Gas.java (100%) rename src/{main => api}/java/mekanism/api/gas/GasNetwork.java (100%) rename src/{main => api}/java/mekanism/api/gas/GasRegistry.java (100%) rename src/{main => api}/java/mekanism/api/gas/GasStack.java (100%) rename src/{main => api}/java/mekanism/api/gas/GasTank.java (100%) rename src/{main => api}/java/mekanism/api/gas/GasTransmission.java (100%) rename src/{main => api}/java/mekanism/api/gas/IGasHandler.java (100%) rename src/{main => api}/java/mekanism/api/gas/IGasItem.java (100%) rename src/{main => api}/java/mekanism/api/gas/IGasTransmitter.java (100%) rename src/{main => api}/java/mekanism/api/gas/ITubeConnection.java (100%) rename src/{main => api}/java/mekanism/api/gas/OreGas.java (100%) rename src/{main => api}/java/mekanism/api/gas/package-info.java (100%) rename src/{main => api}/java/mekanism/api/infuse/InfuseObject.java (100%) rename src/{main => api}/java/mekanism/api/infuse/InfuseRegistry.java (100%) rename src/{main => api}/java/mekanism/api/infuse/InfuseType.java (100%) rename src/{main => api}/java/mekanism/api/infuse/package-info.java (100%) rename src/{main => api}/java/mekanism/api/lasers/ILaserReceptor.java (100%) rename src/{main => api}/java/mekanism/api/lasers/package-info.java (100%) rename src/{main => api}/java/mekanism/api/package-info.java (100%) rename src/{main => api}/java/mekanism/api/reactor/IFusionReactor.java (100%) rename src/{main => api}/java/mekanism/api/reactor/INeutronCapture.java (100%) rename src/{main => api}/java/mekanism/api/reactor/IReactorBlock.java (100%) rename src/{main => api}/java/mekanism/api/reactor/package-info.java (100%) rename src/{main => api}/java/mekanism/api/recipe/RecipeHelper.java (100%) rename src/{main => api}/java/mekanism/api/recipe/package-info.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/DynamicNetwork.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/IBlockableConnection.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/IGridTransmitter.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/INetworkDataHandler.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/ITransmitter.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/ITransmitterTile.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/TransmissionType.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java (100%) rename src/{main => api}/java/mekanism/api/transmitters/package-info.java (100%) rename src/{main => api}/java/mekanism/api/util/BlockInfo.java (100%) rename src/{main => api}/java/mekanism/api/util/ItemInfo.java (100%) rename src/{main => api}/java/mekanism/api/util/ListUtils.java (100%) rename src/{main => api}/java/mekanism/api/util/StackUtils.java (100%) rename src/{main => api}/java/mekanism/api/util/UnitDisplayUtils.java (100%) rename src/{main => api}/java/mekanism/api/util/package-info.java (100%) diff --git a/build.gradle b/build.gradle index e3cfb5b4..29129d28 100644 --- a/build.gradle +++ b/build.gradle @@ -179,6 +179,7 @@ curse { changelog = System.getenv("CHANGELOG").equals("none") ? getChangelogText() : System.getenv("CHANGELOG") releaseType = project.hasProperty('mod_appendix') ? "${mod_appendix}".toString() : 'release' additionalArtifact deobfJar + relatedProject 'endercore' } task checkTranslations << { diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/api/java/mekanism/api/Chunk3D.java similarity index 100% rename from src/main/java/mekanism/api/Chunk3D.java rename to src/api/java/mekanism/api/Chunk3D.java diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/api/java/mekanism/api/Coord4D.java similarity index 100% rename from src/main/java/mekanism/api/Coord4D.java rename to src/api/java/mekanism/api/Coord4D.java diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/api/java/mekanism/api/EnumColor.java similarity index 100% rename from src/main/java/mekanism/api/EnumColor.java rename to src/api/java/mekanism/api/EnumColor.java diff --git a/src/main/java/mekanism/api/IClientTicker.java b/src/api/java/mekanism/api/IClientTicker.java similarity index 100% rename from src/main/java/mekanism/api/IClientTicker.java rename to src/api/java/mekanism/api/IClientTicker.java diff --git a/src/main/java/mekanism/api/IConfigurable.java b/src/api/java/mekanism/api/IConfigurable.java similarity index 100% rename from src/main/java/mekanism/api/IConfigurable.java rename to src/api/java/mekanism/api/IConfigurable.java diff --git a/src/main/java/mekanism/api/IFilterAccess.java b/src/api/java/mekanism/api/IFilterAccess.java similarity index 100% rename from src/main/java/mekanism/api/IFilterAccess.java rename to src/api/java/mekanism/api/IFilterAccess.java diff --git a/src/main/java/mekanism/api/IHeatTransfer.java b/src/api/java/mekanism/api/IHeatTransfer.java similarity index 100% rename from src/main/java/mekanism/api/IHeatTransfer.java rename to src/api/java/mekanism/api/IHeatTransfer.java diff --git a/src/main/java/mekanism/api/IMekWrench.java b/src/api/java/mekanism/api/IMekWrench.java similarity index 100% rename from src/main/java/mekanism/api/IMekWrench.java rename to src/api/java/mekanism/api/IMekWrench.java diff --git a/src/main/java/mekanism/api/ISalinationSolar.java b/src/api/java/mekanism/api/ISalinationSolar.java similarity index 100% rename from src/main/java/mekanism/api/ISalinationSolar.java rename to src/api/java/mekanism/api/ISalinationSolar.java diff --git a/src/main/java/mekanism/api/ItemRetriever.java b/src/api/java/mekanism/api/ItemRetriever.java similarity index 100% rename from src/main/java/mekanism/api/ItemRetriever.java rename to src/api/java/mekanism/api/ItemRetriever.java diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/api/java/mekanism/api/MekanismAPI.java similarity index 100% rename from src/main/java/mekanism/api/MekanismAPI.java rename to src/api/java/mekanism/api/MekanismAPI.java diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/api/java/mekanism/api/MekanismConfig.java similarity index 100% rename from src/main/java/mekanism/api/MekanismConfig.java rename to src/api/java/mekanism/api/MekanismConfig.java diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/api/java/mekanism/api/Pos3D.java similarity index 100% rename from src/main/java/mekanism/api/Pos3D.java rename to src/api/java/mekanism/api/Pos3D.java diff --git a/src/main/java/mekanism/api/Range4D.java b/src/api/java/mekanism/api/Range4D.java similarity index 100% rename from src/main/java/mekanism/api/Range4D.java rename to src/api/java/mekanism/api/Range4D.java diff --git a/src/main/java/mekanism/api/TabProxy.java b/src/api/java/mekanism/api/TabProxy.java similarity index 100% rename from src/main/java/mekanism/api/TabProxy.java rename to src/api/java/mekanism/api/TabProxy.java diff --git a/src/main/java/mekanism/api/energy/EnergizedItemManager.java b/src/api/java/mekanism/api/energy/EnergizedItemManager.java similarity index 100% rename from src/main/java/mekanism/api/energy/EnergizedItemManager.java rename to src/api/java/mekanism/api/energy/EnergizedItemManager.java diff --git a/src/main/java/mekanism/api/energy/EnergyStack.java b/src/api/java/mekanism/api/energy/EnergyStack.java similarity index 100% rename from src/main/java/mekanism/api/energy/EnergyStack.java rename to src/api/java/mekanism/api/energy/EnergyStack.java diff --git a/src/main/java/mekanism/api/energy/ICableOutputter.java b/src/api/java/mekanism/api/energy/ICableOutputter.java similarity index 100% rename from src/main/java/mekanism/api/energy/ICableOutputter.java rename to src/api/java/mekanism/api/energy/ICableOutputter.java diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/api/java/mekanism/api/energy/IEnergizedItem.java similarity index 100% rename from src/main/java/mekanism/api/energy/IEnergizedItem.java rename to src/api/java/mekanism/api/energy/IEnergizedItem.java diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java similarity index 100% rename from src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java rename to src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java b/src/api/java/mekanism/api/energy/IStrictEnergyStorage.java similarity index 100% rename from src/main/java/mekanism/api/energy/IStrictEnergyStorage.java rename to src/api/java/mekanism/api/energy/IStrictEnergyStorage.java diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/api/java/mekanism/api/energy/package-info.java similarity index 100% rename from src/main/java/mekanism/api/energy/package-info.java rename to src/api/java/mekanism/api/energy/package-info.java diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/api/java/mekanism/api/gas/Gas.java similarity index 100% rename from src/main/java/mekanism/api/gas/Gas.java rename to src/api/java/mekanism/api/gas/Gas.java diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/api/java/mekanism/api/gas/GasNetwork.java similarity index 100% rename from src/main/java/mekanism/api/gas/GasNetwork.java rename to src/api/java/mekanism/api/gas/GasNetwork.java diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/api/java/mekanism/api/gas/GasRegistry.java similarity index 100% rename from src/main/java/mekanism/api/gas/GasRegistry.java rename to src/api/java/mekanism/api/gas/GasRegistry.java diff --git a/src/main/java/mekanism/api/gas/GasStack.java b/src/api/java/mekanism/api/gas/GasStack.java similarity index 100% rename from src/main/java/mekanism/api/gas/GasStack.java rename to src/api/java/mekanism/api/gas/GasStack.java diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/api/java/mekanism/api/gas/GasTank.java similarity index 100% rename from src/main/java/mekanism/api/gas/GasTank.java rename to src/api/java/mekanism/api/gas/GasTank.java diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/api/java/mekanism/api/gas/GasTransmission.java similarity index 100% rename from src/main/java/mekanism/api/gas/GasTransmission.java rename to src/api/java/mekanism/api/gas/GasTransmission.java diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/api/java/mekanism/api/gas/IGasHandler.java similarity index 100% rename from src/main/java/mekanism/api/gas/IGasHandler.java rename to src/api/java/mekanism/api/gas/IGasHandler.java diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/api/java/mekanism/api/gas/IGasItem.java similarity index 100% rename from src/main/java/mekanism/api/gas/IGasItem.java rename to src/api/java/mekanism/api/gas/IGasItem.java diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/api/java/mekanism/api/gas/IGasTransmitter.java similarity index 100% rename from src/main/java/mekanism/api/gas/IGasTransmitter.java rename to src/api/java/mekanism/api/gas/IGasTransmitter.java diff --git a/src/main/java/mekanism/api/gas/ITubeConnection.java b/src/api/java/mekanism/api/gas/ITubeConnection.java similarity index 100% rename from src/main/java/mekanism/api/gas/ITubeConnection.java rename to src/api/java/mekanism/api/gas/ITubeConnection.java diff --git a/src/main/java/mekanism/api/gas/OreGas.java b/src/api/java/mekanism/api/gas/OreGas.java similarity index 100% rename from src/main/java/mekanism/api/gas/OreGas.java rename to src/api/java/mekanism/api/gas/OreGas.java diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/api/java/mekanism/api/gas/package-info.java similarity index 100% rename from src/main/java/mekanism/api/gas/package-info.java rename to src/api/java/mekanism/api/gas/package-info.java diff --git a/src/main/java/mekanism/api/infuse/InfuseObject.java b/src/api/java/mekanism/api/infuse/InfuseObject.java similarity index 100% rename from src/main/java/mekanism/api/infuse/InfuseObject.java rename to src/api/java/mekanism/api/infuse/InfuseObject.java diff --git a/src/main/java/mekanism/api/infuse/InfuseRegistry.java b/src/api/java/mekanism/api/infuse/InfuseRegistry.java similarity index 100% rename from src/main/java/mekanism/api/infuse/InfuseRegistry.java rename to src/api/java/mekanism/api/infuse/InfuseRegistry.java diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/api/java/mekanism/api/infuse/InfuseType.java similarity index 100% rename from src/main/java/mekanism/api/infuse/InfuseType.java rename to src/api/java/mekanism/api/infuse/InfuseType.java diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/api/java/mekanism/api/infuse/package-info.java similarity index 100% rename from src/main/java/mekanism/api/infuse/package-info.java rename to src/api/java/mekanism/api/infuse/package-info.java diff --git a/src/main/java/mekanism/api/lasers/ILaserReceptor.java b/src/api/java/mekanism/api/lasers/ILaserReceptor.java similarity index 100% rename from src/main/java/mekanism/api/lasers/ILaserReceptor.java rename to src/api/java/mekanism/api/lasers/ILaserReceptor.java diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/api/java/mekanism/api/lasers/package-info.java similarity index 100% rename from src/main/java/mekanism/api/lasers/package-info.java rename to src/api/java/mekanism/api/lasers/package-info.java diff --git a/src/main/java/mekanism/api/package-info.java b/src/api/java/mekanism/api/package-info.java similarity index 100% rename from src/main/java/mekanism/api/package-info.java rename to src/api/java/mekanism/api/package-info.java diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/api/java/mekanism/api/reactor/IFusionReactor.java similarity index 100% rename from src/main/java/mekanism/api/reactor/IFusionReactor.java rename to src/api/java/mekanism/api/reactor/IFusionReactor.java diff --git a/src/main/java/mekanism/api/reactor/INeutronCapture.java b/src/api/java/mekanism/api/reactor/INeutronCapture.java similarity index 100% rename from src/main/java/mekanism/api/reactor/INeutronCapture.java rename to src/api/java/mekanism/api/reactor/INeutronCapture.java diff --git a/src/main/java/mekanism/api/reactor/IReactorBlock.java b/src/api/java/mekanism/api/reactor/IReactorBlock.java similarity index 100% rename from src/main/java/mekanism/api/reactor/IReactorBlock.java rename to src/api/java/mekanism/api/reactor/IReactorBlock.java diff --git a/src/main/java/mekanism/api/reactor/package-info.java b/src/api/java/mekanism/api/reactor/package-info.java similarity index 100% rename from src/main/java/mekanism/api/reactor/package-info.java rename to src/api/java/mekanism/api/reactor/package-info.java diff --git a/src/main/java/mekanism/api/recipe/RecipeHelper.java b/src/api/java/mekanism/api/recipe/RecipeHelper.java similarity index 100% rename from src/main/java/mekanism/api/recipe/RecipeHelper.java rename to src/api/java/mekanism/api/recipe/RecipeHelper.java diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/api/java/mekanism/api/recipe/package-info.java similarity index 100% rename from src/main/java/mekanism/api/recipe/package-info.java rename to src/api/java/mekanism/api/recipe/package-info.java diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/api/java/mekanism/api/transmitters/DynamicNetwork.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/DynamicNetwork.java rename to src/api/java/mekanism/api/transmitters/DynamicNetwork.java diff --git a/src/main/java/mekanism/api/transmitters/IBlockableConnection.java b/src/api/java/mekanism/api/transmitters/IBlockableConnection.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/IBlockableConnection.java rename to src/api/java/mekanism/api/transmitters/IBlockableConnection.java diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/api/java/mekanism/api/transmitters/IGridTransmitter.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/IGridTransmitter.java rename to src/api/java/mekanism/api/transmitters/IGridTransmitter.java diff --git a/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java b/src/api/java/mekanism/api/transmitters/INetworkDataHandler.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/INetworkDataHandler.java rename to src/api/java/mekanism/api/transmitters/INetworkDataHandler.java diff --git a/src/main/java/mekanism/api/transmitters/ITransmitter.java b/src/api/java/mekanism/api/transmitters/ITransmitter.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/ITransmitter.java rename to src/api/java/mekanism/api/transmitters/ITransmitter.java diff --git a/src/main/java/mekanism/api/transmitters/ITransmitterTile.java b/src/api/java/mekanism/api/transmitters/ITransmitterTile.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/ITransmitterTile.java rename to src/api/java/mekanism/api/transmitters/ITransmitterTile.java diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/api/java/mekanism/api/transmitters/TransmissionType.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/TransmissionType.java rename to src/api/java/mekanism/api/transmitters/TransmissionType.java diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java rename to src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/api/java/mekanism/api/transmitters/package-info.java similarity index 100% rename from src/main/java/mekanism/api/transmitters/package-info.java rename to src/api/java/mekanism/api/transmitters/package-info.java diff --git a/src/main/java/mekanism/api/util/BlockInfo.java b/src/api/java/mekanism/api/util/BlockInfo.java similarity index 100% rename from src/main/java/mekanism/api/util/BlockInfo.java rename to src/api/java/mekanism/api/util/BlockInfo.java diff --git a/src/main/java/mekanism/api/util/ItemInfo.java b/src/api/java/mekanism/api/util/ItemInfo.java similarity index 100% rename from src/main/java/mekanism/api/util/ItemInfo.java rename to src/api/java/mekanism/api/util/ItemInfo.java diff --git a/src/main/java/mekanism/api/util/ListUtils.java b/src/api/java/mekanism/api/util/ListUtils.java similarity index 100% rename from src/main/java/mekanism/api/util/ListUtils.java rename to src/api/java/mekanism/api/util/ListUtils.java diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/api/java/mekanism/api/util/StackUtils.java similarity index 100% rename from src/main/java/mekanism/api/util/StackUtils.java rename to src/api/java/mekanism/api/util/StackUtils.java diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/api/java/mekanism/api/util/UnitDisplayUtils.java similarity index 100% rename from src/main/java/mekanism/api/util/UnitDisplayUtils.java rename to src/api/java/mekanism/api/util/UnitDisplayUtils.java diff --git a/src/main/java/mekanism/api/util/package-info.java b/src/api/java/mekanism/api/util/package-info.java similarity index 100% rename from src/main/java/mekanism/api/util/package-info.java rename to src/api/java/mekanism/api/util/package-info.java diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index d1f6feaf..1deec907 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; +import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -30,11 +31,13 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas protected final Map externalRedstoneSignals = new HashMap(); protected boolean redstoneStateDirty = true; + @Method(modid = GasUtil.API_NAME) public IGasHandler getExternalHandler(ForgeDirection direction) { IGasHandler con = GasUtil.getExternalGasHandler(getBundle().getWorld(), getLocation().getLocation(direction)); return (con != null && !(con instanceof IConduitBundle)) ? con : null; } + @Method(modid = GasUtil.API_NAME) public IGasHandler getTankContainer(BlockCoord bc) { return GasUtil.getGasHandler(getBundle().getWorld(), bc); } diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java index fdf45fa4..4677c9c1 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java @@ -10,6 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -97,6 +98,7 @@ public abstract class AbstractGasTankConduit extends AbstractGasConduit { public abstract AbstractGasTankConduitNetwork getTankNetwork(); + @Method(modid = GasUtil.API_NAME) public void setGasType(GasStack gasType) { if(tank.getGas() != null && tank.getGas().isGasEqual(gasType)) { return; @@ -114,6 +116,7 @@ public abstract class AbstractGasTankConduit extends AbstractGasConduit { return tank; } + @Method(modid = GasUtil.API_NAME) public GasStack getGasType() { GasStack result = null; if(getTankNetwork() != null) { diff --git a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java index 76d024ac..c7f49103 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java @@ -3,6 +3,7 @@ package crazypants.enderio.conduit.gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.Optional.Method; public class ConduitGasTank extends GasTank { @@ -55,6 +56,7 @@ public class ConduitGasTank extends GasTank { } @Override + @Method(modid = GasUtil.API_NAME) public int receive(GasStack resource, boolean doReceive) { if(resource == null || resource.getGas().getID() < 0) { return 0; @@ -95,6 +97,7 @@ public class ConduitGasTank extends GasTank { } @Override + @Method(modid = GasUtil.API_NAME) public GasStack draw(int maxDrain, boolean doDraw) { if(stored == null || stored.getGas().getID() < 0) { return null; diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java index 477ffb2b..6a7c7867 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -224,11 +225,13 @@ public class GasConduit extends AbstractGasTankConduit { @Override @Deprecated + @Method(modid = GasUtil.API_NAME) public int receiveGas(ForgeDirection side, GasStack stack) { return receiveGas(side, stack, true); } @Override + @Method(modid = GasUtil.API_NAME) public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { if(network == null || !getConnectionMode(side).acceptsInput()) { return 0; @@ -238,11 +241,13 @@ public class GasConduit extends AbstractGasTankConduit { @Override @Deprecated + @Method(modid = GasUtil.API_NAME) public GasStack drawGas(ForgeDirection side, int amount) { return drawGas(side, amount, true); } @Override + @Method(modid = GasUtil.API_NAME) public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { if(network == null || !getConnectionMode(side).acceptsOutput()) { return null; @@ -251,6 +256,7 @@ public class GasConduit extends AbstractGasTankConduit { } @Override + @Method(modid = GasUtil.API_NAME) public boolean canReceiveGas(ForgeDirection from, Gas gas) { if(network == null) { return false; @@ -259,6 +265,7 @@ public class GasConduit extends AbstractGasTankConduit { } @Override + @Method(modid = GasUtil.API_NAME) public boolean canDrawGas(ForgeDirection from, Gas gas) { if(network == null) { return false; diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index cdab812d..03829c7e 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -16,11 +16,13 @@ public final class GasUtil { private static boolean useCheckPerformed = false; private static boolean isGasConduitEnabled = false; + + public static final String API_NAME = "MekanismAPI|gas"; public static boolean isGasConduitEnabled() { if(!useCheckPerformed) { if(Config.isGasConduitEnabled) { - isGasConduitEnabled = ModAPIManager.INSTANCE.hasAPI("MekanismAPI|gas"); + isGasConduitEnabled = ModAPIManager.INSTANCE.hasAPI(API_NAME); } else { isGasConduitEnabled = false; } @@ -29,24 +31,24 @@ public final class GasUtil { return isGasConduitEnabled; } - @Method(modid = "MekanismAPI|gas") + @Method(modid = API_NAME) public static IGasHandler getExternalGasHandler(IBlockAccess world, BlockCoord bc) { IGasHandler con = getGasHandler(world, bc); return (con != null && !(con instanceof IConduitBundle)) ? con : null; } - @Method(modid = "MekanismAPI|gas") + @Method(modid = API_NAME) public static IGasHandler getGasHandler(IBlockAccess world, BlockCoord bc) { return getGasHandler(world, bc.x, bc.y, bc.z); } - @Method(modid = "MekanismAPI|gas") + @Method(modid = API_NAME) public static IGasHandler getGasHandler(IBlockAccess world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); return getGasHandler(te); } - @Method(modid = "MekanismAPI|gas") + @Method(modid = API_NAME) public static IGasHandler getGasHandler(TileEntity te) { if(te instanceof IGasHandler) { return (IGasHandler) te; @@ -54,7 +56,7 @@ public final class GasUtil { return null; } - @Method(modid = "MekanismAPI|gas") + @Method(modid = API_NAME) public static boolean isGasValid(GasStack gas) { if(gas != null) { String name = gas.getGas().getLocalizedName(); diff --git a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java index ad992a9f..65b8134a 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java @@ -2,9 +2,11 @@ package crazypants.enderio.conduit.gas; import mekanism.api.gas.IGasHandler; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional.Interface; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; +@Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME) public interface IGasConduit extends IConduit, IGasHandler, IExtractor { boolean canOutputToDir(ForgeDirection dir);