From 4cf5508e043e8654bb22b81b3127d8201a6f65ab Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Dec 2022 19:52:30 -0800 Subject: [PATCH] Move ICondition patch placement to before MC throws an error. Disable the explicitly erroring test biome modifier. --- .../net/minecraft/resources/RegistryDataLoader.java.patch | 8 ++++---- ...on => test_datapackreg_conditions_error.json-disabled} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename src/test/resources/data/forge/forge/biome_modifier/{test_datapackreg_conditions_error.json => test_datapackreg_conditions_error.json-disabled} (100%) diff --git a/patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch b/patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch index e2295f1a2e..1b1ecb4448 100644 --- a/patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch +++ b/patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch @@ -9,11 +9,11 @@ } static void m_255048_(RegistryOps.RegistryInfoLookup p_256369_, ResourceManager p_256349_, ResourceKey> p_255792_, WritableRegistry p_256211_, Decoder p_256232_, Map, Exception> p_255884_) { -@@ -138,6 +_,7 @@ +@@ -136,6 +_,7 @@ + try (Reader reader = resource.m_215508_()) { + JsonElement jsonelement = JsonParser.parseReader(reader); DataResult dataresult = p_256232_.parse(registryops, jsonelement); ++ if (!net.minecraftforge.common.crafting.conditions.ICondition.shouldRegisterEntry(jsonelement)) continue; E e = dataresult.getOrThrow(false, (p_248715_) -> { }); -+ if (net.minecraftforge.common.crafting.conditions.ICondition.shouldRegisterEntry(jsonelement)) p_256211_.m_255290_(resourcekey, e, resource.m_247137_() ? Lifecycle.stable() : dataresult.lifecycle()); - } - diff --git a/src/test/resources/data/forge/forge/biome_modifier/test_datapackreg_conditions_error.json b/src/test/resources/data/forge/forge/biome_modifier/test_datapackreg_conditions_error.json-disabled similarity index 100% rename from src/test/resources/data/forge/forge/biome_modifier/test_datapackreg_conditions_error.json rename to src/test/resources/data/forge/forge/biome_modifier/test_datapackreg_conditions_error.json-disabled