Change packages for tunnels api, include api in main pkg, artifacts

Author: robotgryphon

.github/workflows/tagged-release.yml

@@ -137,7 +137,9 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: libs
-          path: build/libs/**${{ needs.vars.outputs.mod_version }}**.jar
+          path: |
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
   view:
     name: View Changelog Output
@@ -179,7 +181,8 @@ jobs:
           prerelease: false
           files: |
             changelog/CHANGELOG.md
-            buildfiles/**${{ needs.vars.outputs.mod_version }}**.jar
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
       - name: Full File
         id: filename

.github/workflows/test-build.yml

@@ -133,7 +133,9 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: libs
-          path: build/libs/**${{ needs.vars.outputs.mod_version }}**.jar
+          path: |
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
   view:
     name: View Changelog Output

build.gradle

@@ -10,6 +10,10 @@ buildscript {
     }
 }
 
+plugins {
+    id "idea"
+}
+
 apply plugin: 'net.minecraftforge.gradle'
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
@@ -22,15 +26,14 @@ archivesBaseName = mod_id
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 sourceSets {
-    api
-    main
+    main{
+        resources {
+            srcDir 'src/generated/resources'
+        }
+    }
     test
 }
 
-configurations {
-    apiCompile.extendsFrom(compile)
-}
-
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
     mappings channel: 'snapshot', version: mappings_version
@@ -95,8 +98,6 @@ minecraft {
     }
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 def getModVersion(filename) {
     // println(filename);
     def pattern = /^(?<modid>[^-]+)(?:-(?<mcversion>[0-9.]+))?(?:-(?<modver>[0-9.\-]+))\.jar$/;
@@ -156,8 +157,6 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    implementation sourceSets.api.output
-
     // Deobfuscate each dev mod for runtime
     dev_mods.each {
         compileOnly fg.deobf(it)
@@ -195,6 +194,23 @@ jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
 //publish.dependsOn('reobfJar')
 
+task srcJar (type: Jar) {
+    from sourceSets.main.java
+    classifier = 'sources'
+}
+
+task apiJar(type: Jar) {
+    // Sources included because of MinecraftForge/ForgeGradle#369
+    from(sourceSets.main.allJava)
+    from(sourceSets.main.output)
+    include 'com/robotgryphon/compactmachines/api/**'
+    classifier = 'api'
+}
+
+artifacts {
+    archives srcJar, apiJar
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {

…machines/api/tunnels/EnumTunnelSide.java …machines/api/tunnels/EnumTunnelSide.javasrc/api/java/com/robotgryphon/compactmachines/api/tunnels/EnumTunnelSide.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/EnumTunnelSide.java src/api/java/com/robotgryphon/compactmachines/api/tunnels/EnumTunnelSide.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/EnumTunnelSide.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels.definitions;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 import net.minecraftforge.registries.ForgeRegistryEntry;
 

…machines/api/tunnels/ICapableTunnel.java …machines/api/tunnels/ICapableTunnel.javasrc/api/java/com/robotgryphon/compactmachines/api/tunnels/ICapableTunnel.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/ICapableTunnel.java src/api/java/com/robotgryphon/compactmachines/api/tunnels/ICapableTunnel.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/ICapableTunnel.java

@@ -7,7 +7,7 @@
 import com.robotgryphon.compactmachines.data.machines.CompactMachinePlayerData;
 import com.robotgryphon.compactmachines.data.machines.CompactMachineRegistrationData;
 import com.robotgryphon.compactmachines.reference.Reference;
-import com.robotgryphon.compactmachines.tunnels.definitions.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import com.robotgryphon.compactmachines.tunnels.TunnelHelper;
 import com.robotgryphon.compactmachines.api.tunnels.ICapableTunnel;
 import net.minecraft.block.BlockState;

…actmachines/api/tunnels/IItemTunnel.java …actmachines/api/tunnels/IItemTunnel.javasrc/api/java/com/robotgryphon/compactmachines/api/tunnels/IItemTunnel.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/IItemTunnel.java src/api/java/com/robotgryphon/compactmachines/api/tunnels/IItemTunnel.java renamed to src/main/java/com/robotgryphon/compactmachines/api/tunnels/IItemTunnel.java

@@ -6,7 +6,7 @@
 import com.robotgryphon.compactmachines.network.NetworkHandler;
 import com.robotgryphon.compactmachines.network.TunnelAddedPacket;
 import com.robotgryphon.compactmachines.teleportation.DimensionalPosition;
-import com.robotgryphon.compactmachines.tunnels.definitions.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import com.robotgryphon.compactmachines.api.tunnels.ICapableTunnel;
 import com.robotgryphon.compactmachines.util.CompactMachineUtil;
 import net.minecraft.block.BlockState;