From 3de0566425db3ec6931c9e731eec9d573d9c6b38 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 5 May 2025 14:52:43 -0700 Subject: [PATCH] Make unbound tags non-fatal due to Mojang's registry loading order issues. Closes #10524 --- .../minecraft/core/MappedRegistry.java.patch | 35 +++++++++++++++++++ .../client/extensions/IForgeGpuTexture.java | 5 +++ .../common/extensions/IForgeLevelSummary.java | 5 +++ .../common/extensions/IForgeWeightedList.java | 5 +++ .../net/minecraftforge/gametest/GameTest.java | 5 +++ .../minecraftforge/registries/GameData.java | 1 - .../registries/NamespacedWrapper.java | 17 +++++---- .../debug/chunk/LightingEventTest.java | 5 +++ .../debug/dist/DistExecutorTest.java | 5 +++ 9 files changed, 75 insertions(+), 8 deletions(-) diff --git a/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch b/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch index ece1a3572b..ea9ef57ccc 100644 --- a/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch +++ b/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch @@ -1,5 +1,14 @@ --- a/net/minecraft/core/MappedRegistry.java +++ b/net/minecraft/core/MappedRegistry.java +@@ -30,6 +_,8 @@ + import net.minecraft.util.RandomSource; + + public class MappedRegistry implements WritableRegistry { ++ private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); ++ private static final org.apache.logging.log4j.Marker MARKER = net.minecraftforge.registries.ForgeRegistry.REGISTRIES; + private final ResourceKey> key; + private final ObjectList> byId = new ObjectArrayList<>(256); + private final Reference2IntMap toId = Util.make(new Reference2IntOpenHashMap<>(), p_308420_ -> p_308420_.defaultReturnValue(-1)); @@ -85,6 +_,7 @@ @Override @@ -35,6 +44,32 @@ } if (this.allTags.isBound()) { +@@ -304,8 +_,9 @@ + .sorted() + .toList(); + if (!list1.isEmpty()) { +- throw new IllegalStateException("Unbound tags in registry " + this.key() + ": " + list1); +- } else { ++ LOGGER.debug(MARKER, "Unbound tags in registry " + this.key() + ": " + list1); ++ bindAllUnboundTagsToEmpty(); ++ } /* else */ { + this.allTags = MappedRegistry.TagSet.fromMap(this.frozenTags); + this.refreshTagsInHolders(); + return this; +@@ -315,6 +_,13 @@ + } + } + ++ private void bindAllUnboundTagsToEmpty() { ++ for (var tag : this.frozenTags.values()) { ++ if (!tag.isBound()) ++ tag.bind(List.of()); ++ } ++ } ++ + @Override + public Holder.Reference createIntrusiveHolder(T p_205915_) { + if (this.unregisteredIntrusiveHolders == null) { @@ -389,6 +_,31 @@ }; } diff --git a/src/main/java/net/minecraftforge/client/extensions/IForgeGpuTexture.java b/src/main/java/net/minecraftforge/client/extensions/IForgeGpuTexture.java index e9887fee60..920ff8307c 100644 --- a/src/main/java/net/minecraftforge/client/extensions/IForgeGpuTexture.java +++ b/src/main/java/net/minecraftforge/client/extensions/IForgeGpuTexture.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.client.extensions; import com.mojang.blaze3d.textures.GpuTexture; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeLevelSummary.java b/src/main/java/net/minecraftforge/common/extensions/IForgeLevelSummary.java index c17a38cc05..a2ebdcdf6e 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeLevelSummary.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeLevelSummary.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.common.extensions; import net.minecraft.world.level.storage.LevelSummary; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeWeightedList.java b/src/main/java/net/minecraftforge/common/extensions/IForgeWeightedList.java index d2962986ab..e132c40bad 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeWeightedList.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeWeightedList.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.common.extensions; import net.minecraft.util.random.Weighted; diff --git a/src/main/java/net/minecraftforge/gametest/GameTest.java b/src/main/java/net/minecraftforge/gametest/GameTest.java index d2494cc592..5dbe878367 100644 --- a/src/main/java/net/minecraftforge/gametest/GameTest.java +++ b/src/main/java/net/minecraftforge/gametest/GameTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.gametest; import static java.lang.annotation.ElementType.METHOD; diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index c60899431b..c5fcfbec6c 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -269,7 +269,6 @@ public class GameData { // Tags will be bound later when tag data is reloaded/synced if (named.isFrozen()) named.unfreeze(); - named.bindAllUnboundTagsToEmpty(); named.freeze(); } else if (reg instanceof MappedRegistry maped) maped.freeze(); diff --git a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java index 0bf0edcd69..3c4fc68e25 100644 --- a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java +++ b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java @@ -8,7 +8,6 @@ package net.minecraftforge.registries; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import com.mojang.logging.LogUtils; import com.mojang.serialization.Lifecycle; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectList; @@ -26,9 +25,11 @@ import net.minecraft.tags.TagKey; import net.minecraft.tags.TagLoader; import net.minecraft.util.RandomSource; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.Marker; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -45,7 +46,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; class NamespacedWrapper extends MappedRegistry implements ILockableRegistry { - static final Logger LOGGER = LogUtils.getLogger(); + private static final Logger LOGGER = LogManager.getLogger(); + private static final Marker MARKER = ForgeRegistry.REGISTRIES; private final ForgeRegistry delegate; @Nullable private final Function> intrusiveHolderCallback; @@ -314,8 +316,10 @@ class NamespacedWrapper extends MappedRegistry implements ILockableRegistr .sorted() .toList(); - if (!unbound.isEmpty()) - throw new IllegalStateException("Unbound tags in registry " + this.key() + ": " + unbound); + if (!unbound.isEmpty()) { + LOGGER.debug(MARKER, "Unbound tags in registry " + this.key() + ": " + unbound); + this.bindAllUnboundTagsToEmpty(); + } this.frozenTags = MappedRegistry.TagSet.fromMap(this.tags); this.delegate.onBindTags(this.tags); @@ -379,8 +383,7 @@ class NamespacedWrapper extends MappedRegistry implements ILockableRegistr tag.bind(List.of()); } - void bindAllUnboundTagsToEmpty() { - this.validateWrite(); + private void bindAllUnboundTagsToEmpty() { for (var tag : this.tags.values()) { if (!tag.isBound()) tag.bind(List.of()); diff --git a/src/test/java/net/minecraftforge/debug/chunk/LightingEventTest.java b/src/test/java/net/minecraftforge/debug/chunk/LightingEventTest.java index ec235a75bd..44d1fd77ad 100644 --- a/src/test/java/net/minecraftforge/debug/chunk/LightingEventTest.java +++ b/src/test/java/net/minecraftforge/debug/chunk/LightingEventTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.debug.chunk; import net.minecraft.ChatFormatting; diff --git a/src/test/java/net/minecraftforge/debug/dist/DistExecutorTest.java b/src/test/java/net/minecraftforge/debug/dist/DistExecutorTest.java index fca069caa2..1ee9a8377c 100644 --- a/src/test/java/net/minecraftforge/debug/dist/DistExecutorTest.java +++ b/src/test/java/net/minecraftforge/debug/dist/DistExecutorTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.debug.dist; import net.minecraft.client.Minecraft;