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

Jump to bottom

Sort item groups to ensure they are in a deterministic order between runs. #3222

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Sort item groups to ensure they are in a deterministic order between runs. #3222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...-item-group-api-v1/src/main/java/net/fabricmc/fabric/mixin/itemgroup/ItemGroupsMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static net.minecraft.item.ItemGroups.SPAWN_EGGS;
import static net.minecraft.item.ItemGroups.TOOLS;

import java.util.Comparator;
import java.util.HashMap;
import java.util.List;

Expand Down Expand Up @@ -58,7 +59,12 @@ private static void collect(CallbackInfo ci) {

int count = 0;

for (RegistryKey<ItemGroup> registryKey : Registries.ITEM_GROUP.getKeys()) {
// Sort the item groups to ensure they are in a deterministic order.
final List<RegistryKey<ItemGroup>> sortedItemGroups = Registries.ITEM_GROUP.getKeys().stream()
.sorted(Comparator.comparing(RegistryKey::getValue))
.toList();

for (RegistryKey<ItemGroup> registryKey : sortedItemGroups) {
final ItemGroup itemGroup = Registries.ITEM_GROUP.getOrThrow(registryKey);
final FabricItemGroup fabricItemGroup = (FabricItemGroup) itemGroup;

Expand Down