Sort item components by key

AlexProgrammerDE · May 7, 2024 · bc80b7d · bc80b7d
1 parent 552e563
commit bc80b7d
Show file tree

Hide file tree

Showing 2 changed files with 9,738 additions and 9,733 deletions.
diff --git a/data-generator/src/main/java/com/soulfiremc/generator/generators/ItemsDataGenerator.java b/data-generator/src/main/java/com/soulfiremc/generator/generators/ItemsDataGenerator.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
 import com.soulfiremc.generator.util.MCHelper;
+import java.util.Map;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.Item;
@@ -38,9 +39,13 @@ public static JsonObject generateItem(Item item) {
       itemDesc.addProperty("tierType", ((Tiers) tieredItem.getTier()).name());
     }
 
-    itemDesc.add("components", DataComponentMap.CODEC.encodeStart(
+    var sortedComponentObj = new JsonObject();
+    DataComponentMap.CODEC.encodeStart(
       MCHelper.getLevel().registryAccess().createSerializationContext(JsonOps.INSTANCE),
-      item.components()).result().orElseThrow());
+      item.components()).result().orElseThrow().getAsJsonObject()
+      .entrySet().stream().sorted(Map.Entry.comparingByKey())
+      .forEach(e -> sortedComponentObj.add(e.getKey(), e.getValue()));
+    itemDesc.add("components", sortedComponentObj);
 
     return itemDesc;
   }