1.21-rc1 (#26)

* feat: 1.21 new dynamic registries, new tag paths, generate game constants

* chore: 1.21-pre2

* feat: generate all tags from client, 1.21-rc1, support generating snbt

Author: mworzala

DataGenerator/build.gradle.kts

@@ -12,10 +12,6 @@ apply {
 group = "net.minestom"
 version = rootProject.version
 
-//repositories {
-//    mavenCentral()
-//}
-
 dependencies {
     implementation(libs.gson)
     implementation(libs.bundles.logging)

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

@@ -2,6 +2,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import net.minestom.generators.tags.GenericTagGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,12 +12,15 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.List;
 
 public class DataGen {
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
     private static final Logger LOGGER = LoggerFactory.getLogger(DataGen.class);
     private static Path OUTPUT = Path.of("../MinestomData/");
 
+    private static final List<String> TAG_TYPES = List.of("banner_pattern", "block", "cat_variant", "damage_type", "enchantment", "entity_type", "fluid", "game_event", "instrument", "item", "painting_variant", "worldgen/biome");
+
     public static void main(String[] args) throws Exception {
         if (args.length > 0) {
             OUTPUT = Path.of(args[0]);
@@ -26,26 +31,38 @@ public static void main(String[] args) throws Exception {
 
         LOGGER.info("Generation starting...");
         for (var type : DataGenType.values()) {
-            generate(type, type.getGenerator());
+            generate(type.getFileName(), type.getGenerator());
+        }
+        for (var tag : TAG_TYPES) {
+            if (tag.contains("/")) { // Slice off worldgen from worldgen/biome
+                tag = tag.substring(tag.lastIndexOf("/") + 1);
+            }
+            generate("tags/" + tag, new GenericTagGenerator(tag));
         }
         LOGGER.info("Generation done!");
     }
 
-    public static void generate(DataGenType type, DataGenerator generator) {
-        final var path = OUTPUT.resolve(type.getFileName() + ".json");
+    public static void generate(String fileName, DataGenerator generator) {
         try {
+            Object result = generator.generate();
+            final var path = OUTPUT.resolve(fileName + (result instanceof JsonElement ? ".json" : ".snbt"));
+
             // Ensure that the directory exists
             if (!Files.exists(path)) {
                 Files.createDirectories(path.getParent());
             }
             try (BufferedWriter writer = Files.newBufferedWriter(path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
                 try {
-                    GSON.toJson(generator.generate(), writer);
+                    if (result instanceof JsonElement) {
+                        GSON.toJson(result, writer);
+                    } else {
+                        writer.write(result.toString());
+                    }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

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

@@ -10,13 +10,14 @@
 import java.util.List;
 
 public enum DataGenType {
+    CONSTANTS("constants", new MinecraftConstantGenerator()),
+
     ATTRIBUTES("attributes", new AttributeGenerator()),
     BIOMES("biomes", new BiomeGenerator()),
     BLOCKS("blocks", new BlockGenerator()),
     COMMAND_ARGUMENTS("command_arguments", new CommandArgumentGenerator()),
     CUSTOM_STATISTICS("custom_statistics", new CustomStatisticGenerator()),
     DYE_COLORS("dye_colors", new DyeColorGenerator()),
-    ENCHANTMENTS("enchantments", new EnchantmentGenerator()),
     ENTITIES("entities", new EntityGenerator()),
     FLUIDS("fluids", new FluidGenerator()),
     GAME_EVENTS("game_events", new GameEventGenerator()),
@@ -31,11 +32,7 @@ public enum DataGenType {
     VILLAGER_TYPES("villager_types", new VillagerTypeGenerator()),
     RECIPE_TYPE("recipe_types", new RecipeTypeGenerator()),
 
-    BLOCK_TAGS("tags/block_tags", new BlockTagGenerator()),
-    ENTITY_TYPE_TAGS("tags/entity_type_tags", new EntityTypeTagGenerator()),
-    FLUID_TAGS("tags/fluid_tags", new FluidTagGenerator()),
-    GAMEEVENT_TAGS("tags/gameplay_tags", new GameEventTagGenerator()),
-    ITEM_TAGS("tags/item_tags", new ItemTagGenerator()),
+    // Tags are specified as a special case in datagen
 
     DIMENSION_TYPES("dimension_types", new GenericResourceGenerator("dimension_type")),
     CHAT_TYPES("chat_types", new GenericResourceGenerator("chat_type")),
@@ -44,6 +41,9 @@ 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)),
+    PAINTING_VARIANTS("painting_variants", new GenericResourceGenerator("painting_variant")),
+    JUKEBOX_SONGS("jukebox_songs", new GenericResourceGenerator("jukebox_song")),
 
     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/datagen/DataGenerator.java

@@ -1,6 +1,5 @@
 package net.minestom.datagen;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import net.minecraft.SharedConstants;
@@ -40,7 +39,7 @@ public abstract class DataGenerator {
         }
     }
 
-    public abstract JsonElement generate() throws Exception;
+    public abstract Object/*JsonElement, String*/ generate() throws Exception;
 
     protected void addDefaultable(JsonObject jsonObject, String key, boolean value, boolean defaultValue) {
         if (value != defaultValue) jsonObject.addProperty(key, value);

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

@@ -14,7 +14,7 @@ public JsonArray generate() {
             JsonObject dyeColor = new JsonObject();
             dyeColor.addProperty("id", dC.getId());
             dyeColor.addProperty("name", dC.name());
-            dyeColor.addProperty("textureDiffuseColor", convertTextureDiffuseColors(dC.getTextureDiffuseColors()));
+            dyeColor.addProperty("textureDiffuseColor", dC.getTextureDiffuseColor() & 0xFFFFFF);
             dyeColor.addProperty("textColor", dC.getTextColor());
             dyeColor.addProperty("fireworkColor", dC.getFireworkColor());
             dyeColor.addProperty("mapColorId", dC.getMapColor().id);
@@ -23,11 +23,4 @@ public JsonArray generate() {
         return dyeColors;
     }
 
-
-    private static int convertTextureDiffuseColors(float[] colorArray) {
-        int red = Math.round(colorArray[0] * 255.0f) << 16;
-        int green = Math.round(colorArray[1] * 255.0f) << 8;
-        int blue = Math.round(colorArray[2] * 255.0f);
-        return red + green + blue;
-    }
 }

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

@@ -3,31 +3,41 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.SnbtPrinterTagVisitor;
+import net.minecraft.nbt.Tag;
 import net.minestom.datagen.DataGenerator;
 import net.minestom.utils.ResourceUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
+import java.util.function.Function;
 
 public class GenericResourceGenerator extends DataGenerator {
 
     private static final Gson gson = new Gson();
 
     private final String name;
     private final List<String> exclusions;
+    private final boolean snbt;
 
     public GenericResourceGenerator(@NotNull String name) {
-        this(name, List.of());
+        this(name, List.of(), false);
     }
 
-    public GenericResourceGenerator(@NotNull String name, @NotNull List<String> exclusions) {
+    public GenericResourceGenerator(@NotNull String name, @NotNull List<String> exclusions, boolean snbt) {
         this.name = "data/minecraft/" + name + "/";
         this.exclusions = exclusions;
+        this.snbt = snbt;
     }
 
     @Override
-    public JsonElement generate() throws Exception {
+    public Object generate() throws Exception {
         var result = new JsonObject();
 
         // get all files from the damage types directory
@@ -49,10 +59,28 @@ public JsonElement generate() throws Exception {
                 var key = "minecraft:" + fileName.substring(0, fileName.length() - 5);
                 var jsonObject = gson.fromJson(content.toString(), JsonObject.class);
                 exclusions.forEach(jsonObject::remove);
+
                 result.add(key, jsonObject);
             }
         }
 
+        if (snbt) {
+            Tag tag = Dynamic.convert(JsonOps.INSTANCE, NbtOps.INSTANCE, result);
+            return new SnbtPrinterTagVisitor("    ", 0, new ArrayList<>()).visit(tag);
+        }
         return result;
     }
+
+
+    private @Nullable Function<JsonObject, JsonObject> transformer() {
+        if (name.contains("enchantment")) {
+            return obj -> {
+                JsonObject result = new JsonObject();
+                Tag tag = Dynamic.convert(JsonOps.INSTANCE, NbtOps.INSTANCE, obj);
+                var snbt = new SnbtPrinterTagVisitor("", 0, new ArrayList<>()).visit(tag);
+                result.addProperty("raw", snbt);
+                return result;
+            };
+        } else return null;
+    }
 }

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

@@ -0,0 +1,24 @@
+package net.minestom.generators;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.minecraft.SharedConstants;
+import net.minecraft.server.packs.PackType;
+import net.minestom.datagen.DataGenerator;
+
+public class MinecraftConstantGenerator extends DataGenerator {
+
+    @Override
+    public JsonElement generate() throws Exception {
+        var version = SharedConstants.getCurrentVersion();
+        JsonObject obj = new JsonObject();
+        obj.addProperty("name", version.getId());
+        obj.addProperty("friendly_name", version.getName());
+        obj.addProperty("protocol", version.getProtocolVersion());
+        obj.addProperty("world", version.getDataVersion().getVersion());
+        obj.addProperty("resourcepack", version.getPackVersion(PackType.CLIENT_RESOURCES));
+        obj.addProperty("datapack", version.getPackVersion(PackType.SERVER_DATA));
+        return obj;
+    }
+
+}