IDE cleanups, warnings, more work on tunnels

Author: robotgryphon

build.gradle

@@ -172,14 +172,17 @@ dependencies {
 //    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
 
     // Nicephore - Screenshots and Stuff
-    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3542531"))
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3574658"))
 
-    // Testing Mods - Trash Cans, Pipez
+    // Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
     runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3544563"))
     runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3544028"))
-    runtimeOnly(fg.deobf("curse.maven:pipez-443900:3558815"))
+    runtimeOnly(fg.deobf("curse.maven:pipez-443900:3569514"))
     runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3556768"))
     runtimeOnly(fg.deobf("curse.maven:create-328085:3556823"))
+    runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
+    runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
+    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3569563"))
 
     // Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
     runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))

src/api/java/dev/compactmods/machines/api/core/Messages.java

@@ -10,4 +10,5 @@ public abstract class Messages {
     public static final ResourceLocation HOW_DID_YOU_GET_HERE = new ResourceLocation(Constants.MOD_ID, "how_did_you_get_here");
     public static final ResourceLocation FIXBIOME_IN_BAD_DIMENSION = new ResourceLocation(Constants.MOD_ID, "fixbiome_bad_dim");
     public static final ResourceLocation UNKNOWN_TUNNEL = new ResourceLocation(Constants.MOD_ID, "unknown_tunnel_type");
+    public static final ResourceLocation NO_TUNNEL_SIDE = new ResourceLocation(Constants.MOD_ID, "no_available_sides");
 }

src/api/java/dev/compactmods/machines/api/location/IDimensionalPosition.java

@@ -1,15 +1,20 @@
 package dev.compactmods.machines.api.location;
 
 import java.util.Optional;
+import net.minecraft.core.Direction;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 
 public interface IDimensionalPosition {
+    IDimensionalPosition relative(Direction direction, float amount);
+
     BlockPos getBlockPosition();
 
-    Optional<ServerLevel> getWorld(MinecraftServer server);
+    Optional<ServerLevel> level(MinecraftServer server);
+
+    Optional<BlockState> state(MinecraftServer server);
 
-    Optional<BlockState> getBlockState(MinecraftServer server);
+    IDimensionalPosition relative(Direction direction);
 }

src/api/java/dev/compactmods/machines/api/room/IMachineRoom.java

@@ -1,7 +1,7 @@
 package dev.compactmods.machines.api.room;
 
 import javax.annotation.Nonnull;
-import dev.compactmods.machines.api.tunnels.connection.IMachineTunnels;
+import dev.compactmods.machines.api.tunnels.connection.IRoomTunnels;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
 
@@ -14,8 +14,8 @@ public interface IMachineRoom {
     ServerLevel getLevel();
 
     @Nonnull
-    IMachineTunnels getTunnels();
+    IRoomTunnels getTunnels();
 
     @Nonnull
-    IRoomCapabilities getCapabilities();
+    IRoomCapabilities getCapabilityManager();
 }

src/api/java/dev/compactmods/machines/api/room/IRoomCapabilities.java

@@ -14,5 +14,5 @@ public interface IRoomCapabilities {
     void removeCapability(TunnType tunnel, Capability<CapType> capability, Direction side);
 
     <CapType, TunnType extends TunnelDefinition>
-    LazyOptional<CapType> getCapability(Capability<CapType> capability, Direction side);
+    LazyOptional<CapType> getCapability(TunnType tunnType, Capability<CapType> capability, Direction side);
 }

src/api/java/dev/compactmods/machines/api/tunnels/ITunnelPosition.java

@@ -0,0 +1,18 @@
+package dev.compactmods.machines.api.tunnels;
+
+import javax.annotation.Nonnull;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
+
+public interface ITunnelPosition {
+
+    @Nonnull
+    ServerLevel level();
+
+    @Nonnull
+    BlockPos pos();
+
+    @Nonnull
+    Direction side();
+}

src/api/java/dev/compactmods/machines/api/tunnels/TunnelDefinition.java

@@ -1,10 +1,8 @@
 package dev.compactmods.machines.api.tunnels;
 
 import net.minecraftforge.registries.ForgeRegistryEntry;
-import net.minecraftforge.registries.IForgeRegistryEntry;
 
 public abstract class TunnelDefinition extends ForgeRegistryEntry<TunnelDefinition>
-    implements IForgeRegistryEntry<TunnelDefinition>
 {
     /**
      * The color of a non-indicator (the same color as the wall)