From 62ce55d8d799de9ebd022783cf07638aee46c5b6 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Fri, 24 Feb 2023 19:49:37 +0100 Subject: [PATCH] Fix missing patch that left TagBuilder#replace unused (#9354) --- .../net/minecraft/data/tags/TagsProvider.java.patch | 3 ++- patches/minecraft/net/minecraft/tags/TagBuilder.java.patch | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch b/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch index 3cb0af8b55..30ecc47e56 100644 --- a/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch +++ b/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch @@ -63,8 +63,9 @@ if (!list1.isEmpty()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Couldn't define tag %s as it is missing following references: %s", resourcelocation, list1.stream().map(Objects::toString).collect(Collectors.joining(",")))); } else { - JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, false)).getOrThrow(false, f_126541_::error); +- JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, false)).getOrThrow(false, f_126541_::error); - Path path = this.f_236439_.m_245731_(resourcelocation); ++ JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, tagbuilder.isReplace())).getOrThrow(false, f_126541_::error); + Path path = this.getPath(resourcelocation); + if (path == null) return CompletableFuture.completedFuture(null); // Forge: Allow running this data provider without writing it. Recipe provider needs valid tags. return DataProvider.m_253162_(p_253684_, jsonelement, path); diff --git a/patches/minecraft/net/minecraft/tags/TagBuilder.java.patch b/patches/minecraft/net/minecraft/tags/TagBuilder.java.patch index f8dc753f36..f15c4d3b4d 100644 --- a/patches/minecraft/net/minecraft/tags/TagBuilder.java.patch +++ b/patches/minecraft/net/minecraft/tags/TagBuilder.java.patch @@ -19,7 +19,7 @@ private final List f_215897_ = new ArrayList<>(); public static TagBuilder m_215899_() { -@@ -34,5 +_,16 @@ +@@ -34,5 +_,21 @@ public TagBuilder m_215909_(ResourceLocation p_215910_) { return this.m_215902_(TagEntry.m_215953_(p_215910_)); @@ -34,5 +34,10 @@ + // FORGE: Shorthand version of replace(true) + public TagBuilder replace() { + return replace(true); ++ } ++ ++ // FORGE: Is this tag set to replace or not? ++ public boolean isReplace() { ++ return this.replace; } }