Celestial Forging Anvil to 26.1 锻星砧移植到26.1

.github/workflows/ci.yml

@@ -30,6 +30,16 @@ jobs:
           path: gradle.properties
           properties: 'mod_id mod_name java_version'
 
+      - name: Read Lib Version
+        id: 'lib_version'
+        uses: Gu-ZT/toml-reader-action@1.0.0
+        with:
+          file: gradle/libs.versions.toml
+          fields: |
+            versions.minecraft
+            versions.neoForge
+            versions.anvillib
+
       - name: Setup Java ${{ steps.properties.outputs.java_version }}
         uses: actions/setup-java@v3.6.0
         with:
@@ -67,20 +77,26 @@ jobs:
         continue-on-error: true
 
       - name: gametest
-        uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
+        uses: Anvil-Dev/dedicated-server-launch-test@universal
         continue-on-error: false
         with:
-          mod: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+          mods: |
+            build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+          minecraft_version: ${{ steps.lib_version.outputs.versions_minecraft }}
+          mod_loader: 'neoforge'
+          loader_version: ${{ steps.lib_version.outputs.versions_neoForge }}
+          extra-mods: "anvil-lib:${{ steps.lib_version.outputs.versions_anvillib }}"
+          quiet-setup: 'True'
 
       - name: publish neoforge mc mod
         uses: Kir-Antipov/mc-publish@v3.3
         continue-on-error: true
         with:
           name: "${{ steps.properties.outputs.mod_name }} For NeoForge v${{ steps.version.outputs.version }}"
           version: ${{ steps.version.outputs.version }}
-          game-versions: 1.21.1
+          game-versions: 26.1.2
           version-type: ${{ env.VERSION_TYPE }}
-          java: 21
+          java: ${{ steps.properties.outputs.java_version }}
           fail-mode: skip
           changelog: Early test version, please download and play with caution. 早期测试版本，请谨慎下载游玩
           dependencies: |

.github/workflows/pull_request.yml

@@ -29,6 +29,16 @@ jobs:
           path: gradle.properties
           properties: 'mod_id mod_name java_version'
 
+      - name: Read Lib Version
+        id: 'lib_version'
+        uses: Gu-ZT/toml-reader-action@1.0.0
+        with:
+          file: gradle/libs.versions.toml
+          fields: |
+            versions.minecraft
+            versions.neoForge
+            versions.anvillib
+
       - name: Setup Java ${{ steps.properties.outputs.java_version }}
         uses: actions/setup-java@v3.6.0
         with:
@@ -58,7 +68,12 @@ jobs:
           path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
 
       - name: gametest
-        uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
+        uses: Anvil-Dev/dedicated-server-launch-test@universal
         with:
-          mod: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
-          extra-mods: patchouli:1.21-87-neoforge cloth-config:15.0.140+neoforge
+          mods: |
+            build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+          minecraft_version: ${{ steps.lib_version.outputs.versions_minecraft }}
+          mod_loader: 'neoforge'
+          loader_version: ${{ steps.lib_version.outputs.versions_neoForge }}
+          extra-mods: "anvil-lib:${{ steps.lib_version.outputs.versions_anvillib }}"
+          quiet-setup: 'True'

.github/workflows/release.yml

@@ -70,9 +70,9 @@ jobs:
         with:
           name: "${{ steps.properties.outputs.mod_name }} For NeoForge v${{ steps.version.outputs.version }}"
           version: ${{ steps.version.outputs.version }}
-          game-versions: 1.21.1
+          game-versions: 26.1.2
           version-type: ${{ env.VERSION_TYPE }}
-          java: 21
+          java: ${{ steps.properties.outputs.java_version }}
           fail-mode: skip
           changelog: ${{ github.event.release.body }}
           dependencies: |

.github/workflows/style_check.yml

@@ -14,17 +14,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: refs/pull/${{ github.event.number }}/merge
-      - name: Setup Java 17
+      - name: Setup Java 25
         uses: actions/setup-java@v3.6.0
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 25
       - uses: reviewdog/action-setup@v1
         with:
           reviewdog_version: latest
       - name: download checkstyle
-        run: curl -o checkstyle.jar -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-12.1.2/checkstyle-12.1.2-all.jar
+        run: curl -o checkstyle.jar -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.4.2/checkstyle-13.4.2-all.jar
       - name: checkstyle
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: java -jar checkstyle.jar -c style.xml -f xml src | reviewdog -f=checkstyle -name="Checkstyle" -reporter=github-pr-review -fail-level=any
+        run: java -jar checkstyle.jar -c style.xml -f xml src | reviewdog -f=checkstyle -name="Checkstyle" -reporter=github-pr-review -fail-level=any

build.gradle

@@ -39,18 +39,24 @@ apply from: "$rootDir/gradle/scripts/resources.gradle"
 apply from: "$rootDir/dependencies.gradle"
 
 // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 compileJava.options.encoding = 'UTF-8'
 
-machete {
-    // disable machete locally for faster builds
-    enabled = false
-}
+// disable machete locally for faster builds
+machete.enabled = false
+
+lombok.version = "1.18.44"
 
