From 1f44339d6ef80827910b8db11de4907611c082e4 Mon Sep 17 00:00:00 2001 From: coehlrich Date: Fri, 10 Mar 2023 05:26:32 +1300 Subject: [PATCH] Fix experimental world warning screen appearing everytime (#9375) --- .../minecraft/core/registries/BuiltInRegistries.java.patch | 4 ++-- .../java/net/minecraftforge/registries/NamespacedWrapper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/core/registries/BuiltInRegistries.java.patch b/patches/minecraft/net/minecraft/core/registries/BuiltInRegistries.java.patch index 72e9008201..7f50f77c63 100644 --- a/patches/minecraft/net/minecraft/core/registries/BuiltInRegistries.java.patch +++ b/patches/minecraft/net/minecraft/core/registries/BuiltInRegistries.java.patch @@ -265,7 +265,7 @@ } + private static Registry forge(ResourceKey> key, BuiltInRegistries.RegistryBootstrap def) { -+ return forge(key, Lifecycle.experimental(), def); ++ return forge(key, Lifecycle.stable(), def); + } + private static DefaultedRegistry m_257988_(ResourceKey> p_259887_, String p_259325_, BuiltInRegistries.RegistryBootstrap p_259759_) { @@ -273,7 +273,7 @@ } + private static DefaultedRegistry forge(ResourceKey> key, String defKey, BuiltInRegistries.RegistryBootstrap def) { -+ return forge(key, defKey, Lifecycle.experimental(), def); ++ return forge(key, defKey, Lifecycle.stable(), def); + } + private static DefaultedRegistry m_257834_(ResourceKey> p_259296_, String p_259101_, BuiltInRegistries.RegistryBootstrap p_259485_) { diff --git a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java index 44c68e19ce..aec26d78dd 100644 --- a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java +++ b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java @@ -51,7 +51,7 @@ class NamespacedWrapper extends MappedRegistry implements ILockableRegistr private final Multimap, Supplier> optionalTags = Multimaps.newSetMultimap(new IdentityHashMap<>(), HashSet::new); boolean locked = false; - Lifecycle registryLifecycle = Lifecycle.experimental(); + Lifecycle registryLifecycle = Lifecycle.stable(); private boolean frozen = false; // Frozen is vanilla's variant of locked, but it can be unfrozen private List> holdersSorted; private ObjectList> holdersById = new ObjectArrayList<>(256); @@ -62,7 +62,7 @@ class NamespacedWrapper extends MappedRegistry implements ILockableRegistr NamespacedWrapper(ForgeRegistry fowner, Function> intrusiveHolderCallback, RegistryManager stage) { - super(fowner.getRegistryKey(), Lifecycle.experimental(), intrusiveHolderCallback != null); + super(fowner.getRegistryKey(), Lifecycle.stable(), intrusiveHolderCallback != null); this.delegate = fowner; this.intrusiveHolderCallback = intrusiveHolderCallback; this.stage = stage;