Item capability tests, 1.18.1 update

Author: robotgryphon

build.gradle

@@ -77,6 +77,8 @@ minecraft {
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
             args '--username', 'Dev##'
+            args '--width', 1920
+            args '--height', 1080
 
             mods {
                 compactmachines {
@@ -165,13 +167,22 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}")
 
     // The One Probe
+    implementation(fg.deobf("curse.maven:theoneprobe-245211:3550084"))
 //    compileOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}:api")
 //    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
 
-//    testImplementation(fg.deobf("com.github.alcatrazEscapee:mcjunitlib:1.3.3-${minecraft_version}"))
-
     // Nicephore - Screenshots and Stuff
-//    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3318114"))
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3542531"))
+
+    // Testing Mods - Trash Cans, Pipez
+    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:flywheel-486392:3556768"))
+    runtimeOnly(fg.deobf("curse.maven:create-328085:3556823"))
+
+    // Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
+    runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
 
     // Mekanism + Mek Generators - Tunnel testing
 //    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))

gradle.properties

@@ -3,15 +3,15 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.18
-forge_version=38.0.15
+minecraft_version=1.18.1
+forge_version=39.0.0
 
 mod_id=compactmachines
 mod_version=4.0.0-beta.3
 
 # Dependencies and Libs
-jei_mc_version=1.18
-jei_version=9.0.0.40
+jei_mc_version=1.18.1
+jei_version=9.1.0.41
 #top_version=1.16-3.1.4-22
 
 # Curseforge

src/api/java/dev/compactmods/machines/api/teleportation/IDimensionalPosition.java renamed to src/api/java/dev/compactmods/machines/api/location/IDimensionalPosition.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.api.teleportation;
+package dev.compactmods.machines.api.location;
 
 import java.util.Optional;
 import net.minecraft.server.MinecraftServer;

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

@@ -0,0 +1,21 @@
+package dev.compactmods.machines.api.location;
+
+import java.util.Objects;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+
+public record SidedPosition(Direction side, BlockPos position) {
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SidedPosition that = (SidedPosition) o;
+        return side == that.side && Objects.equals(this.position, that.position);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(side, position);
+    }
+}

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

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

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

@@ -0,0 +1,11 @@
+package dev.compactmods.machines.api.room;
+
+import net.minecraft.core.Direction;
+import net.minecraftforge.common.capabilities.Capability;
+
+public interface IRoomCapabilities {
+
+    <T> void addCapability(Capability<T> capability, T instance, Direction side);
+
+    <T> void removeCapability(Capability<T> capability, Direction side);
+}

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

@@ -11,14 +11,29 @@ public abstract class TunnelDefinition extends ForgeRegistryEntry<TunnelDefiniti
      */
     public static final int NO_INDICATOR_COLOR = 3751749;
 
+    /**
+     * Constant value used to indicate that a tunnel is receiving a resource from
+     * outside a machine room.
+     */
     public static final int IMPORT_COLOR = 0xff2462cd;
+
+    /**
+     * Constant value used to indicate that a tunnel is pushing a resource out of
+     * a machine room.
+     */
     public static final int EXPORT_COLOR = 0xffe6a709;
 
+    /**
+     * The central ring color of the tunnel. Shown in the tunnel item and on blocks.
+     * @return An AARRGGBB-formatted integer indicating color.
+     */
     public abstract int getTunnelRingColor();
+
     /**
      * Gets the color for the indicator at the top-right of the block texture.
+     * For import- and export-style tunnels, see {@link #IMPORT_COLOR} and {@link #EXPORT_COLOR}.
      *
-     * @return
+     * @return An AARRGGBB-formatted integer indicating color.
      */
     public int getTunnelIndicatorColor() {
         return NO_INDICATOR_COLOR;

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

@@ -0,0 +1,7 @@
+package dev.compactmods.machines.api.tunnels.capability;
+
+/**
+ * Marker interface to combine {@link ITunnelCapabilitySetup} and {@link ITunnelCapabilityTeardown}.
+ */
+public interface ITunnelCapability extends ITunnelCapabilitySetup, ITunnelCapabilityTeardown {
+}

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

@@ -0,0 +1,19 @@
+package dev.compactmods.machines.api.tunnels.capability;
+
+import dev.compactmods.machines.api.room.IMachineRoom;
+import dev.compactmods.machines.api.tunnels.connection.ITunnelConnection;
+
+/**
+ * Indicates that a tunnel has set up tasks for when a tunnel is placed
+ * inside a machine room.
+ */
+public interface ITunnelCapabilitySetup {
+
+    /**
+     * Handle initialization tasks for the tunnel's capabilities here.
+     *
+     * @param room The room the tunnel was added to.
+     * @param added The connection being set up from room to machine.
+     */
+    void setupCapabilities(IMachineRoom room, ITunnelConnection added);
+}