diff --git a/buildSrc/libs.versions.toml b/buildSrc/libs.versions.toml
index 86a34f260b..87a1e477a9 100644
--- a/buildSrc/libs.versions.toml
+++ b/buildSrc/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-shadow = "8.1.1"
+shadow = "8.1.8"
 jetbrains-annotations = "23.0.0"
 via-nbt = "4.1.0"
 fast-util = "8.5.6"
@@ -7,7 +7,7 @@ gson = "2.8.9"
 java-diff-utils = "4.12"
 
 [libraries]
-shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
+shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" }
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 via-nbt = { group = "com.viaversion", name = "nbt", version.ref = "via-nbt" }
 fast-util = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fast-util" }
diff --git a/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts
index a2bdb80ce1..d5c03e0574 100644
--- a/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `java-library`
-    com.github.johnrengelman.shadow
+    io.github.goooler.shadow
 }
 
 group = rootProject.group
diff --git a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
index 93314be4a1..e755df0fcd 100644
--- a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     java
-    com.github.johnrengelman.shadow
+    io.github.goooler.shadow
 }
 
 tasks {
diff --git a/fabric/gradle.properties b/fabric/gradle.properties
index 2e83fca879..0481f37030 100644
--- a/fabric/gradle.properties
+++ b/fabric/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-parchment_mappings=2024.04.14
-parchment_minecraft_version=1.20.4
+minecraft_version=1.21
+parchment_mappings=2024.06.23
+parchment_minecraft_version=1.21
 loader_version=0.15.11
 
 # Mod Properties