mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
Sync component registry ids
Fix deprecation typo Bump ModLauncher (better stack traces) Set Automatic-Module-Name
This commit is contained in:
5 files changed
+9
-4
No files matched your search
@@ -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',
|
||||
|
||||
+1
-1
@@ -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')
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user