From 23b41ce9b359749c8f5d3e385421ce03976cd084 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 7 Oct 2024 17:26:02 -0700
Subject: [PATCH] Sync component registry ids Fix deprecation typo Bump
 ModLauncher (better stack traces) Set Automatic-Module-Name

---
 build_forge.gradle                                            | 3 +++
 settings.gradle                                               | 2 +-
 .../minecraftforge/client/event/ClientChatReceivedEvent.java  | 4 ++--
 .../java/net/minecraftforge/network/ForgePacketHandler.java   | 2 +-
 src/main/java/net/minecraftforge/registries/GameData.java     | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build_forge.gradle b/build_forge.gradle
index 4971e711a6..6d32a41e9a 100644
--- a/build_forge.gradle
+++ b/build_forge.gradle
@@ -816,6 +816,9 @@ tasks.named('universalJar').configure {
     exclude '.cache'
 
     manifest {
+        attributes([
+            'Automatic-Module-Name': 'net.minecraftforge.forge'
+        ] as LinkedHashMap)
         attributes([
             'Specification-Title':   'Forge',
             'Specification-Vendor':  'Forge Development LLC',
diff --git a/settings.gradle b/settings.gradle
index 990bd564b4..beaf57f0da 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,7 +24,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         libs {
             library('forgespi', 'net.minecraftforge:forgespi:7.1.5') // Needs modlauncher
-            library('modlauncher', 'net.minecraftforge:modlauncher:10.2.1') // Needs securemodules
+            library('modlauncher', 'net.minecraftforge:modlauncher:10.2.2') // Needs securemodules
             library('securemodules', 'net.minecraftforge:securemodules:2.2.20') // Needs unsafe
             library('unsafe', 'net.minecraftforge:unsafe:0.9.2')
             library('accesstransformers', 'net.minecraftforge:accesstransformers:8.2.0')
diff --git a/src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java b/src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java
index 97ffcfe298..e0e6c0186b 100644
--- a/src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java
+++ b/src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java
@@ -78,7 +78,7 @@ public class ClientChatReceivedEvent extends Event {
      * @Deprecated Mojang made ChatType a registry, which isn't always accessible when the System messages are sent.
      * So moved to it's own event. {@link SystemMessageReceivedEvent}
      */
-    @Deprecated(forRemoval = true, since = "1.20.1")
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public boolean isSystem() {
         return this.sender.equals(Util.NIL_UUID);
     }
@@ -118,7 +118,7 @@ public class ClientChatReceivedEvent extends Event {
      * @Deprecated Mojang made ChatType a registry, which isn't always accessible when the System messages are sent.
      * So moved to it's own event. {@link SystemMessageReceivedEvent}
      */
-    @Deprecated(forRemoval = true, since = "1.20.1")
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public static class System extends ClientChatReceivedEvent {
         private final boolean overlay;
 
diff --git a/src/main/java/net/minecraftforge/network/ForgePacketHandler.java b/src/main/java/net/minecraftforge/network/ForgePacketHandler.java
index 126acdd1ae..f85c268fb8 100644
--- a/src/main/java/net/minecraftforge/network/ForgePacketHandler.java
+++ b/src/main/java/net/minecraftforge/network/ForgePacketHandler.java
@@ -175,7 +175,7 @@ public class ForgePacketHandler {
         LOGGER.debug(MARKER,"Received registry data packet for {} token {}", msg.name(), msg.token());
         if (!this.registriesToReceive.remove(msg.name())) {
             LOGGER.error(MARKER, "Received unexpected registry data packet for {}", msg.name());
-            ctx.getConnection().disconnect(Component.literal("Illegal Registry Data packet received, unexpected regitry: " + msg.name()));
+            ctx.getConnection().disconnect(Component.literal("Illegal Registry Data packet received, unexpected registry: " + msg.name()));
             return;
         }
         this.registrySnapshots.put(msg.name(), msg.data());
diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java
index 27dc649ec5..d894048cfe 100644
--- a/src/main/java/net/minecraftforge/registries/GameData.java
+++ b/src/main/java/net/minecraftforge/registries/GameData.java
@@ -33,6 +33,7 @@ import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.syncher.EntityDataSerializer;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -123,6 +124,7 @@ public class GameData {
         makeRegistry(Keys.ATTRIBUTES).onValidate(AttributeCallbacks.INSTANCE).disableSaving().disableSync().create();
         makeRegistry(Keys.STAT_TYPES).create();
         makeRegistry(Keys.COMMAND_ARGUMENT_TYPES).disableSaving().create();
+        makeRegistry(Registries.DATA_COMPONENT_TYPE).disableSaving().create();
 
         // Villagers
         makeRegistry(Keys.VILLAGER_PROFESSIONS, "none").create();