Do not fail tag datagen when removing IDs not present at runtime (#1798)

neoforged · Dec 27, 2024 · e95053c · e95053c
1 parent f7a5bc8
commit e95053c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/patches/net/minecraft/data/tags/TagsProvider.java.patch b/patches/net/minecraft/data/tags/TagsProvider.java.patch
@@ -62,7 +62,7 @@
                                      TagBuilder tagbuilder = p_323138_.getValue();
                                      List<TagEntry> list = tagbuilder.build();
 -                                    List<TagEntry> list1 = list.stream().filter(p_274771_ -> !p_274771_.verifyIfPresent(predicate, predicate1)).toList();
-+                                    List<TagEntry> list1 = java.util.stream.Stream.concat(list.stream(), tagbuilder.getRemoveEntries())
++                                    List<TagEntry> list1 = list.stream()
 +                                              .filter((p_274771_) -> !p_274771_.verifyIfPresent(predicate, predicate1))
 +                                              .filter(this::missing)
 +                                              .toList();

diff --git a/tests/src/generated/resources/data/minecraft/tags/block/test_tag.json b/tests/src/generated/resources/data/minecraft/tags/block/test_tag.json
@@ -8,7 +8,8 @@
     "minecraft:polished_andesite",
     "#minecraft:beehives",
     "#minecraft:banners",
-    "#minecraft:beds"
+    "#minecraft:beds",
+    "minecraft:dacite"
   ],
   "values": []
 }
diff --git a/tests/src/main/java/net/neoforged/neoforge/oldtest/RemoveTagDatagenTest.java b/tests/src/main/java/net/neoforged/neoforge/oldtest/RemoveTagDatagenTest.java
@@ -46,7 +46,9 @@ protected void addTags(HolderLookup.Provider provider) {
                         .remove(key(Blocks.ANVIL))
                         .remove(key(Blocks.BASALT), key(Blocks.POLISHED_ANDESITE))
                         .remove(BlockTags.BEEHIVES)
-                        .remove(BlockTags.BANNERS, BlockTags.BEDS);
+                        .remove(BlockTags.BANNERS, BlockTags.BEDS)
+                        // test removing optional IDs not present at run-time
+                        .remove(ResourceLocation.withDefaultNamespace("dacite"));
             }
         };