Change item tunnel back to item instead of item_in

Author: robotgryphon

src/main/java/dev/compactmods/machines/core/Tunnels.java

@@ -61,7 +61,7 @@ public static TunnelDefinition getDefinition(ResourceLocation id) {
     // ================================================================================================================
     //   TUNNEL TYPE DEFINITIONS
     // ================================================================================================================
-    public static final RegistryObject<TunnelDefinition> ITEM_IN_DEF = DEFINITIONS.register("item_in", ItemTunnel::new);
+    public static final RegistryObject<TunnelDefinition> ITEM_TUNNEL_DEF = DEFINITIONS.register("item", ItemTunnel::new);
 
     // ================================================================================================================
     //   TUNNEL BLOCKS / TILES

src/main/java/dev/compactmods/machines/machine/CompactMachineBlockEntity.java

@@ -71,7 +71,7 @@ public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable D
                         throw new MissingDimensionException();
 
                     if(compact.getBlockEntity(firstSupported.get()) instanceof TunnelWallEntity tunnel) {
-                        return tunnel.getCapability(cap, side);
+                        return tunnel.getTunnelCapability(cap, side);
                     } else {
                         return super.getCapability(cap, side);
                     }

src/main/java/dev/compactmods/machines/tunnel/TunnelWallEntity.java

@@ -150,13 +150,28 @@ public void onLoad() {
         }
     }
 
+    @Nonnull
+    public <T> LazyOptional<T> getTunnelCapability(@Nonnull Capability<T> cap, @Nullable Direction outerSide) {
+        if (level == null || level.isClientSide)
+            return LazyOptional.empty();
+
+        if (outerSide != null && outerSide != getConnectedSide())
+            return LazyOptional.empty();
+
+        if (tunnelType instanceof ITunnelCapabilityProvider c) {
+            return c.getCapability(cap, tunnel);
+        }
+
+        return LazyOptional.empty();
+    }
+
     @Nonnull
     @Override
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
         if (level == null || level.isClientSide)
             return super.getCapability(cap, side);
 
-        if (side != null && side != getConnectedSide())
+        if (side != null && side != getTunnelSide())
             return super.getCapability(cap, side);
 
         if (cap == Capabilities.TUNNEL_CONNECTION)

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

@@ -1,7 +1,6 @@
 package dev.compactmods.machines.tunnel.definitions;
 
 import dev.compactmods.machines.api.tunnels.ITunnel;
-import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.common.util.LazyOptional;
@@ -12,13 +11,11 @@
 
 public class ItemStorage implements ITunnel, INBTSerializable<CompoundTag> {
 
-    Direction side;
     private final LazyOptional<IItemHandler> laze;
     final ItemStackHandler handler;
 
-    public ItemStorage(int buffer, Direction side) {
+    public ItemStorage(int buffer) {
         this.handler = new ItemStackHandler(buffer);
-        this.side = side;
         this.laze = LazyOptional.of(this::getItems);
     }
 
@@ -34,14 +31,12 @@ public <CapType> LazyOptional<CapType> lazy() {
     @Override
     public CompoundTag serializeNBT() {
         CompoundTag tag = new CompoundTag();
-        tag.putString("side", side.getSerializedName());
         tag.put("items", handler.serializeNBT());
         return tag;
     }
 
     @Override
     public void deserializeNBT(CompoundTag nbt) {
-        this.side = Direction.byName(nbt.getString("side"));
         handler.deserializeNBT(nbt.getCompound("items"));
     }
 }

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

@@ -35,7 +35,7 @@ public int getTunnelIndicatorColor() {
      */
     @Override
     public ITunnel newInstance(BlockPos pos, Direction side) {
-        return new ItemStorage(10, side);
+        return new ItemStorage(10);
     }
 
     @Override

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

@@ -72,8 +72,8 @@ public static void canRegisterTunnel(final GameTestHelper test) {
     public static void canFetchSupportingTunnelsOnSide(final GameTestHelper test) {
         var graph = new TunnelConnectionGraph();
 
-        graph.registerTunnel(BlockPos.ZERO, Tunnels.ITEM_IN_DEF.get(), 1, Direction.NORTH);
-        graph.registerTunnel(BlockPos.ZERO.above(), Tunnels.ITEM_IN_DEF.get(), 1, Direction.SOUTH);
+        graph.registerTunnel(BlockPos.ZERO, Tunnels.ITEM_TUNNEL_DEF.get(), 1, Direction.NORTH);
+        graph.registerTunnel(BlockPos.ZERO.above(), Tunnels.ITEM_TUNNEL_DEF.get(), 1, Direction.SOUTH);
         graph.registerTunnel(BlockPos.ZERO.below(), Tunnels.UNKNOWN.get(), 1, Direction.NORTH);
 
         final var positions = graph.getTunnelsSupporting(1, Direction.NORTH, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
@@ -93,8 +93,8 @@ public static void canFetchSidedTypes(final GameTestHelper test) {
         var graph = new TunnelConnectionGraph();
 
         // Register three tunnels - two types on the north side (different positions), one on south
-        graph.registerTunnel(BlockPos.ZERO, Tunnels.ITEM_IN_DEF.get(), 1, Direction.NORTH);
-        graph.registerTunnel(BlockPos.ZERO.above(), Tunnels.ITEM_IN_DEF.get(), 1, Direction.SOUTH);
+        graph.registerTunnel(BlockPos.ZERO, Tunnels.ITEM_TUNNEL_DEF.get(), 1, Direction.NORTH);
+        graph.registerTunnel(BlockPos.ZERO.above(), Tunnels.ITEM_TUNNEL_DEF.get(), 1, Direction.SOUTH);
         graph.registerTunnel(BlockPos.ZERO.below(), Tunnels.UNKNOWN.get(), 1, Direction.NORTH);
 
         final var positions = graph.getTypesForSide(1, Direction.NORTH)

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

@@ -132,7 +132,7 @@ private static void sidedTunnelTest(Direction dir, GameTestHelper t) {
                     });
 
                     ItemStack tunnelStack = new ItemStack(Tunnels.ITEM_TUNNEL.get(), 1);
-                    TunnelItem.setTunnelType(tunnelStack, Tunnels.ITEM_IN_DEF.get());
+                    TunnelItem.setTunnelType(tunnelStack, Tunnels.ITEM_TUNNEL_DEF.get());
 
                     playerInRoom.setItemInHand(InteractionHand.MAIN_HAND, tunnelStack);
 
@@ -160,7 +160,7 @@ private static void sidedTunnelTest(Direction dir, GameTestHelper t) {
                         final var roomTunnels = RoomTunnelData.get(serv, TESTING_ROOM);
                         final var graph = roomTunnels.getGraph();
 
-                        var placed = graph.getMachineTunnels(machine, Tunnels.ITEM_IN_DEF.get())
+                        var placed = graph.getMachineTunnels(machine, Tunnels.ITEM_TUNNEL_DEF.get())
                                 .collect(Collectors.toSet());
 
                         if (placed.size() != 1)