-lombok {
-    version = "1.18.34"
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile).tap {
+            configureEach {
+                options.compilerArgs << "-Xmaxerrs" << "10000"
+            }
+        }
+    }
 }

dependencies.gradle

@@ -1,21 +1,20 @@
 dependencies {
     // AnvilLib
-    runtimeOnly(libs.anvillib)
-    compileOnly(libs.bundles.anvillib)
+    api(libs.anvillib)
     interfaceInjectionData(libs.anvillib.recipe)
     interfaceInjectionData(libs.anvillib.moveableEntityBlock)
-    jarJar(libs.anvillib)
+    // jarJar(libs.anvillib)
 
     // JEI
-    compileOnlyApi(libs.jei.common.api) { transitive = false }
-    compileOnlyApi(libs.jei.forge.api) { transitive = false }
-    implementation(libs.jei.forge) { transitive = false }
+    compileClasspath(libs.jei.common.api) { transitive = false }
+    compileClasspath(libs.jei.forge.api) { transitive = false }
+    compileClasspath(libs.jei.forge) { transitive = false }
+    runtimeClasspath(libs.jei.forge) { transitive = false }
 
-    // Sodium, Iris, Embeddium
-    compileOnly(libs.sodium)
-    compileOnly(libs.embeddium)
-    compileOnly(libs.iris)
+    // Sodium, Iris
+    compileClasspath(libs.sodium)
+    compileClasspath(libs.iris)
 
     // Jade
-    compileOnly(libs.jade)
+    compileClasspath(libs.jade)
 }

gradle.properties

@@ -1,6 +1,6 @@
 # Jvm info
-java_version=21
-org.gradle.jvmargs=-Xmx1G
+java_version=25
+org.gradle.jvmargs=-Xmx2G
 org.gradle.daemon=false
 org.gradle.debug=false
 
@@ -17,8 +17,8 @@ mod_url=https://github.com/Anvil-Dev/AnvilCraft
 # Development info
 maven_group=dev.dubhe
 
-minecraft_version_range=[1.21,1.21.1)
-neo_version_range=[21.0.0-beta,)
+minecraft_version_range=[26.1,26.2)
+neo_version_range=[26.1.0.0-beta,)
 
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[4,)

gradle/libs.versions.toml

@@ -1,39 +1,25 @@
 [versions]
-minecraft = "1.21.1"
-neoForge = "21.1.219"
-jei = "19.21.0.247"
-jade = "15.3.4+neoforge"
-parchment = "2024.11.17"
-modDevGradle = "2.0.140"
+minecraft = "26.1.2"
+neoForge = "26.1.2.71"
+jei = "29.6.2.31"
+jade = "26.1.1+neoforge"
+modDevGradle = "2.0.141"
 lombok = "8.7.1"
-machete = "1.+"
-anvillib = "2.0.0+snapshot.314"
-sodium = "mc1.21.1-0.6.13-neoforge"
-embeddium = "1.0.11+mc1.21.1"
-iris = "1.8.1+1.21.1-neoforge"
+machete = "1.2.0"
+anvillib = "2.0.0+snapshot.453"
+sodium = "mc26.1.2-0.8.10-neoforge"
+iris = "1.10.9+26.1-neoforge"
 
 [libraries]
-jei-common-api = { group = "mezz.jei", name = "jei-1.21.1-common-api", version.ref = "jei" }
-jei-forge-api = { group = "mezz.jei", name = "jei-1.21.1-neoforge-api", version.ref = "jei" }
-jei-forge = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei" }
+jei-common-api = { group = "mezz.jei", name = "jei-26.1.2-common-api", version.ref = "jei" }
+jei-forge-api = { group = "mezz.jei", name = "jei-26.1.2-neoforge-api", version.ref = "jei" }
+jei-forge = { group = "mezz.jei", name = "jei-26.1.2-neoforge", version.ref = "jei" }
 sodium = {  group = "maven.modrinth", name = "sodium", version.ref = "sodium"}
-embeddium = {  group = "maven.modrinth", name = "embeddium", version.ref = "embeddium"}
 iris = {  group = "maven.modrinth", name = "iris", version.ref = "iris"}
 jade = { group = "maven.modrinth", name = "jade", version.ref = "jade" }
