From 8eadcdcf060d556efa07ffeb9e7830fae04d0790 Mon Sep 17 00:00:00 2001 From: postyizhan <185839426@qq.com> Date: Wed, 19 Aug 2026 09:31:49 +0800 Subject: [PATCH 1/4] fix: upgrade Gradle and plugins for Java 25 compatibility --- .java-version | 1 + build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 18 +++++++++--------- src/main/java/noppes/npcs/CustomNpcs.java | 3 +-- 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 000000000..7273c0fa8 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +25 diff --git a/build.gradle b/build.gradle index e7f7753a3..08dcdf8e2 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,9 @@ plugins { version = "1.11.2" group= "kamkeel.customnpc-plus" -archivesBaseName = "CustomNPC-Plus" +base { + archivesName = "CustomNPC-Plus" +} def embedMixin = !project.hasProperty("nomixin"); if(!embedMixin){ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e5..37f78a6af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e58786789..bc8cd9ad4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,12 +1,12 @@ pluginManagement { -// resolutionStrategy { -// eachPlugin { -// if(requested.id.toString() == "dts.typescript-generator") { -// useModule("com.github.bigguy345:dts-gradle-plugin:95b8ab4") -// } -// } -// } -// + resolutionStrategy { + eachPlugin { + if(requested.id.toString() == "dts.typescript-generator") { + useModule("com.github.bigguy345:dts-gradle-plugin:95b8ab4") + } + } + } + repositories { maven { url "https://jitpack.io"} maven { @@ -25,7 +25,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29' } // Include the local gradle-plugins composite build so plugin is resolved locally diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 1b5467aa0..1c775b3ea 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -446,8 +446,7 @@ public void stopping(FMLServerStoppingEvent event) { try { PlayerData data = PlayerData.get((EntityPlayer) obj); if (data != null) { - data.flushEffects(); - data.save(true); + data.save(); } } catch (Exception e) { LogWriter.except(e); From f270e1e0578ff09a193ff4f811a7634bb59f1dc6 Mon Sep 17 00:00:00 2001 From: postyizhan <185839426@qq.com> Date: Wed, 19 Aug 2026 10:10:05 +0800 Subject: [PATCH 2/4] ci: fix ci build --- .github/workflows/build-and-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c2fb186fe..e7eef696e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -38,9 +38,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: | - 8 - 17 - 21 + 25 distribution: 'zulu' - name: Setup Gradle From 77cc8d46f239c86217ce87d30086965b0354c230 Mon Sep 17 00:00:00 2001 From: postyizhan <185839426@qq.com> Date: Wed, 19 Aug 2026 11:09:22 +0800 Subject: [PATCH 3/4] Revert "ci: fix ci build" This reverts commit f270e1e0578ff09a193ff4f811a7634bb59f1dc6. --- .github/workflows/build-and-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e7eef696e..c2fb186fe 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -38,7 +38,9 @@ jobs: uses: actions/setup-java@v4 with: java-version: | - 25 + 8 + 17 + 21 distribution: 'zulu' - name: Setup Gradle From 51d53f3adad83bd9d65c1770ce556144153b94cd Mon Sep 17 00:00:00 2001 From: postyizhan <185839426@qq.com> Date: Wed, 19 Aug 2026 13:14:54 +0800 Subject: [PATCH 4/4] ci: use Java 25 for Gradle workflow --- .github/workflows/gradle.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f77852dc7..9918b4032 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,17 +8,18 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: Set up JDK 25 + uses: actions/setup-java@v4 with: - java-version: 1.8 + java-version: '25' + distribution: 'zulu' - name: Update Git Submodules run: git submodule update --init --recursive - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew SetupCIWorkspace build + run: ./gradlew setupCIWorkspace build - name: Build with Gradle (nomixin) run: ./gradlew build -Pnomixin - uses: actions/upload-artifact@v4