1.21.2 (#31)

* feat: 1.21.2 initial changes. armor represented as components yay

* feat: rc1, generate slot display types

* feat: gen recipe display and recipe book categories

* feat: consume effect generation

* chore: 1.21.2

Author: mworzala

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

@@ -1,5 +1,7 @@
 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;
@@ -31,7 +33,11 @@ public enum DataGenType {
     SOUND_SOURCES("sound_sources", new SoundSourceGenerator()),
     VILLAGER_PROFESSIONS("villager_professions", new VillagerProfessionGenerator()),
     VILLAGER_TYPES("villager_types", new VillagerTypeGenerator()),
-    RECIPE_TYPE("recipe_types", new RecipeTypeGenerator()),
+    RECIPE_TYPE("recipe_types", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_TYPE)),
+    RECIPE_DISPLAY_TYPE("recipe_display_types", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_DISPLAY)),
+    SLOT_DISPLAY_TYPE("slot_display_types", new GenericRegistryGenerator<>(BuiltInRegistries.SLOT_DISPLAY)),
+    RECIPE_BOOK_CATEGORY("recipe_book_categories", new GenericRegistryGenerator<>(BuiltInRegistries.RECIPE_BOOK_CATEGORY)),
+    CONSUME_EFFECT("consume_effects", new GenericRegistryGenerator<>(BuiltInRegistries.CONSUME_EFFECT_TYPE)),
 
     // Tags are specified as a special case in datagen
 
@@ -45,6 +51,7 @@ public enum DataGenType {
     ENCHANTMENTS("enchantments", new GenericResourceGenerator("enchantment", List.of(), true)),
     PAINTING_VARIANTS("painting_variants", new GenericResourceGenerator("painting_variant")),
     JUKEBOX_SONGS("jukebox_songs", new GenericResourceGenerator("jukebox_song")),
+    INSTRUMENTS("instruments", new GenericResourceGenerator("instrument")),
 
     BLOCK_LOOT_TABLES("loot_tables/block_loot_tables", new BlockLootTableGenerator()),
     CHEST_LOOT_TABLES("loot_tables/chest_loot_tables", new ChestLootTableGenerator()),

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

@@ -57,7 +57,7 @@ public JsonObject generate() {
 
                 // There are only XY and XYZ offset functions, so we simply execute the offset func
                 // and check if the Y value is 0. It is seeded to the coordinates, so it should be reliable.
-                var result = defaultBlockState.getOffset(EmptyBlockGetter.INSTANCE, new BlockPos(42, 42, 42));
+                var result = defaultBlockState.getOffset(new BlockPos(42, 42, 42));
                 if (result.y != 0) {
                     blockJson.addProperty("maxVerticalOffset", BlockBehaviourHack.getMaxVerticalOffset(block));
                 }
@@ -151,7 +151,7 @@ private void writeState(ResourceLocation location, Block block, BlockState block
         appendState(blockJson, state, "shape", blockState.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).toAabbs().toString(), String.class);
         appendState(blockJson, state, "collisionShape", blockState.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).toAabbs().toString(), String.class);
         appendState(blockJson, state, "interactionShape", blockState.getInteractionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).toAabbs().toString(), String.class);
-        appendState(blockJson, state, "occlusionShape", blockState.getOcclusionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).toAabbs().toString(), String.class);
+        appendState(blockJson, state, "occlusionShape", blockState.getOcclusionShape().toAabbs().toString(), String.class);
         appendState(blockJson, state, "visualShape", blockState.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty()).toAabbs().toString(), String.class);
 
         // Redstone bits

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

@@ -107,7 +107,7 @@ public JsonObject generate() {
     }
 
     private double findDrag(EntityType<?> entityType) {
-        if (entityType == EntityType.BOAT) return 0;
+        if (isBoat(entityType)) return 0;
 
         if (entityType == EntityType.LLAMA_SPIT) return 0.01;
         if (entityType == EntityType.ENDER_PEARL) return 0.01;
@@ -133,7 +133,7 @@ private double findAcceleration(EntityType<?> entityType) {
         if (entityType == EntityType.ENDER_PEARL) return 0.03;
         if (entityType == EntityType.SNOWBALL) return 0.03;
 
-        if (entityType == EntityType.BOAT) return 0.04;
+        if (isBoat(entityType)) return 0.04;
         if (entityType == EntityType.TNT) return 0.04;
         if (entityType == EntityType.FALLING_BLOCK) return 0.04;
         if (entityType == EntityType.ITEM) return 0.04;
@@ -164,4 +164,8 @@ private double findAcceleration(EntityType<?> entityType) {
             throw new RuntimeException(e);
         }
     }
+
+    private static boolean isBoat(@NotNull EntityType<?> entityType) {
+        return BuiltInRegistries.ENTITY_TYPE.getKey(entityType).toString().contains("boat");
+    }
 }

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

@@ -0,0 +1,36 @@
+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 GenericRegistryGenerator<T> extends DataGenerator {
+    private final Registry<T> registry;
+
+    public GenericRegistryGenerator(@NotNull Registry<T> registry) {
+        this.registry = registry;
+    }
+
+    @Override
+    public JsonArray generate() {
+        JsonArray output = new JsonArray();
+
+        for (T entry : registry) {
+            JsonObject result = new JsonObject();
+
+            result.addProperty("id", registry.getId(entry));
+            //noinspection DataFlowIssue We got `entry` from the registry, it is not null.
+            result.addProperty("name", registry.getKey(entry).toString());
+            appendEntry(result, entry);
+
+            output.add(result);
+        }
+
+        return output;
+    }
+
+    protected void appendEntry(JsonObject object, T entry) {
+    }
+}

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

@@ -59,15 +59,6 @@ public JsonObject generate() {
                 itemJson.addProperty("correspondingBlock", blockRegistry.getKey(block).toString());
             }
 
-            // Armor properties (which aren't components still??)
-            if (item instanceof ArmorItem armorItem) {
-                JsonObject armorProperties = new JsonObject();
-                armorProperties.addProperty("defense", armorItem.getDefense());
-                armorProperties.addProperty("toughness", armorItem.getToughness());
-                armorProperties.addProperty("slot", armorItem.getEquipmentSlot().getName());
-                itemJson.add("armorProperties", armorProperties);
-            }
-
             // Spawn egg properties
             if (item instanceof SpawnEggItem spawnEggItem) {
                 JsonObject spawnEggProperties = new JsonObject();

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

@@ -2,7 +2,7 @@ metadata.format.version = "1.1"
 
 [versions]
 gson = "2.10.1"
-minecraft = "1.21"
+minecraft = "1.21.2"
 
 slf4j-api = "2.0.7"
 logback = "1.4.5"