Merge remote-tracking branch 'origin/forge_1.16.5' into forge_1.17.1

Author: Goldenfield192

.github/workflows/build.yml

@@ -25,3 +25,7 @@ jobs:
               env:
                 MAVENCI_PASS: ${{ secrets.MAVENCI_PASS }}
               run: ./gradlew publish
+            - uses: actions/upload-artifact@v6
+              with:
+                name: TrackAPI-${{ env.ref }}
+                path: build/libs/TrackAPI-*

build.gradle

@@ -1,31 +1,36 @@
-import cam72cam.universalmodcore.Util;
-
 buildscript {
     repositories {
-        mavenCentral()
         maven { url = "https://maven.minecraftforge.net/" }
-        maven { url = "https://teamopenindustry.cc/maven" }
+        maven { url "https://plugins.gradle.org/" }
+        mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'cam72cam.universalmodcore:UniversalModCoreGradle:0.1.3'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.69', changing: true
     }
 }
+
 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'
 apply plugin: 'maven-publish'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 
 String baseVersion = "1.3"
 if (!"release".equalsIgnoreCase(System.getProperty("target"))) {
-    baseVersion += "-" + Util.GitRevision()
+    try {
+        baseVersion += "-" + 'git rev-parse --verify --short=7 HEAD'.execute().text.trim()
+    } catch (Exception ex) {
+        baseVersion += "-unknown"
+    }
 }
 version = "1.17.1-forge-" + baseVersion
 group = "trackapi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "TrackAPI"
 
+java {
+    withSourcesJar()
+}
+
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   Snapshot are built nightly.
@@ -50,7 +55,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                examplemod {
+                trackapi {
                     source sourceSets.main
                 }
             }
@@ -66,7 +71,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                examplemod {
+                trackapi {
                     source sourceSets.main
                 }
             }
@@ -75,16 +80,13 @@ minecraft {
         data {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+            args '--mod', 'trackapi', '--all', '--output', file('src/generated/resources/')
 
             mods {
-                examplemod {
+                trackapi {
                     source sourceSets.main
                 }
             }
@@ -95,42 +97,8 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.17.1-37.1.1'
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
-}
-
-// Example for how to get properties into the manifest for reading by the runtime..
-jar {
-    manifest {
-        attributes([
-            "Specification-Title": "TrackAPI",
-            "Specification-Version": "1", // We are version 1 of ourselves
-            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+    minecraftLibrary "org.apache.maven.wagon:wagon-ssh:3.5.3"
 }
 
 jar.finalizedBy('reobfJar')
@@ -139,6 +107,8 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             artifact jar
+            artifact sourcesJar
+            artifactId archivesBaseName
         }
     }
     repositories {
@@ -150,4 +120,14 @@ publishing {
             }
         }
     }
-}
+}
+
+task ('showBuildInfo') {
+    doLast {
+        System.out.println("Build Uploaded to Maven at: ")
+        System.out.println("https://teamopenindustry.cc/maven/trackapi/TrackAPI/${version}/TrackAPI-${version}.jar")
+    }
+}
+
+publish.finalizedBy showBuildInfo
+

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

src/main/resources/META-INF/mods.toml

@@ -3,7 +3,7 @@ loaderVersion="[37,)"
 license="MIT"
 [[mods]]
 modId="trackapi" 
-version="1.2" 
+version="1.3"
 displayName="TrackAPI" 
 authors="cam72cam" 
 description='''A common track interface for minecraft forge'''