diff --git a/build.gradle b/build.gradle
index 98fcf56a..ee58b43b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     javadoc {
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 70cc1383..53d30461 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     id "me.shedaniel.unified-publishing"
 }
 
@@ -128,7 +128,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSE_API_KEY
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 17", "1.20.5-Snapshot"//, project.minecraft_version
+                gameVersions.addAll "Java 21", project.minecraft_version
             }
         }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 5dc626f6..4e745305 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -34,14 +34,16 @@
   },
   "icon": "icon.png",
   "depends": {
-    "minecraft": "~1.20.3-",
-    "fabricloader": ">=0.14.0",
-    "fabric-api": ">=0.66.0"
+    "minecraft": "~1.20.5-",
+    "fabricloader": ">=0.15.6",
+    "fabric-api": ">=0.97.6"
   },
   "breaks": {
     "optifabric": "<1.13.0"
   },
   "custom": {
-    "modmenu:api": true
+    "modmenu": {
+      "badges": ["library"]
+    }
   }
 }
diff --git a/gradle.properties b/gradle.properties
index 403f71ed..9680aa64 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,28 +1,28 @@
 org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=false
 
-platforms=fabric
+platforms=fabric,neoforge
 
-minecraft_version=1.20.5-pre1
-supported_version=1.20.5-pre1
+minecraft_version=1.20.5
+supported_version=1.20.5
 
-artifact_type=beta
+artifact_type=release
 
 archives_base_name=architectury
 archives_base_name_snapshot=architectury-snapshot
 base_version=12.0
 maven_group=dev.architectury
-version_suffix=-beta
+version_suffix=
 
-fabric_loader_version=0.15.9
-fabric_api_version=0.96.15+1.20.5
-mod_menu_version=9.0.0
+fabric_loader_version=0.15.10
+fabric_api_version=0.97.6+1.20.5
+mod_menu_version=10.0.0-beta.1
 
-forge_version=49.0.14
-neoforge_version=20.5.0-alpha.24w14a.20240407.201521
+forge_version=50.0.0
+neoforge_version=20.5.0-beta
 
 # Set to empty if not snapshots
-neoforge_pr=794
+neoforge_pr=
 
 curseforge_id=419699
 modrinth_id=lhGA9TYQ
diff --git a/minecraftforge/build.gradle b/minecraftforge/build.gradle
index e19234fb..1a234bc6 100644
--- a/minecraftforge/build.gradle
+++ b/minecraftforge/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     id "me.shedaniel.unified-publishing"
 }
 
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 7da02720..58a23f87 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     id "me.shedaniel.unified-publishing"
 }
 
@@ -122,7 +122,7 @@ unifiedPublishing {
         displayName = "[NeoForge $rootProject.supported_version] v$project.version"
         releaseType = "$rootProject.artifact_type"
         changelog = releaseChangelog()
-        gameVersions = ["1.20.4"]
+        gameVersions = ["1.20.5"]
         gameLoaders = ["neoforge"]
         mainPublication renameJarForPublication
 
@@ -131,7 +131,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSE_API_KEY
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 17"
+                gameVersions.addAll "Java 21"
             }
         }
 
