From 39dc348f8b0125faa04e3b3b14c5da304f19e735 Mon Sep 17 00:00:00 2001 From: Jonathan Colmenares Date: Sat, 10 Feb 2024 19:02:14 -0500 Subject: [PATCH] Fix TagsProvider not honoring replace attribute (#9865) --- .../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 507963e6f9..a4c4279bc4 100644 --- a/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch +++ b/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch @@ -42,8 +42,9 @@ if (!list1.isEmpty()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Couldn't define tag %s as it is missing following references: %s", p_236449_, 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_236048_(p_236449_); ++ JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, p_236450_.isReplace())).getOrThrow(false, f_126541_::error); + Path path = this.getPath(p_236449_); + if (path == null) return; // Forge: Allow running this data provider without writing it. Recipe provider needs valid tags. 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; } }