From fa24e0e780767882f2535fd90558916ca767ff19 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 28 May 2016 19:14:18 -0700 Subject: [PATCH] Isolate MDK, update build script. Gonna try to get this pushing to the dev server --- build.gradle | 6 +-- build.properties | 6 +-- etc/core/dependancies.info | 8 +-- .../capabilities/Capabilities.java | 33 +----------- .../capabilities/DefaultAlloyInteraction.java | 4 +- .../DefaultBlockableConnection.java | 4 +- .../capabilities/DefaultCableOutputter.java | 4 +- .../capabilities/DefaultConfigCardAccess.java | 4 +- .../capabilities/DefaultConfigurable.java | 4 +- .../capabilities/DefaultEvaporationSolar.java | 4 +- .../capabilities/DefaultGasHandler.java | 4 +- .../capabilities/DefaultGridTransmitter.java | 4 +- .../capabilities/DefaultHeatTransfer.java | 4 +- .../capabilities/DefaultLaserReceptor.java | 4 +- .../DefaultSpecialConfigData.java | 4 +- .../capabilities/DefaultStorageHelper.java | 2 +- .../DefaultStrictEnergyAcceptor.java | 4 +- .../DefaultStrictEnergyStorage.java | 4 +- .../capabilities/DefaultTubeConnection.java | 4 +- .../java/mekanism/api/gas/GasNetwork.java | 2 +- .../mekanism/api/gas/GasTransmission.java | 2 +- .../java/mekanism/common/HeatNetwork.java | 2 +- .../java/mekanism/common/LaserManager.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../common/base/EnergyAcceptorWrapper.java | 2 +- .../common/capabilities/BaseCapabilities.java | 52 +++++++++++++++++++ .../DefaultLogisticalTransporter.java | 3 +- .../capabilities/DefaultTileNetwork.java | 3 +- .../transporter/TransporterPathfinder.java | 14 ++--- .../content/transporter/TransporterStack.java | 7 +-- .../java/mekanism/common/item/ItemAlloy.java | 2 +- .../common/item/ItemConfigurationCard.java | 2 +- .../common/item/ItemConfigurator.java | 2 +- .../common/item/ItemNetworkReader.java | 2 +- .../multipart/MultipartTransmitter.java | 2 +- .../multipart/MultipartTransporter.java | 4 +- .../multipart/PartLogisticalTransporter.java | 8 +-- .../common/multipart/PartPressurizedTube.java | 2 +- .../common/multipart/PartSidedPipe.java | 7 +-- .../multipart/PartThermodynamicConductor.java | 2 +- .../common/multipart/PartTransmitter.java | 2 +- .../common/multipart/PartUniversalCable.java | 2 +- .../network/PacketConfigurationUpdate.java | 4 +- .../common/network/PacketDataRequest.java | 7 +-- .../common/network/PacketTileEntity.java | 6 +-- .../network/PacketTransmitterUpdate.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 2 +- .../TileEntityAdvancedElectricMachine.java | 2 +- .../common/tile/TileEntityBasicBlock.java | 6 +-- .../common/tile/TileEntityBasicMachine.java | 2 +- .../mekanism/common/tile/TileEntityBin.java | 6 +-- .../common/tile/TileEntityBoilerCasing.java | 2 +- .../common/tile/TileEntityBoundingBlock.java | 6 +-- .../tile/TileEntityChemicalCrystallizer.java | 2 +- .../TileEntityChemicalDissolutionChamber.java | 2 +- .../tile/TileEntityChemicalInfuser.java | 2 +- .../tile/TileEntityChemicalOxidizer.java | 2 +- .../common/tile/TileEntityChemicalWasher.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 7 +-- .../common/tile/TileEntityElectricBlock.java | 2 +- .../common/tile/TileEntityElectricPump.java | 2 +- .../tile/TileEntityElectrolyticSeparator.java | 2 +- .../common/tile/TileEntityFactory.java | 2 +- .../common/tile/TileEntityFluidTank.java | 2 +- .../tile/TileEntityFluidicPlenisher.java | 2 +- .../TileEntityFormulaicAssemblicator.java | 2 +- .../common/tile/TileEntityFuelwoodHeater.java | 2 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityInductionCasing.java | 2 +- .../common/tile/TileEntityInductionCell.java | 2 +- .../common/tile/TileEntityInductionPort.java | 2 +- .../common/tile/TileEntityLaserAmplifier.java | 2 +- .../tile/TileEntityLaserTractorBeam.java | 2 +- .../tile/TileEntityLogisticalSorter.java | 9 ++-- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../tile/TileEntityOredictionificator.java | 2 +- .../mekanism/common/tile/TileEntityPRC.java | 2 +- .../tile/TileEntityQuantumEntangloporter.java | 2 +- .../tile/TileEntityResistiveHeater.java | 2 +- .../tile/TileEntityRotaryCondensentrator.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 2 +- ...ileEntityThermalEvaporationController.java | 2 +- .../TileEntityThermalEvaporationValve.java | 2 +- .../tile/component/TileComponentEjector.java | 8 +-- .../java/mekanism/common/util/CableUtils.java | 2 +- .../java/mekanism/common/util/HeatUtils.java | 2 +- .../java/mekanism/common/util/PipeUtils.java | 2 +- .../common/util/TransporterUtils.java | 2 +- .../TileEntityAdvancedSolarGenerator.java | 2 +- .../common/tile/TileEntityGasGenerator.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 2 +- .../TileEntityReactorLaserFocusMatrix.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 2 +- 93 files changed, 203 insertions(+), 181 deletions(-) rename src/main/java/mekanism/{common => api}/capabilities/Capabilities.java (69%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultAlloyInteraction.java (84%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultBlockableConnection.java (83%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultCableOutputter.java (82%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultConfigCardAccess.java (76%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultConfigurable.java (88%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultEvaporationSolar.java (79%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultGasHandler.java (88%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultGridTransmitter.java (96%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultHeatTransfer.java (89%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultLaserReceptor.java (83%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultSpecialConfigData.java (86%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultStorageHelper.java (97%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultStrictEnergyAcceptor.java (92%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultStrictEnergyStorage.java (92%) rename src/main/java/mekanism/{common => api}/capabilities/DefaultTubeConnection.java (80%) create mode 100644 src/main/java/mekanism/common/capabilities/BaseCapabilities.java diff --git a/build.gradle b/build.gradle index c51d1d5bc..2b851a521 100644 --- a/build.gradle +++ b/build.gradle @@ -29,10 +29,6 @@ idea { apply plugin: 'net.minecraftforge.gradle.forge' repositories { - maven { - name 'CB Maven FS' - url "http://chickenbones.net/maven/" - } maven { name 'ForgeFS' url 'http://files.minecraftforge.net/maven' @@ -73,7 +69,7 @@ minecraft { dependencies { deobfCompile "MCMultiPart:MCMultiPart-experimental:${config.mcmp_version}:universal" - deobfCompile "mezz.jei:jei_1.8.9:2.28.18.186" + deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}" } processResources diff --git a/build.properties b/build.properties index 920b19044..c544dc6f8 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,6 @@ minecraft_version=1.8.9 mappings_version=stable_22 forge_version=12.17.0.1919-1.9.4 -mcmp_version=1.0.9_47 -CCLIB_version=1.1.3.136 -NEI_version=1.0.4.101 -CCC_version=1.0.6.39 +mcmp_version=1.2.0_72 +jei_version=3.4.0.204 mod_version=9.0.2 diff --git a/etc/core/dependancies.info b/etc/core/dependancies.info index a0009f1b9..b5402f372 100755 --- a/etc/core/dependancies.info +++ b/etc/core/dependancies.info @@ -1,6 +1,6 @@ { - "repo": "http://files.minecraftforge.net/maven/codechicken/ForgeMultipart/${mc_version}-${fmp_version}/", - "file": "ForgeMultipart-${mc_version}-${fmp_version}-universal.jar", - "dev": "ForgeMultipart-${mc_version}-${fmp_version}-dev.jar", - "class": "codechicken.multipart.MultipartMod" + "repo": "http://maven.amadornes.com/MCMultiPart/MCMultiPart-experimental/${mcmp_version}/", + "file": "MCMultiPart-experimental-${mcmp_version}-universal.jar", + "dev": "MCMultiPart-experimental-${mcmp_version}-deobf.jar", + "class": "mcmultipart.MCMultiPartMod" } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/api/capabilities/Capabilities.java similarity index 69% rename from src/main/java/mekanism/common/capabilities/Capabilities.java rename to src/main/java/mekanism/api/capabilities/Capabilities.java index f095cc746..5cf75acb6 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/api/capabilities/Capabilities.java @@ -1,4 +1,4 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IAlloyInteraction; import mekanism.api.IConfigCardAccess; @@ -14,8 +14,6 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.lasers.ILaserReceptor; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITileNetwork; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; @@ -48,15 +46,9 @@ public class Capabilities @CapabilityInject(IGridTransmitter.class) public static Capability GRID_TRANSMITTER_CAPABILITY = null; - @CapabilityInject(ILogisticalTransporter.class) - public static Capability LOGISTICAL_TRANSPORTER_CAPABILITY = null; - @CapabilityInject(IAlloyInteraction.class) public static Capability ALLOY_INTERACTION_CAPABILITY = null; - @CapabilityInject(ITileNetwork.class) - public static Capability TILE_NETWORK_CAPABILITY = null; - @CapabilityInject(ITubeConnection.class) public static Capability TUBE_CONNECTION_CAPABILITY = null; @@ -71,27 +63,4 @@ public class Capabilities @CapabilityInject(ILaserReceptor.class) public static Capability LASER_RECEPTOR_CAPABILITY = null; - - public static void registerCapabilities() - { - DefaultStrictEnergyStorage.register(); - DefaultStrictEnergyAcceptor.register(); - DefaultCableOutputter.register(); - - DefaultGridTransmitter.register(); - DefaultLogisticalTransporter.register(); - DefaultBlockableConnection.register(); - - DefaultGasHandler.register(); - DefaultTubeConnection.register(); - - DefaultConfigurable.register(); - DefaultTileNetwork.register(); - DefaultAlloyInteraction.register(); - DefaultHeatTransfer.register(); - DefaultConfigCardAccess.register(); - DefaultSpecialConfigData.register(); - DefaultEvaporationSolar.register(); - DefaultLaserReceptor.register(); - } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java b/src/main/java/mekanism/api/capabilities/DefaultAlloyInteraction.java similarity index 84% rename from src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java rename to src/main/java/mekanism/api/capabilities/DefaultAlloyInteraction.java index d7c1c24bf..f98c84432 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java +++ b/src/main/java/mekanism/api/capabilities/DefaultAlloyInteraction.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IAlloyInteraction; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; diff --git a/src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java b/src/main/java/mekanism/api/capabilities/DefaultBlockableConnection.java similarity index 83% rename from src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java rename to src/main/java/mekanism/api/capabilities/DefaultBlockableConnection.java index e3b446541..aebbb5d7e 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java +++ b/src/main/java/mekanism/api/capabilities/DefaultBlockableConnection.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.transmitters.IBlockableConnection; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java b/src/main/java/mekanism/api/capabilities/DefaultCableOutputter.java similarity index 82% rename from src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java rename to src/main/java/mekanism/api/capabilities/DefaultCableOutputter.java index 6f12aa92b..785919943 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java +++ b/src/main/java/mekanism/api/capabilities/DefaultCableOutputter.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.energy.ICableOutputter; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java b/src/main/java/mekanism/api/capabilities/DefaultConfigCardAccess.java similarity index 76% rename from src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java rename to src/main/java/mekanism/api/capabilities/DefaultConfigCardAccess.java index 94d9f4716..97e53aa6c 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java +++ b/src/main/java/mekanism/api/capabilities/DefaultConfigCardAccess.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IConfigCardAccess; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; public class DefaultConfigCardAccess implements IConfigCardAccess diff --git a/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java b/src/main/java/mekanism/api/capabilities/DefaultConfigurable.java similarity index 88% rename from src/main/java/mekanism/common/capabilities/DefaultConfigurable.java rename to src/main/java/mekanism/api/capabilities/DefaultConfigurable.java index 8e066098d..99018f830 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java +++ b/src/main/java/mekanism/api/capabilities/DefaultConfigurable.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IConfigurable; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java b/src/main/java/mekanism/api/capabilities/DefaultEvaporationSolar.java similarity index 79% rename from src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java rename to src/main/java/mekanism/api/capabilities/DefaultEvaporationSolar.java index 80561ad31..eea8f4f02 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java +++ b/src/main/java/mekanism/api/capabilities/DefaultEvaporationSolar.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IEvaporationSolar; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; public class DefaultEvaporationSolar implements IEvaporationSolar diff --git a/src/main/java/mekanism/common/capabilities/DefaultGasHandler.java b/src/main/java/mekanism/api/capabilities/DefaultGasHandler.java similarity index 88% rename from src/main/java/mekanism/common/capabilities/DefaultGasHandler.java rename to src/main/java/mekanism/api/capabilities/DefaultGasHandler.java index 8b1e08cd6..16e9ed816 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultGasHandler.java +++ b/src/main/java/mekanism/api/capabilities/DefaultGasHandler.java @@ -1,9 +1,9 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java b/src/main/java/mekanism/api/capabilities/DefaultGridTransmitter.java similarity index 96% rename from src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java rename to src/main/java/mekanism/api/capabilities/DefaultGridTransmitter.java index 05011626a..5ec6a5356 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java +++ b/src/main/java/mekanism/api/capabilities/DefaultGridTransmitter.java @@ -1,12 +1,12 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import java.util.Collection; import mekanism.api.Coord4D; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java b/src/main/java/mekanism/api/capabilities/DefaultHeatTransfer.java similarity index 89% rename from src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java rename to src/main/java/mekanism/api/capabilities/DefaultHeatTransfer.java index 646c410bc..1b5c25d73 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java +++ b/src/main/java/mekanism/api/capabilities/DefaultHeatTransfer.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IHeatTransfer; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java b/src/main/java/mekanism/api/capabilities/DefaultLaserReceptor.java similarity index 83% rename from src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java rename to src/main/java/mekanism/api/capabilities/DefaultLaserReceptor.java index a0fe1024f..31104a656 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java +++ b/src/main/java/mekanism/api/capabilities/DefaultLaserReceptor.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.lasers.ILaserReceptor; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java b/src/main/java/mekanism/api/capabilities/DefaultSpecialConfigData.java similarity index 86% rename from src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java rename to src/main/java/mekanism/api/capabilities/DefaultSpecialConfigData.java index 870d21d0b..b74d316c5 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java +++ b/src/main/java/mekanism/api/capabilities/DefaultSpecialConfigData.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import mekanism.api.IConfigCardAccess.ISpecialConfigData; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java b/src/main/java/mekanism/api/capabilities/DefaultStorageHelper.java similarity index 97% rename from src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java rename to src/main/java/mekanism/api/capabilities/DefaultStorageHelper.java index 3dd961263..0240a9f6f 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java +++ b/src/main/java/mekanism/api/capabilities/DefaultStorageHelper.java @@ -1,4 +1,4 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java b/src/main/java/mekanism/api/capabilities/DefaultStrictEnergyAcceptor.java similarity index 92% rename from src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java rename to src/main/java/mekanism/api/capabilities/DefaultStrictEnergyAcceptor.java index 1b9d2bc06..d0820ca98 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java +++ b/src/main/java/mekanism/api/capabilities/DefaultStrictEnergyAcceptor.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.DefaultStorage; import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.common.capabilities.DefaultStorageHelper.DefaultStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java b/src/main/java/mekanism/api/capabilities/DefaultStrictEnergyStorage.java similarity index 92% rename from src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java rename to src/main/java/mekanism/api/capabilities/DefaultStrictEnergyStorage.java index d1c9bb4a7..e1d45da1d 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java +++ b/src/main/java/mekanism/api/capabilities/DefaultStrictEnergyStorage.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.DefaultStorage; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.common.capabilities.DefaultStorageHelper.DefaultStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.util.INBTSerializable; diff --git a/src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java b/src/main/java/mekanism/api/capabilities/DefaultTubeConnection.java similarity index 80% rename from src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java rename to src/main/java/mekanism/api/capabilities/DefaultTubeConnection.java index 09318780c..5c9d56f8a 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java +++ b/src/main/java/mekanism/api/capabilities/DefaultTubeConnection.java @@ -1,7 +1,7 @@ -package mekanism.common.capabilities; +package mekanism.api.capabilities; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.gas.ITubeConnection; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index b2da2acaa..99fb8edfb 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -8,10 +8,10 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index 677edd682..591a32f67 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -6,8 +6,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index e630389f5..d1f233c2c 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.Set; import mekanism.api.IHeatTransfer; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; -import mekanism.common.capabilities.Capabilities; import mekanism.common.multipart.MultipartTransmitter; //import mekanism.common.multipart.MultipartTransmitter; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index e54619403..8987d4f55 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -5,9 +5,9 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.lasers.ILaserReceptor; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 233a32bf8..764226287 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -44,7 +44,7 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; @@ -1321,7 +1321,7 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("BIO", new ResourceLocation("mekanism:blocks/infuse/Bio")).setUnlocalizedName("bio")); InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", new ResourceLocation("mekanism:blocks/infuse/Obsidian")).setUnlocalizedName("obsidian")); - Capabilities.registerCapabilities(); + BaseCapabilities.registerCapabilities(); } @EventHandler diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 9489ed428..0ba046773 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -3,9 +3,9 @@ package mekanism.common.base; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/capabilities/BaseCapabilities.java b/src/main/java/mekanism/common/capabilities/BaseCapabilities.java new file mode 100644 index 000000000..ab057a93f --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/BaseCapabilities.java @@ -0,0 +1,52 @@ +package mekanism.common.capabilities; + +import mekanism.api.capabilities.DefaultAlloyInteraction; +import mekanism.api.capabilities.DefaultBlockableConnection; +import mekanism.api.capabilities.DefaultCableOutputter; +import mekanism.api.capabilities.DefaultConfigCardAccess; +import mekanism.api.capabilities.DefaultConfigurable; +import mekanism.api.capabilities.DefaultEvaporationSolar; +import mekanism.api.capabilities.DefaultGasHandler; +import mekanism.api.capabilities.DefaultGridTransmitter; +import mekanism.api.capabilities.DefaultHeatTransfer; +import mekanism.api.capabilities.DefaultLaserReceptor; +import mekanism.api.capabilities.DefaultSpecialConfigData; +import mekanism.api.capabilities.DefaultStrictEnergyAcceptor; +import mekanism.api.capabilities.DefaultStrictEnergyStorage; +import mekanism.api.capabilities.DefaultTubeConnection; +import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.ITileNetwork; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + +public class BaseCapabilities { + + @CapabilityInject(ILogisticalTransporter.class) + public static Capability LOGISTICAL_TRANSPORTER_CAPABILITY = null; + + @CapabilityInject(ITileNetwork.class) + public static Capability TILE_NETWORK_CAPABILITY = null; + + public static void registerCapabilities() + { + DefaultStrictEnergyStorage.register(); + DefaultStrictEnergyAcceptor.register(); + DefaultCableOutputter.register(); + + DefaultGridTransmitter.register(); + DefaultLogisticalTransporter.register(); + DefaultBlockableConnection.register(); + + DefaultGasHandler.register(); + DefaultTubeConnection.register(); + + DefaultConfigurable.register(); + DefaultTileNetwork.register(); + DefaultAlloyInteraction.register(); + DefaultHeatTransfer.register(); + DefaultConfigCardAccess.register(); + DefaultSpecialConfigData.register(); + DefaultEvaporationSolar.register(); + DefaultLaserReceptor.register(); + } +} diff --git a/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java index 9fe201f4f..806c6db1b 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java @@ -4,10 +4,11 @@ import java.util.Collection; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.capabilities.DefaultStorageHelper; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.api.transmitters.TransmissionType; import mekanism.common.InventoryNetwork; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java index 5cc824043..039963bdc 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java @@ -4,8 +4,9 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.capabilities.DefaultStorageHelper; +import mekanism.api.capabilities.DefaultStorageHelper.NullStorage; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; public class DefaultTileNetwork implements ITileNetwork diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 3c9561a44..a76f4e1d1 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -14,7 +14,7 @@ import mekanism.api.util.CapabilityUtils; import mekanism.common.InventoryNetwork; import mekanism.common.InventoryNetwork.AcceptorData; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.PathfinderCache.PathData; import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.content.transporter.TransporterStack.Path; @@ -73,7 +73,7 @@ public final class TransporterPathfinder return new Destination(ret, true, null, 0).setPathType(Path.NONE); } else { - Destination newPath = TransporterPathfinder.getNewBasePath(CapabilityUtils.getCapability(start.getTileEntity(worldObj), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); + Destination newPath = TransporterPathfinder.getNewBasePath(CapabilityUtils.getCapability(start.getTileEntity(worldObj), BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { @@ -189,9 +189,9 @@ public final class TransporterPathfinder { TileEntity tile = location.getTileEntity(world); - if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(CapabilityUtils.hasCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { - score += CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); + score += CapabilityUtils.getCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); } } @@ -271,12 +271,12 @@ public final class TransporterPathfinder { TileEntity tile = path.get(i).getTileEntity(world); - if(!CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(!CapabilityUtils.hasCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { return false; } - ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); if(transporter == null || (transporter.getColor() != null && transporter.getColor() != stack.color)) { @@ -474,7 +474,7 @@ public final class TransporterPathfinder if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction)) { TileEntity tile = neighbor.getTileEntity(worldObj); - double tentativeG = gScore.get(currentNode) + CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); + double tentativeG = gScore.get(currentNode) + CapabilityUtils.getCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); if(closedSet.contains(neighbor)) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index bd56f1931..cbbc8ff31 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -7,10 +7,11 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.TransporterUtils; @@ -313,12 +314,12 @@ public class TransporterStack public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) { - if(!(CapabilityUtils.hasCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) + if(!(CapabilityUtils.hasCapability(tileEntity, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) { return false; } - ILogisticalTransporter transporter = CapabilityUtils.getCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tileEntity, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); if(!CapabilityUtils.getCapability(tileEntity, Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite())) { diff --git a/src/main/java/mekanism/common/item/ItemAlloy.java b/src/main/java/mekanism/common/item/ItemAlloy.java index bd4b91fc6..2d46e82f5 100644 --- a/src/main/java/mekanism/common/item/ItemAlloy.java +++ b/src/main/java/mekanism/common/item/ItemAlloy.java @@ -1,9 +1,9 @@ package mekanism.common.item; import mekanism.api.IAlloyInteraction; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.MekanismItems; -import mekanism.common.capabilities.Capabilities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 01beffb13..0784c584a 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -4,11 +4,11 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; -import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index f8da02b68..30a0e87fc 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -10,12 +10,12 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.IMekWrench; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 4dc65f938..847ccab97 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -7,11 +7,11 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismAPI; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 14e1aa09e..5c9eaa83f 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -4,11 +4,11 @@ import java.util.Collection; import mcmultipart.multipart.IMultipartContainer; import mekanism.api.Coord4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/multipart/MultipartTransporter.java b/src/main/java/mekanism/common/multipart/MultipartTransporter.java index 9ce5f0bf0..ebbd3964e 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java @@ -11,7 +11,7 @@ import mekanism.common.HashList; import mekanism.common.InventoryNetwork; import mekanism.common.Mekanism; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.content.transporter.TransporterStack.Path; @@ -94,7 +94,7 @@ public class MultipartTransporter extends MultipartTransmitter capability, EnumFacing side) { - return capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY || super.hasCapability(capability, side); + return capability == BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY) + if(capability == BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY) { return (T)getTransmitter(); } diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index bf36c36c4..787ae8bfe 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -2,6 +2,7 @@ package mekanism.common.multipart; import java.util.Collection; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasStack; @@ -13,7 +14,6 @@ import mekanism.api.util.CapabilityUtils; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; -import mekanism.common.capabilities.Capabilities; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index a48217df6..269a1c62b 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -17,6 +17,7 @@ import mcmultipart.raytrace.RayTraceUtils.AdvancedRayTraceResultPart; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; @@ -24,7 +25,7 @@ import mekanism.api.util.CapabilityUtils; import mekanism.common.MekanismItems; import mekanism.common.Tier; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -927,14 +928,14 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY || + return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == BaseCapabilities.TILE_NETWORK_CAPABILITY || capability == Capabilities.BLOCKABLE_CONNECTION_CAPABILITY || super.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY + if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == BaseCapabilities.TILE_NETWORK_CAPABILITY || capability == Capabilities.BLOCKABLE_CONNECTION_CAPABILITY) { return (T)this; diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index 27e644666..0e8894132 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -8,6 +8,7 @@ import java.util.Collection; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.CapabilityUtils; import mekanism.common.ColourRGBA; @@ -16,7 +17,6 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.ConductorTier; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.HeatUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index bd2fcb707..6f9b8b3d7 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -7,11 +7,11 @@ import java.util.LinkedHashSet; import mekanism.api.Coord4D; import mekanism.api.IAlloyInteraction; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; -import mekanism.common.capabilities.Capabilities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 552be34a2..f86b86d53 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.EnergyStack; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; @@ -16,7 +17,6 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; import mekanism.common.base.EnergyAcceptorWrapper; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 16151288d..06b57e3d8 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -12,7 +12,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; @@ -32,7 +32,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), (EntityPlayerMP)player); } diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index eb8ab6da0..b4a5caafb 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; @@ -33,9 +33,9 @@ public class PacketTileEntity implements IMessageHandler capability, EnumFacing facing) { - return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); + return capability == BaseCapabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.TILE_NETWORK_CAPABILITY) + if(capability == BaseCapabilities.TILE_NETWORK_CAPABILITY) return (T)this; return super.getCapability(capability, facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 6adcecccd..2e77a4650 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Upgrade; @@ -16,7 +17,6 @@ import mekanism.common.base.IElectricMachine; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.inputs.MachineInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index c6ad97e92..7481134d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -14,7 +14,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -209,9 +209,9 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); - if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP)) + if(CapabilityUtils.hasCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP)) { - ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP); ItemStack rejects = TransporterUtils.insert(this, transporter, bottomStack, null, true, 0); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 03dc0c507..071a75e7f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -9,9 +9,9 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index b12d99c1d..a0ba09213 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.block.Block; @@ -127,13 +127,13 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); + return capability == BaseCapabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.TILE_NETWORK_CAPABILITY) + if(capability == BaseCapabilities.TILE_NETWORK_CAPABILITY) return (T)this; return super.getCapability(capability, facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index cab110150..123c29bae 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -10,6 +10,7 @@ import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -28,7 +29,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index f69dbf05b..3c2734dc0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -23,7 +24,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 35d8bd6cf..efb740f64 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -25,7 +26,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ChemicalPairInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index dd00a1921..7213ef41c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -22,7 +23,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index c41e19466..58b64a5b9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -26,7 +27,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index a696dbedf..ba704065d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -16,6 +16,7 @@ import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -26,7 +27,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MOreDictFilter; import mekanism.common.content.miner.MinerFilter; @@ -305,9 +306,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I getTopEject(true, remains); } - else if(CapabilityUtils.hasCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) + else if(CapabilityUtils.hasCapability(getEjectInv(), BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ItemStack rejected = TransporterUtils.insert(getEjectTile(), CapabilityUtils.getCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0); + ItemStack rejected = TransporterUtils.insert(getEjectTile(), CapabilityUtils.getCapability(getEjectInv(), BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0); if(TransporterManager.didEmit(getTopEject(false, null), rejected)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index a608fb8ea..27a1e5780 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -11,9 +11,9 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 7e075c8a1..82df88c4e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -15,12 +15,12 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; +import mekanism.api.capabilities.Capabilities; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 0fda9c735..f48d81e3b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -25,7 +26,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index b11d01b81..5dc3f3981 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -12,6 +12,7 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -39,7 +40,6 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.base.SoundWrapper; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index d91e92373..dd748f236 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -15,7 +16,6 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index ba8a78744..82fa1b931 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -12,12 +12,12 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; +import mekanism.api.capabilities.Capabilities; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index c47479508..b138f9854 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.usage; +import mekanism.api.capabilities.Capabilities; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.StackUtils; import mekanism.common.PacketHandler; @@ -16,7 +17,6 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 76a1bd0f3..15d6aa57f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -8,10 +8,10 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 51e5f6d7b..d90cf7406 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -20,7 +21,6 @@ import mekanism.common.SideData; import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index cd2c68bd2..1a9868bcc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -6,9 +6,9 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.matrix.MatrixCache; import mekanism.common.content.matrix.MatrixUpdateProtocol; import mekanism.common.content.matrix.SynchronizedMatrixData; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index 2387cd35a..e30b6dbd0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 41134b172..fbeb0aae1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -15,11 +15,11 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index d34f27abb..c7d81e3e6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.lasers.ILaserReceptor; @@ -13,7 +14,6 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 7c3852ee0..fa572e2f5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -7,12 +7,12 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.lasers.ILaserReceptor; import mekanism.api.util.StackUtils; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 30869ad53..6a25ead88 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -18,7 +19,7 @@ import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.StackSearcher; @@ -97,7 +98,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen TileEntity back = Coord4D.get(this).offset(facing.getOpposite()).getTileEntity(worldObj); TileEntity front = Coord4D.get(this).offset(facing).getTileEntity(worldObj); - if(back instanceof IInventory && (front != null && CapabilityUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) + if(back instanceof IInventory && (front != null && CapabilityUtils.hasCapability(front, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) { IInventory inventory = InventoryUtils.checkChestInv((IInventory)back); @@ -183,9 +184,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { ItemStack used = null; - if(CapabilityUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) + if(CapabilityUtils.hasCapability(front, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ILogisticalTransporter transporter = CapabilityUtils.getCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(front, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); if(!roundRobin) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 0524137bb..8924e66da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -10,6 +10,7 @@ import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.transmitters.TransmissionType; @@ -25,7 +26,6 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index e17350413..62524e83c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.api.capabilities.Capabilities; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -16,7 +17,6 @@ import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index b429b3715..bc5e9526f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -7,6 +7,7 @@ import java.util.Map; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -20,7 +21,6 @@ import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.item.ItemUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.PressurizedInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index aaa74f6d5..c7c629927 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; @@ -19,7 +20,6 @@ import mekanism.common.PacketHandler; import mekanism.common.SideData.IOState; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 7c080686a..e4587d517 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -9,11 +9,11 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 6a4b12c1b..29ef31c4b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -25,7 +26,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index fce1c354f..92c905a46 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -20,7 +21,6 @@ import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 1e3aefb80..7dff8c66b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -10,13 +10,13 @@ import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; import mekanism.common.base.ITankManager; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 89fb5a78d..f92ef5666 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.common.capabilities.Capabilities; +import mekanism.api.capabilities.Capabilities; import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 35053de53..33b2dbd69 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -18,7 +18,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; -import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.BaseCapabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; @@ -191,13 +191,13 @@ public class TileComponentEjector implements ITileComponent TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorld()); ItemStack prev = stack.copy(); - if(tile instanceof IInventory && !(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))) + if(tile instanceof IInventory && !(CapabilityUtils.hasCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))) { stack = InventoryUtils.putStackInInventory((IInventory)tile, stack, side, false); } - else if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())) + else if(CapabilityUtils.hasCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())) { - ItemStack rejects = TransporterUtils.insert(tileEntity, CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()), stack, outputColor, true, 0); + ItemStack rejects = TransporterUtils.insert(tileEntity, CapabilityUtils.getCapability(tile, BaseCapabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()), stack, outputColor, true, 0); if(TransporterManager.didEmit(stack, rejects)) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 95a5399a4..e33365d46 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -11,11 +11,11 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 968cc873c..7bb82f9ab 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -1,8 +1,8 @@ package mekanism.common.util; import mekanism.api.IHeatTransfer; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 1460570c2..8fc15e718 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index caa891e0b..f0b2b2ffa 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -4,10 +4,10 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.api.util.ListUtils; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 19263ebe8..47526e0c4 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -5,8 +5,8 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.generators; +import mekanism.api.capabilities.Capabilities; import mekanism.common.base.IBoundingBlock; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index f7191960e..8598b2d8e 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.MekanismConfig.general; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -16,7 +17,6 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.ChargeUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index a52165c7a..a3ee96b00 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -7,9 +7,9 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.generators; +import mekanism.api.capabilities.Capabilities; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.ISustainedData; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index c6bddd6f7..2d7750c0e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -1,7 +1,7 @@ package mekanism.generators.common.tile.reactor; +import mekanism.api.capabilities.Capabilities; import mekanism.api.lasers.ILaserReceptor; -import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index f9925e02f..5415b3990 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -4,6 +4,7 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.capabilities.Capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -11,7 +12,6 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.reactor.IReactorBlock; import mekanism.api.util.CapabilityUtils; -import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils;