Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 27, 2024
+6 −3
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f56c15e
[1.21.1] Do not fail tag datagen when removing IDs not present at run…
62832 Dec 24, 2024
b89b10f
Remove redundant stream concatenation and later check
62832 Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion patches/net/minecraft/data/tags/TagsProvider.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion tests/src/generated/resources/data/minecraft/tags/block/test_tag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"minecraft:polished_andesite",
"#minecraft:beehives",
"#minecraft:banners",
"#minecraft:beds"
"#minecraft:beds",
"minecraft:dacite"
],
"values": []
}
4 changes: 3 additions & 1 deletion tests/src/main/java/net/neoforged/neoforge/oldtest/RemoveTagDatagenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
};

Expand Down
Loading