More tunnel placement tests, sourceset split, ...

Author: robotgryphon

build.gradle

@@ -86,6 +86,16 @@ sourceSets {
         runtimeClasspath += sourceSets.main.output
     }
 
+    tunnels {
+        java {
+            srcDir("src/main/tunnels")
+        }
+
+        compileClasspath += configurations.getByName("minecraft")
+        compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
+    }
+
     main {
         java {
             srcDir "src/main/java"
@@ -98,6 +108,8 @@ sourceSets {
 
         compileClasspath += sourceSets.api.output
         runtimeClasspath += sourceSets.api.output
+        compileClasspath += sourceSets.tunnels.output
+        runtimeClasspath += sourceSets.tunnels.output
     }
 
     test {
@@ -137,6 +149,7 @@ minecraft {
 
             mods {
                 compactmachines {
+                    source sourceSets.tunnels
                     source sourceSets.main
                     source sourceSets.api
                 }
@@ -159,6 +172,7 @@ minecraft {
 
             mods {
                 compactmachines {
+                    source sourceSets.tunnels
                     source sourceSets.main
                     source sourceSets.api
                     source sourceSets.test
@@ -185,6 +199,7 @@ minecraft {
 
             mods {
                 compactmachines {
+                    source sourceSets.tunnels
                     source sourceSets.main
                     source sourceSets.api
                     source sourceSets.datagen
@@ -200,12 +215,12 @@ minecraft {
             // "SCAN": For mods scan.
             // "REGISTRIES": For firing of registry events.
             // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.markers', ''
 
             // Recommended logging level for the console
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'debug'
+            property 'forge.logging.console.level', 'info'
 
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
@@ -214,6 +229,7 @@ minecraft {
 
             mods {
                 compactmachines {
+                    source sourceSets.tunnels
                     source sourceSets.api
                     source sourceSets.main
                     source sourceSets.test
@@ -291,6 +307,7 @@ processTestResources {
 }
 
 jar {
+    from sourceSets.tunnels.output
     from sourceSets.main.output
     from sourceSets.api.output
     destinationDirectory = file("$rootDir/build-out")
@@ -299,7 +316,7 @@ jar {
 
     manifest {
         attributes([
-                "Specification-Title"     : "compactmachines",
+                "Specification-Title"     : "Compact Machines",
                 "Specification-Vendor"    : "",
                 "Specification-Version"   : "1", // We are version 1 of ourselves
                 "Implementation-Title"    : project.name,

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

@@ -12,7 +12,4 @@ public interface IMachineRoom {
 
     @Nonnull
     ServerLevel getLevel();
-
-    @Nonnull
-    IRoomCapabilities getCapabilityManager();
 }

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

@@ -1,49 +1,40 @@
 package dev.compactmods.machines.api.tunnels;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraftforge.registries.ForgeRegistryEntry;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
-public abstract class TunnelDefinition extends ForgeRegistryEntry<TunnelDefinition> {
+public interface TunnelDefinition extends IForgeRegistryEntry<TunnelDefinition> {
     /**
      * The color of a non-indicator (the same color as the wall)
      */
-    public static final int NO_INDICATOR_COLOR = 3751749;
+    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;
+    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;
+    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();
+    int ringColor();
 
     /**
      * 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 An AARRGGBB-formatted integer indicating color.
      */
-    public int getTunnelIndicatorColor() {
+    default int indicatorColor() {
         return NO_INDICATOR_COLOR;
     }
 
-    /**
-     * Handle initialization tasks for the tunnel's data here.
-     *
-     * @param position The location of the new tunnel being created.
-     * @param side The side of the wall the tunnel is being added to.
-     */
-    public abstract ITunnelInstance newInstance(BlockPos position, Direction side);
 }

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

@@ -1,11 +1,11 @@
-package dev.compactmods.machines.tunnel;
+package dev.compactmods.machines.api.tunnels;
 
-import javax.annotation.Nullable;
-import dev.compactmods.machines.api.tunnels.ITunnelPosition;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 
-public record TunnelPosition(@Nullable ServerLevel level, BlockPos pos, Direction side) implements ITunnelPosition {
+import javax.annotation.Nullable;
+
+public record TunnelPosition(@Nullable ServerLevel level, BlockPos pos, Direction side) {
 
 }

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

@@ -1,12 +1,13 @@
 package dev.compactmods.machines.api.tunnels.capability;
 
 import com.google.common.collect.ImmutableSet;
-import dev.compactmods.machines.api.tunnels.ITunnelInstance;
+import dev.compactmods.machines.api.tunnels.lifecycle.TunnelInstance;
+import dev.compactmods.machines.api.tunnels.lifecycle.InstancedTunnel;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.IItemHandler;
 
-public interface ITunnelCapabilityProvider<Tunnel extends ITunnelInstance> {
+public interface CapabilityTunnel<Tunnel extends TunnelInstance> extends InstancedTunnel<Tunnel> {
 
     ImmutableSet<Capability<?>> getSupportedCapabilities();