diff --git a/build.gradle b/build.gradle
index fb9650a7d..4328a16c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -218,8 +218,7 @@ subprojects { p ->
 //        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
         
         // Netty
-        // Breaks 1.16.5
-        //forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}")
+        implementation("io.netty:netty-buffer:${rootProject.netty_version}")
 
         // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
         forgeShadowMe("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") {
@@ -307,7 +306,8 @@ subprojects { p ->
 //        relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
         
         // Netty
-        relocate "io.netty", "${librariesLocation}.netty"
+        // Don't relocate, it causes problems with using MC's FriendlyByteBufs
+//        relocate "io.netty", "${librariesLocation}.netty"
 
         mergeServiceFiles()
     }
diff --git a/gradle.properties b/gradle.properties
index c8dc74a39..681c1bd96 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,6 @@ fastutil_version=8.2.1
 
 # Minecraft related libraries (included in MC's jar)
 log4j_version=2.23.1
-netty_version=4.1.94.Final
 lwjgl_version=3.3.1
 joml_version=1.10.2
 
diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties
index 18a6375f3..d080f3943 100644
--- a/versionProperties/1.16.5.properties
+++ b/versionProperties/1.16.5.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_16
 builds_for=fabric,forge
 embed_joml=true
 
+# Netty
+netty_version=4.1.25.Final
+
 # Fabric loader
 fabric_loader_version=0.14.24
 fabric_api_version=0.42.0+1.16
diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties
index d509a4e1f..084802738 100644
--- a/versionProperties/1.17.1.properties
+++ b/versionProperties/1.17.1.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_17
 builds_for=fabric,forge
 embed_joml=true
 
+# Netty
+netty_version=4.1.25.Final
+
 # Fabric loader
 fabric_loader_version=0.14.24
 fabric_api_version=0.46.1+1.17
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index e47bf2c7d..f313e18be 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_18
 builds_for=fabric,forge
 embed_joml=true
 
+# Netty
+netty_version=4.1.68.Final
+
 # Fabric loader
 fabric_loader_version=0.14.24
 fabric_api_version=0.76.0+1.18.2
diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties
index f54f66a60..653128ce9 100644
--- a/versionProperties/1.19.2.properties
+++ b/versionProperties/1.19.2.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_19_2
 builds_for=fabric,forge
 embed_joml=true
 
+# Netty
+netty_version=4.1.77.Final
+
 # Fabric loader
 fabric_loader_version=0.14.24
 fabric_api_version=0.76.1+1.19.2
diff --git a/versionProperties/1.19.4.properties b/versionProperties/1.19.4.properties
index 309c6cfb8..b2893bcd5 100644
--- a/versionProperties/1.19.4.properties
+++ b/versionProperties/1.19.4.properties
@@ -6,6 +6,9 @@ compatible_minecraft_versions=["1.19.4"]
 accessWidenerVersion=1_19_4
 builds_for=fabric,forge
 
+# Netty
+netty_version=4.1.82.Final
+
 # Fabric loader
 fabric_loader_version=0.14.24
 fabric_api_version=0.87.1+1.19.4
diff --git a/versionProperties/1.20.1.properties b/versionProperties/1.20.1.properties
index b97efef8d..e64c52f22 100644
--- a/versionProperties/1.20.1.properties
+++ b/versionProperties/1.20.1.properties
@@ -6,6 +6,9 @@ compatible_minecraft_versions=["1.20", "1.20.1"]
 accessWidenerVersion=1_20
 builds_for=fabric,forge
 
+# Netty
+netty_version=4.1.82.Final
+
 # Fabric loader
 fabric_loader_version=0.15.6
 fabric_api_version=0.90.4+1.20.1
diff --git a/versionProperties/1.20.2.properties b/versionProperties/1.20.2.properties
index f6a05f714..b2d12126c 100644
--- a/versionProperties/1.20.2.properties
+++ b/versionProperties/1.20.2.properties
@@ -6,6 +6,9 @@ compatible_minecraft_versions=["1.20.2"]
 accessWidenerVersion=1_20_2
 builds_for=fabric,forge
 
+# Netty
+netty_version=4.1.97.Final
+
 # Fabric loader
 fabric_loader_version=0.15.6
 fabric_api_version=0.90.4+1.20.2
diff --git a/versionProperties/1.20.4.properties b/versionProperties/1.20.4.properties
index 6be142ebd..4c321935d 100644
--- a/versionProperties/1.20.4.properties
+++ b/versionProperties/1.20.4.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_20_2
 builds_for=fabric,forge
 # neoforge can be added once the issue with mixins has been resolved
 
+# Netty
+netty_version=4.1.97.Final
+
 # Fabric loader
 fabric_loader_version=0.15.6
 fabric_api_version=0.91.2+1.20.4
diff --git a/versionProperties/1.20.6.properties b/versionProperties/1.20.6.properties
index e7a573920..b18dc92d0 100644
--- a/versionProperties/1.20.6.properties
+++ b/versionProperties/1.20.6.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_20_6
 builds_for=fabric,neoforge
 # forge is broken due to gradle/build script issues
 
+# Netty
+netty_version=4.1.97.Final
+
 # Fabric loader
 fabric_loader_version=0.15.10
 fabric_api_version=0.97.8+1.20.6
diff --git a/versionProperties/1.21.1.properties b/versionProperties/1.21.1.properties
index cc35bec09..3b11c990b 100644
--- a/versionProperties/1.21.1.properties
+++ b/versionProperties/1.21.1.properties
@@ -7,6 +7,9 @@ accessWidenerVersion=1_20_6
 builds_for=fabric,neoforge
 # forge is broken due to gradle/build script issues
 
+# Netty
+netty_version=4.1.97.Final
+
 # Fabric loader
 fabric_loader_version=0.15.11
 fabric_api_version=0.100.1+1.21