Switch tunnels to look at Capability<T> instances

Author: robotgryphon

src/api/java/dev/compactmods/machines/api/tunnels/capability/ITunnelCapabilityProvider.java

@@ -8,7 +8,7 @@
 
 public interface ITunnelCapabilityProvider<Tunnel extends ITunnel> {
 
-    ImmutableSet<Class> getSupportedCapabilities();
+    ImmutableSet<Capability<?>> getSupportedCapabilities();
 
     /**
      * Fetch a capability instance from a tunnel.

src/main/java/dev/compactmods/machines/tunnel/definitions/ItemTunnel.java

@@ -32,18 +32,16 @@ public int getTunnelIndicatorColor() {
 
     /**
      * Handle initialization tasks for the tunnel's data here.
-     *
-     * @param tunnel The location of the new tunnel being created.
      */
     @Override
     public ITunnel newInstance(BlockPos pos, Direction side) {
         return new ItemStorage(10, side);
     }
 
     @Override
-    public ImmutableSet<Class> getSupportedCapabilities() {
-        return ImmutableSet.<Class>builder()
-                .add(IItemHandler.class)
+    public ImmutableSet<Capability<?>> getSupportedCapabilities() {
+        return ImmutableSet.<Capability<?>>builder()
+                .add(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
                 .build();
     }
 

src/main/java/dev/compactmods/machines/tunnel/graph/TunnelConnectionGraph.java

@@ -18,6 +18,7 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.INBTSerializable;
 
 import javax.annotation.Nonnull;
@@ -362,7 +363,7 @@ public Stream<BlockPos> getTunnelsForSide(Direction side) {
                 .map(BlockPos::immutable);
     }
 
-    public <T> Stream<BlockPos> getTunnelsSupporting(int machine, Direction side, Class<T> capability) {
+    public <T> Stream<BlockPos> getTunnelsSupporting(int machine, Direction side, Capability<T> capability) {
         final IGraphNode node = machines.get(machine);
         if (node == null) return Stream.empty();
 

src/test/java/dev/compactmods/machines/test/tunnel/TunnelGraphTests.java

@@ -14,7 +14,7 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraftforge.gametest.GameTestHolder;
 import net.minecraftforge.gametest.PrefixGameTestTemplate;
-import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.CapabilityItemHandler;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;
@@ -76,7 +76,7 @@ public static void canFetchSupportingTunnelsOnSide(final GameTestHelper test) {
         graph.registerTunnel(BlockPos.ZERO.above(), Tunnels.ITEM_IN_DEF.get(), 1, Direction.SOUTH);
         graph.registerTunnel(BlockPos.ZERO.below(), Tunnels.UNKNOWN.get(), 1, Direction.NORTH);
 
-        final var positions = graph.getTunnelsSupporting(1, Direction.NORTH, IItemHandler.class)
+        final var positions = graph.getTunnelsSupporting(1, Direction.NORTH, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
                 .collect(Collectors.toSet());
 
         if(positions.isEmpty())