Set up API package

Author: robotgryphon

build.gradle

@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
         mavenCentral()
     }
 
@@ -31,9 +30,25 @@ println("Version: ${version}");
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 sourceSets {
+    api {
+        java {
+            srcDir "src/api/java"
+        }
+        compileClasspath += configurations.getByName("minecraft")
+    }
+
     main {
-        resources.srcDir "src/generated/resources"
+        java {
+            srcDir "src/api/java"
+            srcDir "src/main/java"
+        }
+
+        resources {
+            srcDir "src/main/resources"
+            srcDir 'src/generated/resources'
+        }
     }
+
     test
 }
 
@@ -114,19 +129,22 @@ minecraft {
         unitTests {
             parent runs.server // This run config inherits settings from the server config
             workingDirectory project.file('run/test')
-            main 'com.alcatrazescapee.mcjunitlib.DedicatedTestServerLauncher' // The main class which launches a customized server which then runs JUnit tests
+            main 'com.alcatrazescapee.mcjunitlib.DedicatedTestServerLauncher'
+            // The main class which launches a customized server which then runs JUnit tests
             ideaModule "${project.name}.test" // Tell IDEA to use the classpath of the test module
-            property 'forge.logging.console.level', 'unittest' // This logging level prevents any other server information messages and leaves only the unit test output
+            property 'forge.logging.console.level', 'unittest'
+            // This logging level prevents any other server information messages and leaves only the unit test output
             environment 'MOD_CLASSES', String.join(File.pathSeparator,
                     "${mod_id}%%${sourceSets.main.output.resourcesDir}",
                     "${mod_id}%%${sourceSets.main.output.classesDirs[0]}",
                     "${mod_id}%%${sourceSets.test.output.resourcesDir}",
                     "${mod_id}%%${sourceSets.test.output.classesDirs[0]}",
             ) // Forge will ignore all test sources unless we explicitly tell it to include them as mod sources
-            environment 'target', 'fmltestserver' // This is a custom service used to launch with ModLauncher's transforming class loader
+            environment 'target', 'fmltestserver'
+            // This is a custom service used to launch with ModLauncher's transforming class loader
             mods {
                 compactmachines { // The mod that is being tested - Replace this with your mod ID!
-                    sources sourceSets.main
+                    sources sourceSets.api, sourceSets.main
                 }
             }
         }
@@ -191,6 +209,14 @@ repositories {
         name 'MCUnitTests'
         url 'https://jitpack.io'
     }
+
+    // Curseforge stuff
+    maven {
+        url "https://cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
 }
 
 def dev_mods = fileTree(dev_mods_dir).filter { it -> it.isFile() }.files.name.collect({ getModVersion(it) })
@@ -203,10 +229,7 @@ dependencies {
 
 
     // Deobfuscate each dev mod for runtime
-    dev_mods.each {
-        compileOnly fg.deobf(it)
-        runtimeOnly fg.deobf(it)
-    }
+    dev_mods.each { implementation(fg.deobf(it)) }
 
 
     // JEI
@@ -219,30 +242,37 @@ dependencies {
 
     testImplementation(fg.deobf("com.github.alcatrazEscapee:mcjunitlib:1.3.3-${minecraft_version}"))
 
+    // Nicephore - Screenshots and Stuff
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3318114"))
+
+    // Mekanism + Mek Generators - Tunnel testing
+    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))
+    runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3206395"))
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
+    from sourceSets.api.output
+    from sourceSets.main.output
     destinationDirectory = file("$rootDir/build-out")
+
     finalizedBy('reobfJar')
     manifest {
         attributes([
                 "Specification-Title"     : "compactmachines",
                 "Specification-Vendor"    : "",
                 "Specification-Version"   : "1", // We are version 1 of ourselves
                 "Implementation-Title"    : project.name,
-                "Implementation-Version":  isRelease ? archiveVersion : "nightly-${gitCommitHash}",
+                "Implementation-Version"  : isRelease ? archiveVersion : "nightly-${gitCommitHash}",
                 "Implementation-Vendor"   : "",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
 
 task apiJar(type: Jar) {
+    from sourceSets.api.output
     // Sources included because of MinecraftForge/ForgeGradle#369
-    from(sourceSets.main.allJava)
-    from(sourceSets.main.output)
-    include 'com/robotgryphon/compactmachines/api/**'
     archiveClassifier = 'api'
     destinationDirectory = file("$rootDir/build-out")
 }

…mods/machines/api/core/Advancements.java …mods/machines/api/core/Advancements.javasrc/main/java/dev/compactmods/machines/api/core/Advancements.java renamed to src/api/java/dev/compactmods/machines/api/core/Advancements.java src/main/java/dev/compactmods/machines/api/core/Advancements.java renamed to src/api/java/dev/compactmods/machines/api/core/Advancements.java

@@ -0,0 +1,23 @@
+package dev.compactmods.machines.api.core;
+
+import net.minecraft.util.ResourceLocation;
+
+public abstract class Tooltips {
+
+    public static final ResourceLocation UNKNOWN_PLAYER_NAME = new ResourceLocation(Constants.MOD_ID, "unknown_player");
+
+    public static abstract class Machines {
+        public static final ResourceLocation ID = new ResourceLocation(Constants.MOD_ID, "machine.id");
+        public static final ResourceLocation OWNER = new ResourceLocation(Constants.MOD_ID, "machine.owner");
+        public static final ResourceLocation SIZE = new ResourceLocation(Constants.MOD_ID, "machine.size");
+    }
+
+    //#region Hints and Details
+    public static final ResourceLocation HINT_HOLD_SHIFT = new ResourceLocation(Constants.MOD_ID, "hint.hold_shift");
+
+    public static abstract class Details {
+        public static final ResourceLocation PERSONAL_SHRINKING_DEVICE = new ResourceLocation(Constants.MOD_ID, "details.psd");
+        public static final ResourceLocation SOLID_WALL = new ResourceLocation(Constants.MOD_ID, "details.solid_wall");
+    }
+    //#endregion
+}

…actmods/machines/api/core/Constants.java …actmods/machines/api/core/Constants.javasrc/main/java/dev/compactmods/machines/api/core/Constants.java renamed to src/api/java/dev/compactmods/machines/api/core/Constants.java src/main/java/dev/compactmods/machines/api/core/Constants.java renamed to src/api/java/dev/compactmods/machines/api/core/Constants.java

@@ -0,0 +1,12 @@
+package dev.compactmods.machines.api.teleportation;
+
+import java.util.Optional;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.server.ServerWorld;
+
+public interface IDimensionalPosition {
+    BlockPos getBlockPosition();
+
+    Optional<ServerWorld> getWorld(MinecraftServer server);
+}

…mpactmods/machines/api/core/JeiInfo.java …mpactmods/machines/api/core/JeiInfo.javasrc/main/java/dev/compactmods/machines/api/core/JeiInfo.java renamed to src/api/java/dev/compactmods/machines/api/core/JeiInfo.java src/main/java/dev/compactmods/machines/api/core/JeiInfo.java renamed to src/api/java/dev/compactmods/machines/api/core/JeiInfo.java

@@ -1,12 +1,15 @@
 package dev.compactmods.machines.api.tunnels;
 
+import dev.compactmods.machines.api.teleportation.IDimensionalPosition;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Map;
 
 /**
  * A base interface that marks a tunnel as supporting capabilities (items, fluids, etc.)
@@ -18,4 +21,6 @@ public interface ICapableTunnel {
 
     @Nonnull
     <T> LazyOptional<T> getExternalCapability(ServerWorld world, BlockPos tunnelPos, @Nonnull Capability<T> cap, Direction side);
+
+    Map<Capability<?>, LazyOptional<?>> rebuildCapabilityCache(ServerWorld compactLevel, BlockPos tunnelPos, BlockPos inside, @Nullable IDimensionalPosition external);
 }