reformatted all src files (#141)
This commit is contained in:
@@ -19,6 +19,10 @@
|
||||
package appeng.capabilities;
|
||||
|
||||
|
||||
import appeng.api.storage.ISpatialDimension;
|
||||
import appeng.api.storage.IStorageMonitorableAccessor;
|
||||
import appeng.integration.IntegrationRegistry;
|
||||
import appeng.integration.IntegrationType;
|
||||
import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
|
||||
import gregtech.api.capability.IEnergyContainer;
|
||||
import net.darkhax.tesla.api.ITeslaConsumer;
|
||||
@@ -30,112 +34,90 @@ import net.minecraftforge.common.capabilities.CapabilityInject;
|
||||
import net.minecraftforge.common.capabilities.CapabilityManager;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
|
||||
import appeng.api.storage.ISpatialDimension;
|
||||
import appeng.api.storage.IStorageMonitorableAccessor;
|
||||
import appeng.integration.IntegrationRegistry;
|
||||
import appeng.integration.IntegrationType;
|
||||
|
||||
|
||||
/**
|
||||
* Utility class that holds various capabilities, both by AE2 and other Mods.
|
||||
*/
|
||||
public final class Capabilities
|
||||
{
|
||||
public final class Capabilities {
|
||||
|
||||
private Capabilities()
|
||||
{
|
||||
}
|
||||
private Capabilities() {
|
||||
}
|
||||
|
||||
public static Capability<IStorageMonitorableAccessor> STORAGE_MONITORABLE_ACCESSOR;
|
||||
public static Capability<IStorageMonitorableAccessor> STORAGE_MONITORABLE_ACCESSOR;
|
||||
|
||||
public static Capability<ISpatialDimension> SPATIAL_DIMENSION;
|
||||
public static Capability<ISpatialDimension> SPATIAL_DIMENSION;
|
||||
|
||||
public static Capability<ITeslaConsumer> TESLA_CONSUMER;
|
||||
public static Capability<ITeslaConsumer> TESLA_CONSUMER;
|
||||
|
||||
public static Capability<ITeslaHolder> TESLA_HOLDER;
|
||||
public static Capability<ITeslaHolder> TESLA_HOLDER;
|
||||
|
||||
public static Capability<IEnergyStorage> FORGE_ENERGY;
|
||||
public static Capability<IEnergyStorage> FORGE_ENERGY;
|
||||
|
||||
public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
|
||||
public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
|
||||
|
||||
public static Capability<IEnergyContainer> GTCE_ENERGY;
|
||||
public static Capability<IEnergyContainer> GTCE_ENERGY;
|
||||
|
||||
/**
|
||||
* Register AE2 provided capabilities.
|
||||
*/
|
||||
public static void register()
|
||||
{
|
||||
CapabilityManager.INSTANCE.register( IStorageMonitorableAccessor.class, createNullStorage(), NullMENetworkAccessor::new );
|
||||
CapabilityManager.INSTANCE.register( ISpatialDimension.class, createNullStorage(), NullSpatialDimension::new );
|
||||
}
|
||||
/**
|
||||
* Register AE2 provided capabilities.
|
||||
*/
|
||||
public static void register() {
|
||||
CapabilityManager.INSTANCE.register(IStorageMonitorableAccessor.class, createNullStorage(), NullMENetworkAccessor::new);
|
||||
CapabilityManager.INSTANCE.register(ISpatialDimension.class, createNullStorage(), NullSpatialDimension::new);
|
||||
}
|
||||
|
||||
@CapabilityInject( IStorageMonitorableAccessor.class )
|
||||
private static void capIStorageMonitorableAccessorRegistered( Capability<IStorageMonitorableAccessor> cap )
|
||||
{
|
||||
STORAGE_MONITORABLE_ACCESSOR = cap;
|
||||
}
|
||||
@CapabilityInject(IStorageMonitorableAccessor.class)
|
||||
private static void capIStorageMonitorableAccessorRegistered(Capability<IStorageMonitorableAccessor> cap) {
|
||||
STORAGE_MONITORABLE_ACCESSOR = cap;
|
||||
}
|
||||
|
||||
@CapabilityInject( ISpatialDimension.class )
|
||||
private static void capISpatialDimensionRegistered( Capability<ISpatialDimension> cap )
|
||||
{
|
||||
SPATIAL_DIMENSION = cap;
|
||||
}
|
||||
@CapabilityInject(ISpatialDimension.class)
|
||||
private static void capISpatialDimensionRegistered(Capability<ISpatialDimension> cap) {
|
||||
SPATIAL_DIMENSION = cap;
|
||||
}
|
||||
|
||||
@CapabilityInject( ITeslaConsumer.class )
|
||||
private static void capITeslaConsumerRegistered( Capability<ITeslaConsumer> cap )
|
||||
{
|
||||
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
|
||||
{
|
||||
TESLA_CONSUMER = cap;
|
||||
}
|
||||
}
|
||||
@CapabilityInject(ITeslaConsumer.class)
|
||||
private static void capITeslaConsumerRegistered(Capability<ITeslaConsumer> cap) {
|
||||
if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.TESLA)) {
|
||||
TESLA_CONSUMER = cap;
|
||||
}
|
||||
}
|
||||
|
||||
@CapabilityInject( ITeslaHolder.class )
|
||||
private static void capITeslaHolderRegistered( Capability<ITeslaHolder> cap )
|
||||
{
|
||||
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
|
||||
{
|
||||
TESLA_HOLDER = cap;
|
||||
}
|
||||
}
|
||||
@CapabilityInject(ITeslaHolder.class)
|
||||
private static void capITeslaHolderRegistered(Capability<ITeslaHolder> cap) {
|
||||
if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.TESLA)) {
|
||||
TESLA_HOLDER = cap;
|
||||
}
|
||||
}
|
||||
|
||||
@CapabilityInject( IEnergyStorage.class )
|
||||
private static void capIEnergyStorageRegistered( Capability<IEnergyStorage> cap )
|
||||
{
|
||||
FORGE_ENERGY = cap;
|
||||
}
|
||||
@CapabilityInject(IEnergyStorage.class)
|
||||
private static void capIEnergyStorageRegistered(Capability<IEnergyStorage> cap) {
|
||||
FORGE_ENERGY = cap;
|
||||
}
|
||||
|
||||
@CapabilityInject( IItemRepository.class )
|
||||
private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap )
|
||||
{
|
||||
ITEM_REPOSITORY_CAPABILITY = cap;
|
||||
}
|
||||
@CapabilityInject(IItemRepository.class)
|
||||
private static void capIItemRepositoryRegistered(Capability<IItemRepository> cap) {
|
||||
ITEM_REPOSITORY_CAPABILITY = cap;
|
||||
}
|
||||
|
||||
@CapabilityInject( IEnergyContainer.class )
|
||||
private static void capIEnergyContainerRegistered( Capability<IEnergyContainer> cap )
|
||||
{
|
||||
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.GTCE ) )
|
||||
{
|
||||
GTCE_ENERGY = cap;
|
||||
}
|
||||
}
|
||||
@CapabilityInject(IEnergyContainer.class)
|
||||
private static void capIEnergyContainerRegistered(Capability<IEnergyContainer> cap) {
|
||||
if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.GTCE)) {
|
||||
GTCE_ENERGY = cap;
|
||||
}
|
||||
}
|
||||
|
||||
// Create a storage implementation that does not do anything
|
||||
private static <T> Capability.IStorage<T> createNullStorage()
|
||||
{
|
||||
return new Capability.IStorage<T>()
|
||||
{
|
||||
@Override
|
||||
public NBTBase writeNBT( Capability<T> capability, T instance, EnumFacing side )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
// Create a storage implementation that does not do anything
|
||||
private static <T> Capability.IStorage<T> createNullStorage() {
|
||||
return new Capability.IStorage<T>() {
|
||||
@Override
|
||||
public NBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readNBT( Capability<T> capability, T instance, EnumFacing side, NBTBase nbt )
|
||||
{
|
||||
@Override
|
||||
public void readNBT(Capability<T> capability, T instance, EnumFacing side, NBTBase nbt) {
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,13 +24,11 @@ import appeng.api.storage.IStorageMonitorable;
|
||||
import appeng.api.storage.IStorageMonitorableAccessor;
|
||||
|
||||
|
||||
class NullMENetworkAccessor implements IStorageMonitorableAccessor
|
||||
{
|
||||
class NullMENetworkAccessor implements IStorageMonitorableAccessor {
|
||||
|
||||
@Override
|
||||
public IStorageMonitorable getInventory( IActionSource src )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public IStorageMonitorable getInventory(IActionSource src) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,52 +19,43 @@
|
||||
package appeng.capabilities;
|
||||
|
||||
|
||||
import appeng.api.storage.ISpatialDimension;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import appeng.api.storage.ISpatialDimension;
|
||||
|
||||
class NullSpatialDimension implements ISpatialDimension {
|
||||
@Override
|
||||
public int createNewCellDimension(BlockPos size, int owner) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
class NullSpatialDimension implements ISpatialDimension
|
||||
{
|
||||
@Override
|
||||
public int createNewCellDimension( BlockPos size, int owner )
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
@Override
|
||||
public void deleteCellDimension(int cellStorageId) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteCellDimension( int cellStorageId )
|
||||
{
|
||||
}
|
||||
@Override
|
||||
public int getCellDimensionOwner(int cellStorageId) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCellDimensionOwner( int cellStorageId )
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
@Override
|
||||
public BlockPos getCellDimensionOrigin(int cellStorageId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPos getCellDimensionOrigin( int cellStorageId )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public World getWorld() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getWorld()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public boolean isCellDimension(int cellDimID) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCellDimension( int cellDimID )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPos getCellContentSize( int cellDimId )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public BlockPos getCellContentSize(int cellDimId) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user