1.21.5 (#42)

* feat: 1.21.5 new registries

* feat: remove special handling for enchantments, serialize items as json, do not pretty print

* 1.21.5 final

Author: mworzala

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

@@ -1,8 +1,11 @@
 package net.minestom.datagen;
 
+import com.google.common.hash.Hashing;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
+import com.mojang.serialization.Codec;
+import net.minecraft.util.HashOps;
 import net.minestom.generators.tags.GenericTagGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +18,7 @@
 import java.util.List;
 
 public class DataGen {
-    public static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+    public static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create();
     private static final Logger LOGGER = LoggerFactory.getLogger(DataGen.class);
     private static Path OUTPUT = Path.of("../MinestomData/");
 

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

@@ -50,10 +50,16 @@ public enum DataGenType {
     WOLF_VARIANTS("wolf_variants", new GenericResourceGenerator("wolf_variant")),
     TRIM_MATERIALS("trim_materials", new GenericResourceGenerator("trim_material")),
     TRIM_PATTERNS("trim_patterns", new GenericResourceGenerator("trim_pattern")),
-    ENCHANTMENTS("enchantments", new GenericResourceGenerator("enchantment", List.of(), true)),
+    ENCHANTMENTS("enchantments", new GenericResourceGenerator("enchantment")),
     PAINTING_VARIANTS("painting_variants", new GenericResourceGenerator("painting_variant")),
     JUKEBOX_SONGS("jukebox_songs", new GenericResourceGenerator("jukebox_song")),
     INSTRUMENTS("instruments", new GenericResourceGenerator("instrument")),
+    CAT_VARIANTS("cat_variants", new GenericResourceGenerator("cat_variant")),
+    CHICKEN_VARIANTS("chicken_variants", new GenericResourceGenerator("chicken_variant")),
+    COW_VARIANTS("cow_variants", new GenericResourceGenerator("cow_variant")),
+    FROG_VARIANTS("frog_variants", new GenericResourceGenerator("frog_variant")),
+    PIG_VARIANTS("pig_variants", new GenericResourceGenerator("pig_variant")),
+    WOLF_SOUND_VARIANTS("wolf_sound_variants", new GenericResourceGenerator("wolf_sound_variant")),
 
     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/EntityGenerator.java

@@ -111,7 +111,7 @@ private double findDrag(EntityType<?> entityType) {
 
         if (entityType == EntityType.LLAMA_SPIT) return 0.01;
         if (entityType == EntityType.ENDER_PEARL) return 0.01;
-        if (entityType == EntityType.POTION) return 0.01;
+        if (entityType == EntityType.SPLASH_POTION || entityType == EntityType.LINGERING_POTION) return 0.01;
         if (entityType == EntityType.SNOWBALL) return 0.01;
         if (entityType == EntityType.EGG) return 0.01;
         if (entityType == EntityType.TRIDENT) return 0.01;
@@ -142,7 +142,7 @@ private double findAcceleration(EntityType<?> entityType) {
         if (entityType == EntityType.ARROW) return 0.05;
         if (entityType == EntityType.SPECTRAL_ARROW) return 0.05;
         if (entityType == EntityType.TRIDENT) return 0.05;
-        if (entityType == EntityType.POTION) return 0.05;
+        if (entityType == EntityType.SPLASH_POTION || entityType == EntityType.LINGERING_POTION) return 0.05;
 
         if (entityType == EntityType.LLAMA_SPIT) return 0.06;
 

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

@@ -2,29 +2,18 @@
 
 import com.google.gson.JsonObject;
 import com.mojang.serialization.DataResult;
+import com.mojang.serialization.JsonOps;
 import net.minecraft.Util;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.data.structures.NbtToSnbt;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.nbt.SnbtPrinterTagVisitor;
-import net.minecraft.nbt.Tag;
-import net.minecraft.resources.RegistryFixedCodec;
 import net.minecraft.resources.RegistryOps;
-import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.SpawnEggItem;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minestom.datagen.DataGenerator;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.util.ArrayList;
-import java.util.Base64;
-
 public final class MaterialGenerator extends DataGenerator {
     @Override
     public JsonObject generate() {
@@ -34,7 +23,7 @@ public JsonObject generate() {
         var entityTypeRegistry = BuiltInRegistries.ENTITY_TYPE;
 
         var registryAccess = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY);
-        var registryNbtOps = RegistryOps.create(NbtOps.INSTANCE, registryAccess);
+        var registryJsonOps = RegistryOps.create(JsonOps.INSTANCE, registryAccess);
 
         for (var item : registry) {
             final var location = registry.getKey(item);
@@ -47,9 +36,7 @@ public JsonObject generate() {
             var components = new JsonObject();
             for (var component : item.components()) {
                 var key = Util.getRegisteredName(BuiltInRegistries.DATA_COMPONENT_TYPE, component.type());
-                Tag t = unwrap(component.encodeValue(registryNbtOps));
-                var result = new SnbtPrinterTagVisitor("", 0, new ArrayList<>()).visit(t);
-                components.addProperty(key, result);
+                components.add(key, unwrap(component.encodeValue(registryJsonOps)));
             }
             itemJson.add("components", components);
 

gradle/libs.versions.toml

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