upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional checking swallowing decoding errors when loading registry entries from datapacks. Fixes #9995

Browse Source
This commit is contained in:
LexManos committed 2024-06-19 15:09:37 -07:00
1 parent 54f4997f71
commit c04e533a61
1 file changed
+13 -4
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch
+13 -4
View File
@@ -40,17 +40,26 @@
RegistryOps<JsonElement> p_332135_,
ResourceKey<E> p_332850_,
Resource p_335244_,
@@ -208,7 +_,14 @@
@@ -208,7 +_,23 @@
) throws IOException {
try (Reader reader = p_335244_.openAsReader()) {
JsonElement jsonelement = JsonParser.parseReader(reader);
- DataResult<E> dataresult = p_333909_.parse(p_332135_, jsonelement);
+
+ var result = p_333909_.decode(p_332135_, jsonelement);
+ if (result.result().map(p -> p.getFirst()).isEmpty()) {
+ LOGGER.debug("Skipping {} conditions not met", p_332850_);
+ return;
+
+ if (result.isError()) {
+ LOGGER.error("Couldn't parse data file {}: {}", p_332850_, result.error().get().message());
+ throw new IllegalStateException("Couldn't parse data file " + p_332850_ + ": " + result.error().get().message());
+ }
+
+ var mappedResult = result.result().map(a -> a.getFirst());
+
+ if (mappedResult.get().isEmpty()) {
+ LOGGER.debug("Skipping {} conditions not met", p_332850_);
+ return;
+ }
+
+ DataResult<E> dataresult = result.map(p -> p.mapFirst(Optional::get)).map(p -> p.getFirst());
+
E e = dataresult.getOrThrow();