Block entity type data & minor cleanup (#49)

Author: mworzala

DataGenerator/src/main/java/net/minestom/datagen/DataGenType.java

@@ -1,35 +1,32 @@
 package net.minestom.datagen;
 
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minestom.generators.*;
 import net.minestom.generators.loot_tables.BlockLootTableGenerator;
 import net.minestom.generators.loot_tables.ChestLootTableGenerator;
 import net.minestom.generators.loot_tables.EntityLootTableGenerator;
 import net.minestom.generators.loot_tables.GameplayLootTableGenerator;
-import net.minestom.generators.tags.*;
-
-import java.util.List;
 
 public enum DataGenType {
     CONSTANTS("constants", new MinecraftConstantGenerator()),
     // Tags are specified as a special case in datagen
 
     // Codegen only
 
-    COMMAND_ARGUMENTS("command_arguments", new GenericRegistryGenerator<>(BuiltInRegistries.COMMAND_ARGUMENT_TYPE)),
-    CONSUME_EFFECT("consume_effects", new GenericRegistryGenerator<>(BuiltInRegistries.CONSUME_EFFECT_TYPE)),
+    COMMAND_ARGUMENTS("command_arguments", new GenericRegistryArrayGenerator<>(BuiltInRegistries.COMMAND_ARGUMENT_TYPE)),
+    CONSUME_EFFECT("consume_effects", new GenericRegistryArrayGenerator<>(BuiltInRegistries.CONSUME_EFFECT_TYPE)),
     CUSTOM_STATISTICS("custom_statistics", new CustomStatisticGenerator()),
     DYE_COLORS("dye_colors", new DyeColorGenerator()),
     MAP_COLORS("map_colors", new MapColorGenerator()),
     PARTICLES("particle", new ParticleGenerator()),
     WORLD_EVENTS("world_events", new WorldEventGenerator()),
-    RECIPE_BOOK_CATEGORY("recipe_book_categories", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_BOOK_CATEGORY)),
-    RECIPE_DISPLAY_TYPE("recipe_display_types", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_DISPLAY)),
-    RECIPE_TYPE("recipe_types", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_TYPE)),
-    SLOT_DISPLAY_TYPE("slot_display_types", new GenericRegistryGenerator<>(BuiltInRegistries.SLOT_DISPLAY)),
+    RECIPE_BOOK_CATEGORY("recipe_book_categories", new GenericRegistryArrayGenerator<>(BuiltInRegistries.RECIPE_BOOK_CATEGORY)),
+    RECIPE_DISPLAY_TYPE("recipe_display_types", new GenericRegistryArrayGenerator<>(BuiltInRegistries.RECIPE_DISPLAY)),
+    RECIPE_TYPE("recipe_types", new GenericRegistryArrayGenerator<>(BuiltInRegistries.RECIPE_TYPE)),
+    SLOT_DISPLAY_TYPE("slot_display_types", new GenericRegistryArrayGenerator<>(BuiltInRegistries.SLOT_DISPLAY)),
     SOUND_SOURCES("sound_sources", new SoundSourceGenerator()),
-    VILLAGER_TYPES("villager_types", new GenericRegistryGenerator<>(BuiltInRegistries.VILLAGER_TYPE)),
+    VILLAGER_TYPES("villager_types", new GenericRegistryArrayGenerator<>(BuiltInRegistries.VILLAGER_TYPE)),
+    BLOCK_ENTITY_TYPES("block_entity_types", new GenericRegistryObjectGenerator<>(BuiltInRegistries.BLOCK_ENTITY_TYPE)),
 
     // Static registries
 

DataGenerator/src/main/java/net/minestom/generators/CommandArgumentGenerator.java

@@ -6,10 +6,10 @@
 import net.minestom.datagen.DataGenerator;
 import org.jetbrains.annotations.NotNull;
 
-public class GenericRegistryGenerator<T> extends DataGenerator {
+public class GenericRegistryArrayGenerator<T> extends DataGenerator {
     private final Registry<T> registry;
 
-    public GenericRegistryGenerator(@NotNull Registry<T> registry) {
+    public GenericRegistryArrayGenerator(@NotNull Registry<T> registry) {
         this.registry = registry;
     }
 

…generators/GenericRegistryGenerator.java …ators/GenericRegistryArrayGenerator.javaDataGenerator/src/main/java/net/minestom/generators/GenericRegistryGenerator.java renamed to DataGenerator/src/main/java/net/minestom/generators/GenericRegistryArrayGenerator.java DataGenerator/src/main/java/net/minestom/generators/GenericRegistryGenerator.java renamed to DataGenerator/src/main/java/net/minestom/generators/GenericRegistryArrayGenerator.java

@@ -0,0 +1,35 @@
+package net.minestom.generators;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import net.minecraft.core.Registry;
+import net.minestom.datagen.DataGenerator;
+import org.jetbrains.annotations.NotNull;
+
+public class GenericRegistryObjectGenerator<T> extends DataGenerator {
+    private final Registry<T> registry;
+
+    public GenericRegistryObjectGenerator(@NotNull Registry<T> registry) {
+        this.registry = registry;
+    }
+
+    @Override
+    public JsonObject generate() {
+        JsonObject output = new JsonObject();
+
+        for (T entry : registry) {
+            JsonObject result = new JsonObject();
+
+            result.addProperty("id", registry.getId(entry));
+            appendEntry(result, entry);
+
+            //noinspection DataFlowIssue We got `entry` from the registry, it is not null.
+            output.add(registry.getKey(entry).toString(), result);
+        }
+
+        return output;
+    }
+
+    protected void appendEntry(JsonObject object, T entry) {
+    }
+}

DataGenerator/src/main/java/net/minestom/generators/GenericRegistryObjectGenerator.java

@@ -46,13 +46,6 @@ public JsonObject generate() {
                 itemJson.addProperty("correspondingBlock", blockRegistry.getKey(block).toString());
             }
 
-            // Spawn egg properties
-            if (item instanceof SpawnEggItem spawnEggItem) {
-                JsonObject spawnEggProperties = new JsonObject();
-                spawnEggProperties.addProperty("entityType", entityTypeRegistry.getKey(spawnEggItem.getType(ItemStack.EMPTY)).toString());
-                itemJson.add("spawnEggProperties", spawnEggProperties);
-            }
-
             items.add(location.toString(), itemJson);
         }
         return items;