From bb3c59d8a28487d1035aeff062ef9ee25e3bfdd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 29 Dec 2020 12:54:30 +0100 Subject: [PATCH] Removed unused capability. --- .../cil/oc2/common/block/BusCableBlock.java | 2 +- .../block/entity/BusCableTileEntity.java | 4 ++-- .../block/entity/ComputerTileEntity.java | 2 +- .../bus/TileEntityDeviceBusElement.java | 4 ++-- .../EnergyStorageBlockDeviceProvider.java | 2 +- .../FluidHandlerBlockDeviceProvider.java | 2 +- .../ItemHandlerBlockDeviceProvider.java | 2 +- .../oc2/common/capabilities/Capabilities.java | 17 ++++++--------- .../DeviceBusControllerCapability.java | 21 ------------------- .../li/cil/oc2/common/bus/DeviceBusTests.java | 2 +- 10 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/li/cil/oc2/common/capabilities/DeviceBusControllerCapability.java diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java index 7d0fa9d9..7a89badc 100644 --- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java +++ b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java @@ -294,7 +294,7 @@ public final class BusCableBlock extends Block { return false; } - return tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, facing.getOpposite()).isPresent(); + return tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT, facing.getOpposite()).isPresent(); } private void onConnectionTypeChanged(final IWorld world, final BlockPos pos, final Direction face) { diff --git a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java index 3d3c77d1..085fe9c6 100644 --- a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java +++ b/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java @@ -34,7 +34,7 @@ public final class BusCableTileEntity extends AbstractTileEntity { } public void handleConnectionTypeChanged(final Direction side) { - invalidateCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, side); + invalidateCapability(Capabilities.DEVICE_BUS_ELEMENT, side); handleNeighborChanged(getPos().offset(side)); } @@ -56,7 +56,7 @@ public final class BusCableTileEntity extends AbstractTileEntity { @Override protected void collectCapabilities(final CapabilityCollector collector, @Nullable final Direction direction) { if (BusCableBlock.getConnectionType(getBlockState(), direction) != BusCableBlock.ConnectionType.NONE) { - collector.offer(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, busElement); + collector.offer(Capabilities.DEVICE_BUS_ELEMENT, busElement); } } diff --git a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java index 659d9091..3877e26b 100644 --- a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java @@ -275,7 +275,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic @Override protected void collectCapabilities(final CapabilityCollector collector, @Nullable final Direction direction) { - collector.offer(Capabilities.ITEM_HANDLER_CAPABILITY, itemHandlers); + collector.offer(Capabilities.ITEM_HANDLER, itemHandlers); } @Override diff --git a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java index edce2fc2..e4677ed1 100644 --- a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java +++ b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java @@ -70,7 +70,7 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl continue; } - final LazyOptional capability = tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, neighborDirection.getOpposite()); + final LazyOptional capability = tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT, neighborDirection.getOpposite()); if (capability.isPresent()) { neighbors.add(capability); } @@ -149,7 +149,7 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl } final LazyOptional capability = tileEntity - .getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, direction.getOpposite()); + .getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite()); capability.ifPresent(DeviceBus::scheduleScan); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageBlockDeviceProvider.java index 2d55ed55..bc32dfdd 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageBlockDeviceProvider.java @@ -17,7 +17,7 @@ public final class EnergyStorageBlockDeviceProvider extends AbstractTileEntityCa /////////////////////////////////////////////////////////////////// public EnergyStorageBlockDeviceProvider() { - super(() -> Capabilities.ENERGY_STORAGE_CAPABILITY); + super(() -> Capabilities.ENERGY_STORAGE); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerBlockDeviceProvider.java index 99128e4f..f269e045 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerBlockDeviceProvider.java @@ -18,7 +18,7 @@ public final class FluidHandlerBlockDeviceProvider extends AbstractTileEntityCap /////////////////////////////////////////////////////////////////// public FluidHandlerBlockDeviceProvider() { - super(() -> Capabilities.FLUID_HANDLER_CAPABILITY); + super(() -> Capabilities.FLUID_HANDLER); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerBlockDeviceProvider.java index 3bd53f6a..4e41ec74 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerBlockDeviceProvider.java @@ -18,7 +18,7 @@ public final class ItemHandlerBlockDeviceProvider extends AbstractTileEntityCapa /////////////////////////////////////////////////////////////////// public ItemHandlerBlockDeviceProvider() { - super(() -> Capabilities.ITEM_HANDLER_CAPABILITY); + super(() -> Capabilities.ITEM_HANDLER); } /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java b/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java index b8fd685b..06e77800 100644 --- a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java +++ b/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java @@ -1,6 +1,5 @@ package li.cil.oc2.common.capabilities; -import li.cil.oc2.api.bus.DeviceBusController; import li.cil.oc2.api.bus.DeviceBusElement; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; @@ -9,25 +8,21 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; public final class Capabilities { - @CapabilityInject(DeviceBusElement.class) - public static Capability DEVICE_BUS_ELEMENT_CAPABILITY = null; - - @CapabilityInject(DeviceBusController.class) - public static Capability DEVICE_BUS_CONTROLLER_CAPABILITY = null; - @CapabilityInject(IEnergyStorage.class) - public static Capability ENERGY_STORAGE_CAPABILITY = null; + public static Capability ENERGY_STORAGE = null; @CapabilityInject(IFluidHandler.class) - public static Capability FLUID_HANDLER_CAPABILITY = null; + public static Capability FLUID_HANDLER = null; @CapabilityInject(IItemHandler.class) - public static Capability ITEM_HANDLER_CAPABILITY = null; + public static Capability ITEM_HANDLER = null; + + @CapabilityInject(DeviceBusElement.class) + public static Capability DEVICE_BUS_ELEMENT = null; /////////////////////////////////////////////////////////////////// public static void initialize() { DeviceBusElementCapability.register(); - DeviceBusControllerCapability.register(); } } diff --git a/src/main/java/li/cil/oc2/common/capabilities/DeviceBusControllerCapability.java b/src/main/java/li/cil/oc2/common/capabilities/DeviceBusControllerCapability.java deleted file mode 100644 index 1c7296fe..00000000 --- a/src/main/java/li/cil/oc2/common/capabilities/DeviceBusControllerCapability.java +++ /dev/null @@ -1,21 +0,0 @@ -package li.cil.oc2.common.capabilities; - -import li.cil.oc2.api.bus.DeviceBusController; -import li.cil.oc2.common.bus.AbstractDeviceBusController; -import net.minecraftforge.common.capabilities.CapabilityManager; - -import java.util.Objects; - -public final class DeviceBusControllerCapability { - public static void register() { - CapabilityManager.INSTANCE.register(DeviceBusController.class, new NullStorage<>(), Implementation::new); - } - - /////////////////////////////////////////////////////////////////// - - private static class Implementation extends AbstractDeviceBusController { - protected Implementation() { - super(Objects.requireNonNull(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY.getDefaultInstance())); - } - } -} diff --git a/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java b/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java index c2d4f7d9..b65cadcd 100644 --- a/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java +++ b/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java @@ -37,7 +37,7 @@ public class DeviceBusTests { @BeforeEach public void setupEach() { MockitoAnnotations.initMocks(this); - Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY = busElementCapability; + Capabilities.DEVICE_BUS_ELEMENT = busElementCapability; busControllerBusElement = mock(DeviceBusElement.class); when(busControllerBusElement.getLocalDevices()).thenReturn(emptyList());