适配 v149

.github/workflows/build.yml

@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: build MOD
         run: |
           export VERSION="beta-$GITHUB_RUN_NUMBER"
           ./gradlew dist
       - name: Upload MOD JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: build/dist/*

.github/workflows/changeLog.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: release-drafter/release-drafter@v5
         env:

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set env
         env:
@@ -24,6 +24,6 @@ jobs:
         run: ./gradlew dist
 
       - name: upload artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/dist/*

build.gradle.kts

@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.1.10"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     `maven-publish`
 }
@@ -16,8 +16,8 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    compileOnly("com.github.Anuken.Arc:arc-core:v146")
-    compileOnly("com.github.anuken.mindustryjitpack:core:v145") {
+    compileOnly("com.github.Anuken.Arc:arc-core:v149")
+    compileOnly("com.github.anuken.mindustry:core:v149") {
         exclude(group = "com.github.Anuken.Arc")
     }
 }
@@ -51,44 +51,47 @@ val shadowTask: ShadowJar = tasks.withType(ShadowJar::class.java) {
     minimize()
 }.first()
 
-val jarAndroid = tasks.create("jarAndroid") {
+val jarAndroid by tasks.registering(Exec::class) {
     dependsOn(shadowTask)
     val inFile = shadowTask.archiveFile.get().asFile
     val outFile = inFile.resolveSibling("${shadowTask.archiveBaseName.get()}-Android.jar")
     outputs.file(outFile)
-    doLast {
-        val sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
-        if (sdkRoot == null || !File(sdkRoot).exists()) throw GradleException("No valid Android SDK found. Ensure that ANDROID_HOME is set to your Android SDK directory.")
-
-        val d8Tool = File("$sdkRoot/build-tools/").listFiles()?.sortedDescending()
-            ?.flatMap { dir -> (dir.listFiles().orEmpty()).filter { it.name.startsWith("d8") } }?.firstOrNull()
-            ?: throw GradleException("No d8 found. Ensure that you have an Android platform installed.")
-        val platformRoot = File("$sdkRoot/platforms/").listFiles()?.sortedDescending()?.firstOrNull { it.resolve("android.jar").exists() }
-            ?: throw GradleException("No android.jar found. Ensure that you have an Android platform installed.")
-
-        //collect dependencies needed for desugaring
-        val dependencies = (configurations.compileClasspath.get() + configurations.runtimeClasspath.get() + platformRoot.resolve("android.jar"))
-            .joinToString(" ") { "--classpath ${it.path}" }
-        exec {
-            commandLine("$d8Tool $dependencies --min-api 14 --output $outFile $inFile".split(" "))
-            workingDir(inFile.parentFile)
-            standardOutput = System.out
-            errorOutput = System.err
-        }.assertNormalExitValue()
-    }
+
+
+    val sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
+    if (sdkRoot == null || !File(sdkRoot).exists()) throw GradleException("No valid Android SDK found. Ensure that ANDROID_HOME is set to your Android SDK directory.")
+
+    val buildToolsDir = File(sdkRoot, "build-tools")
+    val d8Tool = buildToolsDir.listFiles()?.sortedDescending()
+        ?.flatMap { dir -> dir.listFiles()?.filter { it.name == "d8" || it.name == "d8.bat" } ?: emptyList() }
+        ?.firstOrNull()
+        ?: throw GradleException("No d8 found. Ensure that you have an Android build-tools installed (>= 28.0.0).")
+    val platformRoot = File(sdkRoot, "platforms").listFiles()
+        ?.sortedDescending()
+        ?.firstOrNull { File(it, "android.jar").exists() }
+        ?: throw GradleException("No android.jar found. Ensure that you have an Android platform installed.")
+    val androidJar = File(platformRoot, "android.jar")
+    val dependencies = (configurations.getByName("compileClasspath") +
+            configurations.getByName("runtimeClasspath") + files(androidJar)).files
+    val classpathArgs = dependencies.flatMap { listOf("--classpath", it.absolutePath) }
+
+    doFirst { outFile.parentFile.mkdirs() }
+    commandLine = listOf(d8Tool.absolutePath) + classpathArgs +
+            listOf("--min-api", "14", "--output", outFile.absolutePath, inFile.absolutePath)
+    workingDir(inFile.parentFile)
 }
 
-tasks.create("devInstall", Copy::class.java) {
+tasks.register("devInstall", Copy::class.java) {
     dependsOn(shadowTask)
     from(shadowTask.archiveFile.get())
     into(System.getenv("AppData") + "/mindustry/mods")
 }
 
-tasks.create("dist", Jar::class.java) {
+tasks.register("dist", Jar::class.java) {
     dependsOn(shadowTask)
     dependsOn(jarAndroid)
-    from(zipTree(shadowTask.archiveFile.get()))
-    from(zipTree(jarAndroid.outputs.files.first()))
-    destinationDirectory.set(buildDir.resolve("dist"))
+    from(shadowTask.archiveFile.map { zipTree(it) })
+    from(jarAndroid.map { zipTree(it.outputs.files.first()) })
+    destinationDirectory.set(layout.buildDirectory.dir("dist"))
     archiveFileName.set("ContentsTweaker-${rootProject.version}.jar")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl = https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl = true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -111,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -130,26 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,16 +204,16 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/kotlin/cf/wayzer/contentsTweaker/resolvers/ObjectMapResolver.kt

@@ -28,9 +28,15 @@ object ObjectMapResolver : ContentsTweaker.NodeCollector {
         node += object : CTNode.Indexable {
             override fun resolveIndex(key: String): CTNode? {
                 val keyV = TypeRegistry.resolveType(JsonValue(key), keyType)
-                val value = map.get(keyV) ?: return null
+                val value = map.get(keyV)
+                val elementType = objInfo.elementType
+                if (value == null && elementType == null) return null
                 return node.getOrCreate("#" + TypeRegistry.getKeyString(keyV)).apply {
-                    extendOnce<CTNode.ObjInfo<Any?>>(CTNode.ObjInfo(value))
+                    if (value != null) {
+                        extendOnce<CTNode.ObjInfo<Any?>>(CTNode.ObjInfo(value))
+                    } else {
+                        extendOnce<CTNode.ObjInfo<Any?>>(CTNode.ObjInfo(null, elementType!!))
+                    }
                 }
             }
 

src/main/resources/mod.json

@@ -6,5 +6,5 @@
   "description": "Dynamic load custom contents patch account to server",
   "version": "@version@",
   "hidden": true,
-  "minGameVersion": 136
+  "minGameVersion": 149
 }