diff --git a/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java b/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
index a2ac26a1..05f47770 100644
--- a/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
+++ b/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
@@ -48,7 +48,7 @@ import net.neoforged.neoforge.event.level.LevelEvent;
 public class EventHandlerImplClient {
     @SubscribeEvent(priority = EventPriority.HIGH)
     public static void event(ItemTooltipEvent event) {
-        ClientTooltipEvent.ITEM.invoker().append(event.getItemStack(), event.getToolTip(), event.getFlags());
+        ClientTooltipEvent.ITEM.invoker().append(event.getItemStack(), event.getToolTip(), event.getContext(), event.getFlags());
     }
     
     @SubscribeEvent(priority = EventPriority.HIGH)
diff --git a/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java b/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java
index f7f29b53..ff5fd3d5 100644
--- a/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java
+++ b/neoforge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java
@@ -411,7 +411,7 @@ public class EventHandlerImplCommon {
     
     @SubscribeEvent(priority = EventPriority.HIGH)
     public static void eventChunkDataEvent(ChunkDataEvent.Load event) {
-        LevelAccessor level = event.getChunk().getWorldForge();
+        LevelAccessor level = event.getChunk().getLevel();
         if (!(level instanceof ServerLevel) && event instanceof LevelEventAttachment) {
             level = ((LevelEventAttachment) event).architectury$getAttachedLevel();
         }
diff --git a/neoforge/src/main/java/dev/architectury/networking/forge/NetworkManagerImpl.java b/neoforge/src/main/java/dev/architectury/networking/forge/NetworkManagerImpl.java
index c68c1316..3871976d 100644
--- a/neoforge/src/main/java/dev/architectury/networking/forge/NetworkManagerImpl.java
+++ b/neoforge/src/main/java/dev/architectury/networking/forge/NetworkManagerImpl.java
@@ -44,8 +44,8 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
-import net.neoforged.neoforge.network.handling.ISynchronizedWorkHandler;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
 import org.slf4j.Logger;
 
 public class NetworkManagerImpl {
@@ -56,9 +56,9 @@ public class NetworkManagerImpl {
             @Override
             public <T extends CustomPacketPayload> void registerC2S(CustomPacketPayload.Type<T> type, StreamCodec<? super RegistryFriendlyByteBuf, T> codec, NetworkReceiver<T> receiver) {
                 EventBusesHooks.whenAvailable(ArchitecturyConstants.MOD_ID, bus -> {
-                    bus.<RegisterPayloadHandlerEvent>addListener(event -> {
-                        event.registrar(type.id().getNamespace()).optional().play(type, codec, (arg, context) -> {
-                            receiver.receive(arg, context(context.player().orElse(null), context.workHandler(), false));
+                    bus.<RegisterPayloadHandlersEvent>addListener(event -> {
+                        event.registrar(type.id().getNamespace()).optional().playToServer(type, codec, (arg, context) -> {
+                            receiver.receive(arg, context(context.player(), context, false));
                         });
                     });
                 });
@@ -67,9 +67,9 @@ public class NetworkManagerImpl {
             @Override
             public <T extends CustomPacketPayload> void registerS2C(CustomPacketPayload.Type<T> type, StreamCodec<? super RegistryFriendlyByteBuf, T> codec, NetworkReceiver<T> receiver) {
                 EventBusesHooks.whenAvailable(ArchitecturyConstants.MOD_ID, bus -> {
-                    bus.<RegisterPayloadHandlerEvent>addListener(event -> {
-                        event.registrar(type.id().getNamespace()).optional().play(type, codec, (arg, context) -> {
-                            receiver.receive(arg, context(context.player().orElse(null), context.workHandler(), true));
+                    bus.<RegisterPayloadHandlersEvent>addListener(event -> {
+                        event.registrar(type.id().getNamespace()).optional().playToClient(type, codec, (arg, context) -> {
+                            receiver.receive(arg, context(context.player(), context, true));
                         });
                     });
                 });
@@ -91,7 +91,7 @@ public class NetworkManagerImpl {
                 });
             }
             
-            public NetworkManager.PacketContext context(Player player, ISynchronizedWorkHandler taskQueue, boolean client) {
+            public NetworkManager.PacketContext context(Player player, IPayloadContext taskQueue, boolean client) {
                 return new NetworkManager.PacketContext() {
                     @Override
                     public Player getPlayer() {
@@ -100,7 +100,7 @@ public class NetworkManagerImpl {
                     
                     @Override
                     public void queue(Runnable runnable) {
-                        taskQueue.submitAsync(runnable);
+                        taskQueue.enqueueWork(runnable);
                     }
                     
                     @Override
@@ -120,14 +120,14 @@ public class NetworkManagerImpl {
     @OnlyIn(Dist.CLIENT)
     public static boolean canServerReceive(ResourceLocation id) {
         if (Minecraft.getInstance().getConnection() != null) {
-            return Minecraft.getInstance().getConnection().isConnected(id);
+            return Minecraft.getInstance().getConnection().hasChannel(id);
         } else {
             return false;
         }
     }
     
     public static boolean canPlayerReceive(ServerPlayer player, ResourceLocation id) {
-        return player.connection.isConnected(id);
+        return player.connection.hasChannel(id);
     }
     
     public static Packet<ClientGamePacketListener> createAddEntityPacket(Entity entity) {
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 22dfdf49..c56aadcd 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -24,7 +24,7 @@ side = "BOTH"
 [[dependencies.architectury]]
 modId = "neoforge"
 type = "required"
-versionRange = "[20.5.0-alpha.24w14a,)"
+versionRange = "[20.5.0-beta,)"
 ordering = "NONE"
 side = "BOTH"
 
diff --git a/settings.gradle b/settings.gradle
index 8c6bf287..2d3f37cb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,10 +15,10 @@ include("common")
 include("fabric")
 //include("forge")
 //include("minecraftforge")
-//include("neoforge")
+include("neoforge")
 include("testmod-common")
 include("testmod-fabric")
 //include("testmod-forge")
-//include("testmod-neoforge")
+include("testmod-neoforge")
 
 rootProject.name = "architectury"