Merge branch 'master' into MinecartAutoMount

Author: Avanatiker

build.gradle

@@ -13,6 +13,7 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
+    id 'maven-publish'
 }
 
 apply plugin: 'net.minecraftforge.gradle'
@@ -61,8 +62,9 @@ minecraft {
 
 configurations {
     jarLibs
+    onlyJarLibs
     // Force choosing the correct nightly build because Mac OS chooses an invalid one
-    all {
+    configureEach {
         resolutionStrategy {
             force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209'
         }
@@ -112,7 +114,7 @@ dependencies {
     implementation('cabaletta:baritone-deobf-unoptimized-mcp-dev:1.2').setChanging(true)
 
     // This Baritone WILL be included in the jar
-    jarLibs('cabaletta:baritone-api:1.2').setChanging(true)
+    onlyJarLibs('cabaletta:baritone-api:1.2').setChanging(true)
 
     // Add everything in jarLibs to implementation (compile)
     implementation configurations.jarLibs
@@ -137,23 +139,23 @@ processResources {
     }
 }
 
-task buildApiSource(type: Jar) { // Generate sources
+tasks.register('buildApiSource', Jar) { // Generate sources
     group 'build'
     description 'Assemble API library source archive'
 
     archiveClassifier.set 'api-source'
     from sourceSets.main.allSource
 }
 
-task buildApi(type: Jar) {
+tasks.register('buildApi', Jar) {
     group 'build'
     description 'Assemble API library archive'
 
     archiveClassifier.set 'api'
     from sourceSets.main.output
 }
 
-task buildAll {
+tasks.register('buildAll') {
     group 'build'
     description 'Assemble all jars'
 
@@ -184,7 +186,7 @@ shadowJar {
             'kotlin/**/*.kotlin_metadata',
             'kotlin/**/*.kotlin_builtins',
             'META-INF/*.version'
-    configurations = [project.configurations.jarLibs]
+    configurations = [project.configurations.jarLibs, project.configurations.onlyJarLibs]
     relocate 'kotlin', 'com.lambda.shadow.kotlin'
     relocate 'kotlinx', 'com.lambda.shadow.kotlinx'
     finalizedBy 'configureReobfTaskForReobfShadowJar', 'reobfShadowJar'
@@ -198,7 +200,11 @@ reobf {
     }
 }
 
-artifacts {
-    shadowJar
-}
-
+publishing {
+    publications {
+        api(MavenPublication) {
+            artifact source: buildApi, classifier: null
+            artifact source: buildApiSource, classifier: 'sources'
+        }
+    }
+}

gradle.properties

@@ -10,5 +10,5 @@ forgeVersion=14.23.5.2860
 mappingsChannel=stable
 mappingsVersion=39-1.12
 
-kotlinVersion=1.8.10
-kotlinxCoroutinesVersion=1.6.4
+kotlinVersion=1.8.20
+kotlinxCoroutinesVersion=1.7.0-Beta

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists