diff --git a/build.gradle.kts b/build.gradle.kts
index 72536da9..483892c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.8"
+    id("io.papermc.paperweight.patcher") version "1.5.10"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index bb92644c..f3670777 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.2-R0.1-SNAPSHOT
 mcVersion=1.20.2
 packageVersion=1_20_R2
 org.gradle.jvmargs=-Xmx2G
-paperRef=250388defed6660c57f40733c318ac90b846c264
+paperRef=96d5e6ca481591842f44d05ab2451f943be6a7c7
 preVersion=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c30b486a..744c64d1 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/patches/api/0005-Hide-irrelevant-compilation-warnings.patch b/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
index cc32d742..6469a331 100644
--- a/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
+++ b/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Hide irrelevant compilation warnings
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..580a37740f04a4aad435fc50b521a59a772f16af 100644
+index e827ee211e3c65dc68ac5867fd8476639df63645..c8a301080389ac54ba4911faec709b0663c3507f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -89,6 +89,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -106,6 +106,15 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -24,7 +24,7 @@ index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..580a37740f04a4aad435fc50b521a59a
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -146,6 +155,8 @@ tasks.withType<Javadoc> {
+@@ -163,6 +172,8 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }
diff --git a/patches/api/0006-SIMD-support.patch b/patches/api/0006-SIMD-support.patch
index 695bbb49..98711500 100644
--- a/patches/api/0006-SIMD-support.patch
+++ b/patches/api/0006-SIMD-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 580a37740f04a4aad435fc50b521a59a772f16af..45c2e0b9417cc5e0d54dc007f1259c0568966aab 100644
+index c8a301080389ac54ba4911faec709b0663c3507f..03c8e56ba97badce267b3e882dfba5d97708baae 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -95,6 +95,7 @@ tasks.withType<JavaCompile> {
+@@ -112,6 +112,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index 580a37740f04a4aad435fc50b521a59a772f16af..45c2e0b9417cc5e0d54dc007f1259c05
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -157,6 +158,7 @@ tasks.withType<Javadoc> {
+@@ -174,6 +175,7 @@ tasks.withType<Javadoc> {
      }
  
      options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings
diff --git a/patches/api/0007-Leaves-API-publish.patch b/patches/api/0007-Leaves-API-publish.patch
index 218ba3e7..f1abfac0 100644
--- a/patches/api/0007-Leaves-API-publish.patch
+++ b/patches/api/0007-Leaves-API-publish.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Leaves API publish
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 45c2e0b9417cc5e0d54dc007f1259c0568966aab..7c50ed670facceac89df004416ce417237d88d11 100644
+index 03c8e56ba97badce267b3e882dfba5d97708baae..37195381168ddf116a722924323f694479dfbbdf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -181,3 +181,14 @@ tasks.check {
-     dependsOn(scanJar)
+@@ -209,3 +209,14 @@ tasks.check {
+     dependsOn(scanJarForOldGeneratedCode)
  }
  // Paper end
 +