diff --git a/src/main/java/appeng/capabilities/Capabilities.java b/src/main/java/appeng/capabilities/Capabilities.java index 58a9b477b..e10b913e4 100644 --- a/src/main/java/appeng/capabilities/Capabilities.java +++ b/src/main/java/appeng/capabilities/Capabilities.java @@ -25,7 +25,6 @@ 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; /** @@ -38,8 +37,6 @@ public final class Capabilities { public static Capability STORAGE_MONITORABLE_ACCESSOR; - public static Capability SPATIAL_DIMENSION; - public static Capability FORGE_ENERGY; /** @@ -48,7 +45,6 @@ public final class Capabilities { public static void register() { CapabilityManager.INSTANCE.register(IStorageMonitorableAccessor.class, createNullStorage(), NullMENetworkAccessor::new); - CapabilityManager.INSTANCE.register(ISpatialDimension.class, createNullStorage(), NullSpatialDimension::new); } @CapabilityInject(IStorageMonitorableAccessor.class) @@ -56,11 +52,6 @@ public final class Capabilities { STORAGE_MONITORABLE_ACCESSOR = cap; } - @CapabilityInject(ISpatialDimension.class) - private static void capISpatialDimensionRegistered(Capability cap) { - SPATIAL_DIMENSION = cap; - } - @CapabilityInject(IEnergyStorage.class) private static void capIEnergyStorageRegistered(Capability cap) { FORGE_ENERGY = cap; diff --git a/src/main/java/appeng/capabilities/NullSpatialDimension.java b/src/main/java/appeng/capabilities/NullSpatialDimension.java deleted file mode 100644 index 9c5b157a4..000000000 --- a/src/main/java/appeng/capabilities/NullSpatialDimension.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2017, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.capabilities; - -import java.util.List; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; - -import appeng.api.storage.ISpatialDimension; - -class NullSpatialDimension implements ISpatialDimension { - @Override - public DimensionType createNewCellDimension(BlockPos size) { - return null; - } - - @Override - public void deleteCellDimension(DimensionType cellStorageId) { - } - - @Override - public BlockPos getCellDimensionOrigin(DimensionType cellStorageId) { - return null; - } - - @Override - public BlockPos getCellDimensionSize(DimensionType cellDim) { - return BlockPos.ZERO; - } - - @Override - public void addCellDimensionTooltip(DimensionType cellDim, List tooltip) { - } - - @Override - public ServerWorld getWorld(DimensionType cellStorageId) { - return null; - } - - @Override - public boolean isCellDimension(DimensionType cellDimID) { - return false; - } -}