From 404f15b2a8fc9842f5a3696899a8ce343720a1a0 Mon Sep 17 00:00:00 2001
From: Mysticdrew <drewhaas@gmail.com>
Date: Fri, 14 Jun 2024 08:07:18 -0500
Subject: [PATCH] 1.21

---
 .../commonnetwork/networking/ForgeNetworkHandler.java     | 8 +++++---
 gradle.properties                                         | 8 ++++----
 settings.gradle                                           | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java b/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java
index 640d878..5393582 100644
--- a/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java
+++ b/forge/src/main/java/commonnetwork/networking/ForgeNetworkHandler.java
@@ -96,10 +96,12 @@ private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<Pack
         return (message, ctx) -> {
             try
             {
-                Side side = ctx.isServerSide() ? Side.SERVER : Side.CLIENT;
-                ServerPlayer player = ctx.getSender();
-                handler.accept(new PacketContext<>(player, message, side));
                 ctx.setPacketHandled(true);
+                ctx.enqueueWork(() -> {
+                    Side side = ctx.isServerSide() ? Side.SERVER : Side.CLIENT;
+                    ServerPlayer player = ctx.getSender();
+                    handler.accept(new PacketContext<>(player, message, side));
+                });
             }
             catch (Throwable t)
             {
diff --git a/gradle.properties b/gradle.properties
index bd24268..545885b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,16 +6,16 @@ curseforge_project_id=806044
 modrinth_project_id=HIuqnQpi
 
 # Common
-minecraft_version=1.21-pre4
+minecraft_version=1.21
 
 # Forge
-forge_version=50.0.9
+forge_version=51.0.0
 
 #neoforge
-neoforge_version=20.6.48-beta
+neoforge_version=21.0.0-beta
 
 # Fabric
-fabric_version=0.99.5+1.21
+fabric_version=0.100.1+1.21
 fabric_loader_version=0.15.11
 
 # Mod options
diff --git a/settings.gradle b/settings.gradle
index 0014bb9..36479c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,6 +26,6 @@ plugins {
 rootProject.name = 'common-networking'
 include("common")
 include("fabric")
-//include("forge")
-//include("neoforge")
+include("forge")
+include("neoforge")