Skip to content

Commit fa38449

Browse files
Datagen: sort items to map before mapping
1 parent c386ee3 commit fa38449

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@
4242
import java.io.InputStream;
4343
import java.io.StringReader;
4444
import java.nio.file.Path;
45+
import java.util.Comparator;
4546
import java.util.HashMap;
4647
import java.util.Map;
4748
import java.util.Optional;
49+
import java.util.Set;
50+
import java.util.TreeSet;
4851
import java.util.concurrent.CompletableFuture;
4952

5053
public abstract class RainbowModelProvider extends FabricModelProvider {
@@ -102,7 +105,9 @@ protected RainbowModelProvider(FabricDataOutput output, CompletableFuture<Holder
102105
BedrockPack pack = createBedrockPack(new Serializer(output, registries),
103106
new DatagenResolver(resourceManager, equipmentInfos, itemInfos, models)).build();
104107

105-
for (Item item : itemInfos.keySet()) {
108+
Set<Item> sortedItemInfos = new TreeSet<>(Comparator.comparing(item -> item.builtInRegistryHolder().key().location()));
109+
sortedItemInfos.addAll(itemInfos.keySet());
110+
for (Item item : sortedItemInfos) {
106111
pack.map(getVanillaItem(item).builtInRegistryHolder(), getVanillaDataComponentPatch(item));
107112
}
108113
return pack;

0 commit comments

Comments
 (0)