fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pick 97420a31d The big reformat of 2020

Browse Source
This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/capabilities/Capabilities.java
+38 -49
View File
@@ -18,7 +18,6 @@
package appeng.capabilities;
import net.minecraft.nbt.INBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
@@ -29,66 +28,56 @@ import net.minecraftforge.energy.IEnergyStorage;
import appeng.api.storage.ISpatialDimension;
import appeng.api.storage.IStorageMonitorableAccessor;
/**
* 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<IEnergyStorage> FORGE_ENERGY;
public static Capability<IEnergyStorage> FORGE_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( 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;
}
// Create a storage implementation that does not do anything
private static <T> Capability.IStorage<T> createNullStorage()
{
return new Capability.IStorage<T>()
{
@Override
public INBT writeNBT( Capability<T> capability, T instance, Direction 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 INBT writeNBT(Capability<T> capability, T instance, Direction side) {
return null;
}
@Override
public void readNBT( Capability<T> capability, T instance, Direction side, INBT nbt )
{
@Override
public void readNBT(Capability<T> capability, T instance, Direction side, INBT nbt) {
}
};
}
}
};
}
}
src/main/java/appeng/capabilities/NullMENetworkAccessor.java
+5 -9
View File
@@ -18,19 +18,15 @@
package appeng.capabilities;
import appeng.api.networking.security.IActionSource;
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;
}
}
src/main/java/appeng/capabilities/NullSpatialDimension.java
+25 -33
View File
@@ -18,55 +18,47 @@
package appeng.capabilities;
import java.util.List;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import appeng.api.storage.ISpatialDimension;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.server.ServerWorld;
import java.util.List;
import appeng.api.storage.ISpatialDimension;
class NullSpatialDimension implements ISpatialDimension {
@Override
public DimensionType createNewCellDimension(BlockPos size) {
return null;
}
class NullSpatialDimension implements ISpatialDimension
{
@Override
public DimensionType createNewCellDimension(BlockPos size)
{
return null;
}
@Override
public void deleteCellDimension(DimensionType cellStorageId) {
}
@Override
public void deleteCellDimension( DimensionType cellStorageId )
{
}
@Override
public BlockPos getCellDimensionOrigin(DimensionType cellStorageId) {
return null;
}
@Override
public BlockPos getCellDimensionOrigin( DimensionType cellStorageId )
{
return null;
}
@Override
public BlockPos getCellDimensionSize(DimensionType cellDim) {
return BlockPos.ZERO;
}
@Override
public BlockPos getCellDimensionSize(DimensionType cellDim) {
return BlockPos.ZERO;
}
@Override
public void addCellDimensionTooltip(DimensionType cellDim, List<ITextComponent> tooltip) {
}
@Override
public ServerWorld getWorld(DimensionType cellStorageId )
{
return null;
}
public ServerWorld getWorld(DimensionType cellStorageId) {
return null;
}
@Override
public boolean isCellDimension( DimensionType cellDimID )
{
return false;
}
@Override
public boolean isCellDimension(DimensionType cellDimID) {
return false;
}
}