-anvillib-codec = { group = "dev.anvilcraft.lib", name = "anvillib-codec-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-config = { group = "dev.anvilcraft.lib", name = "anvillib-config-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-recipe = { group = "dev.anvilcraft.lib", name = "anvillib-recipe-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-registrum = { group = "dev.anvilcraft.lib", name = "anvillib-registrum-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-moveableEntityBlock = { group = "dev.anvilcraft.lib", name = "anvillib-moveable-entity-block-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-multiblock = { group = "dev.anvilcraft.lib", name = "anvillib-multiblock-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-network = { group = "dev.anvilcraft.lib", name = "anvillib-network-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-integration = { group = "dev.anvilcraft.lib", name = "anvillib-integration-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-util = { group = "dev.anvilcraft.lib", name = "anvillib-util-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-wheel = { group = "dev.anvilcraft.lib", name = "anvillib-wheel-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" }
-
-[bundles]
-anvillib = [ "anvillib-codec", "anvillib-config", "anvillib-recipe", "anvillib-registrum", "anvillib-moveableEntityBlock", "anvillib-multiblock", "anvillib-network", "anvillib-integration", "anvillib-util", "anvillib-wheel" ]
+anvillib-recipe = { group = "dev.anvilcraft.lib", name = "anvillib-recipe-neoforge-26.1", version.ref = "anvillib" }
+anvillib-moveableEntityBlock = { group = "dev.anvilcraft.lib", name = "anvillib-moveable-entity-block-neoforge-26.1", version.ref = "anvillib" }
+anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-26.1", version.ref = "anvillib" }
 
 [plugins]
 modDevGradle = { id = "net.neoforged.moddev", version.ref = "modDevGradle" }

gradle/scripts/jars.gradle

@@ -19,6 +19,4 @@ jar {
     }
 }
 
-base {
-    archivesName = "${project.name}-${libs.versions.minecraft.get()}"
-}
+base.archivesName = "${project.name}-${libs.versions.minecraft.get()}"

gradle/scripts/moddevgradle.gradle

@@ -1,11 +1,6 @@
 neoForge {
     version = libs.versions.neoForge.get()
 
-    parchment {
-        minecraftVersion = "1.21.1"
-        mappingsVersion = libs.versions.parchment.get()
-    }
-
     // This line is optional. Access Transformers are automatically detected
     accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -31,6 +26,8 @@ neoForge {
                 jvmArgument "-XX:+AllowEnhancedClassRedefinition"
             }
 
+            jvmArgument "-XX:+IgnoreUnrecognizedVMOptions"
+
             // Recommended logging level for the console
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
@@ -43,6 +40,34 @@ neoForge {
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
+        clientMSA {
+            client()
+            devLogin = true
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        clientRenderDoc {
+            client()
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+            systemProperty 'anvillib.rendering.debugMode', 'true'
+            systemProperty('neoforge.rendernurse.renderdoc.library', file("libs/renderdoc.dll").absolutePath)
+            programArgument("--renderDebugLabels")
+            jvmArgument("-javaagent:" + file("libs/renderdoc-loader.jar").absolutePath)
+        }
+
+        clientRenderDocMSA {
+            client()
+            devLogin = true
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+            systemProperty 'anvillib.rendering.debugMode', 'true'
+            systemProperty('neoforge.rendernurse.renderdoc.library', file("libs/renderdoc.dll").absolutePath)
+            programArgument("--renderDebugLabels")
+            jvmArgument("-javaagent:" + file("libs/renderdoc-loader.jar").absolutePath)
+        }
+
         server {
             server()
             programArgument '--nogui'
@@ -58,7 +83,7 @@ neoForge {
         }
 
         data {
-            data()
+            clientData()
 
             // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
             // gameDirectory = project.file('run-data')

gradle/scripts/publishing.gradle

@@ -1,13 +1,13 @@
-artifacts {
-    archives tasks.jar
-    archives tasks.sourcesJar
+tasks.named("assemble") {
+    dependsOn tasks.jar
+    dependsOn tasks.sourcesJar
 }
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
             groupId = project.group
-            artifactId = project.archivesBaseName
+            artifactId = project.base.archivesName.get()
             version = project.version
 
             from components.java

gradle/scripts/repositories.gradle

@@ -8,11 +8,13 @@ repositories {
                 url = "https://server.cjsah.net:1002/maven/"
                 content {
                     includeGroup "dev.anvilcraft.lib"
+                    includeGroup "dev.dubhe"
                 }
             }
         )
         filter {
             includeGroup "dev.anvilcraft.lib"
+            includeGroup "dev.dubhe"
         }
     }
     maven { // Sodium, Embeddium, Iris, Jade

gradle/scripts/resources.gradle

@@ -11,18 +11,18 @@ def supporters = getConfig("supporters")
 // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
 tasks.withType(ProcessResources).configureEach {
     var replaceProperties = [
-            minecraft_version      : libs.versions.minecraft.get(),
-            minecraft_version_range: minecraft_version_range,
-            neo_version            : libs.versions.neoForge.get(),
-            neo_version_range      : neo_version_range,
-            loader_version_range   : loader_version_range,
-            mod_id                 : mod_id,
-            mod_name               : mod_name,
-            mod_license            : mod_license,
-            mod_version            : version,
-            mod_description        : mod_description,
-            "contributors"         : contributors,
-            "supporters"           : supporters
+            minecraft_version       : libs.versions.minecraft.get(),
+            minecraft_version_range : minecraft_version_range,
+            neo_version             : libs.versions.neoForge.get(),
+            neo_version_range       : neo_version_range,
+            loader_version_range    : loader_version_range,
+            mod_id                  : mod_id,
+            mod_name                : mod_name,
+            mod_license             : mod_license,
+            mod_version             : version,
+            mod_description         : mod_description,
+            "contributors"          : contributors,
+            "supporters"            : supporters
     ]
     inputs.properties replaceProperties
 

gradle/wrapper/gradle-wrapper.properties

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