diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 528c1cecb..625b21f38 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -55,5 +55,5 @@
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.0-SNAPSHOT")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.0")
 }
diff --git a/worldedit-fabric/src/main/resources/pack.mcmeta b/worldedit-fabric/src/main/resources/pack.mcmeta
index b48da3b7d..0a39f614a 100644
--- a/worldedit-fabric/src/main/resources/pack.mcmeta
+++ b/worldedit-fabric/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "WorldEdit Resources",
-        "pack_format": 4
+        "pack_format": 8
     }
 }
\ No newline at end of file
diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts
index 7c7fba110..d7c9eebdc 100644
--- a/worldedit-forge/build.gradle.kts
+++ b/worldedit-forge/build.gradle.kts
@@ -15,10 +15,14 @@
 val nextMajorMinecraftVersion: String = minecraftVersion.split('.').let { (useless, major) ->
     "$useless.${major.toInt() + 1}"
 }
-val forgeVersion = "38.0.2"
+val forgeVersion = "38.0.10"
+
+val apiClasspath = configurations.create("apiClasspath")
+apiClasspath.isCanBeResolved = true
+configurations.api.get().extendsFrom(apiClasspath)
 
 dependencies {
-    "api"(project(":worldedit-core"))
+    "apiClasspath"(project(":worldedit-core"))
     "implementation"(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
         because("Mojang provides Log4J at 2.14.1")
     })
@@ -45,6 +49,11 @@
         }
         create("client", runConfig)
         create("server", runConfig)
+        all {
+            lazyToken("minecraft_classpath") {
+                apiClasspath.copyRecursive().resolve().joinToString(File.pathSeparator) { it.absolutePath }
+            }
+        }
     }
 
 }
diff --git a/worldedit-forge/src/main/resources/pack.mcmeta b/worldedit-forge/src/main/resources/pack.mcmeta
index b48da3b7d..0a39f614a 100644
--- a/worldedit-forge/src/main/resources/pack.mcmeta
+++ b/worldedit-forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "WorldEdit Resources",
-        "pack_format": 4
+        "pack_format": 8
     }
 }
\ No newline at end of file