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
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);