diff --git a/.gitignore b/.gitignore
index 7f35200..74c3ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ build
 /run
 
 /fork-server/build.gradle.kts
-/fork-server/src/vanilla
+/fork-server/src/minecraft
 /paper-server
 /fork-api/build.gradle.kts
 /paper-api
diff --git a/build.gradle.kts b/build.gradle.kts
index aa4ed5a..9f4a899 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 paperweight {
     upstreams.paper {
-        ref = "6e0c8776e67219ddc8e4e61364c8203d924fd23f"
+        ref = "1dc6ad1df07e018ee68d95464022285f27fff916"
 
         patchFile {
             path = "paper-server/build.gradle.kts"
diff --git a/fork-api/build.gradle.kts.patch b/fork-api/build.gradle.kts.patch
index a7f448e..5fe5f81 100644
--- a/fork-api/build.gradle.kts.patch
+++ b/fork-api/build.gradle.kts.patch
@@ -19,7 +19,7 @@
          }
      }
  }
-@@ -169,7 +_,7 @@
+@@ -174,7 +_,7 @@
  
  tasks.withType<Javadoc> {
      val options = options as StandardJavadocDocletOptions
@@ -28,7 +28,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -207,11 +_,11 @@
+@@ -212,11 +_,11 @@
      }
  
      // workaround for https://github.com/gradle/gradle/issues/4046
diff --git a/fork-server/vanilla-patches/features/0001-feature-patch.patch b/fork-server/minecraft-patches/features/0001-feature-patch.patch
similarity index 100%
rename from fork-server/vanilla-patches/features/0001-feature-patch.patch
rename to fork-server/minecraft-patches/features/0001-feature-patch.patch
diff --git a/fork-server/vanilla-patches/sources/com/google/common/annotations/Beta.java.patch b/fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch
similarity index 100%
rename from fork-server/vanilla-patches/sources/com/google/common/annotations/Beta.java.patch
rename to fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch
diff --git a/fork-server/vanilla-patches/sources/net/minecraft/BlockUtil.java.patch b/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch
similarity index 100%
rename from fork-server/vanilla-patches/sources/net/minecraft/BlockUtil.java.patch
rename to fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c8..cea7a79 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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6..f3b75f3 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
-' "$PWD" ) || exit
+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
diff --git a/paperweight b/paperweight
index 1dc821a..e8ebbf2 160000
--- a/paperweight
+++ b/paperweight
@@ -1 +1 @@
-Subproject commit 1dc821a295e27845c9b666361993c666e741d600
+Subproject commit e8ebbf2449eb294705d370d9485b26091c21f91b