1.21.11 (#50)

Author: mworzala

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

@@ -22,7 +22,21 @@ public class DataGen {
     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", "dialog", "damage_type", "enchantment", "entity_type", "fluid", "game_event", "instrument", "item", "painting_variant", "worldgen/biome");
+    private static final List<String> TAG_TYPES = List.of(
+        "banner_pattern",
+        "block",
+        "dialog",
+        "damage_type",
+        "enchantment",
+        "entity_type",
+        "fluid",
+        "game_event",
+        "instrument",
+        "item",
+        "painting_variant",
+        "worldgen/biome",
+        "timeline"
+    );
 
     public static void main(String[] args) throws Exception {
         if (args.length > 0) {

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

@@ -46,7 +46,7 @@ public enum DataGenType {
     // Dynamic Registries
 
     BANNER_PATTERNS("banner_pattern", new GenericResourceGenerator("banner_pattern")),
-    BIOMES("worldgen/biome", new BiomeGenerator()),
+    BIOMES("worldgen/biome", new GenericResourceGenerator("worldgen/biome")),
     CAT_VARIANTS("cat_variant", new GenericResourceGenerator("cat_variant")),
     CHAT_TYPES("chat_type", new GenericResourceGenerator("chat_type")),
     CHICKEN_VARIANTS("chicken_variant", new GenericResourceGenerator("chicken_variant")),
@@ -60,10 +60,12 @@ public enum DataGenType {
     INSTRUMENTS("instrument", new GenericResourceGenerator("instrument")),
     PAINTING_VARIANTS("painting_variant", new GenericResourceGenerator("painting_variant")),
     PIG_VARIANTS("pig_variant", new GenericResourceGenerator("pig_variant")),
+    TIMELINE("timeline", new GenericResourceGenerator("timeline")),
     TRIM_MATERIALS("trim_material", new GenericResourceGenerator("trim_material")),
     TRIM_PATTERNS("trim_pattern", new GenericResourceGenerator("trim_pattern")),
     WOLF_VARIANTS("wolf_variant", new GenericResourceGenerator("wolf_variant")),
     WOLF_SOUND_VARIANTS("wolf_sound_variant", new GenericResourceGenerator("wolf_sound_variant")),
+    ZOMBIE_NAUTILUS_VARIANTS("zombie_nautilus_variant", new GenericResourceGenerator("zombie_nautilus_variant")),
 
     // Loot tables (only included for legacy reasons, Minestom doesn't use them)
 

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

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.EmptyBlockGetter;
 import net.minecraft.world.level.block.*;
@@ -137,7 +137,7 @@ private Map<String, SoundType> getBlockSoundTypeList() {
         return soundTypes;
     }
 
-    private void writeState(ResourceLocation location, Block block, Map<String, SoundType> soundTypes, BlockState blockState, JsonObject blockJson, JsonObject state) {
+    private void writeState(Identifier location, Block block, Map<String, SoundType> soundTypes, BlockState blockState, JsonObject blockJson, JsonObject state) {
         // Data
         appendState(blockJson, state, "canRespawnIn", block.isPossibleToRespawnInThis(blockState), boolean.class);
         appendState(blockJson, state, "hardness", blockState.getDestroySpeed(EmptyBlockGetter.INSTANCE, BlockPos.ZERO), float.class);

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

@@ -9,7 +9,7 @@
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.DefaultAttributes;
-import net.minecraft.world.entity.decoration.Painting;
+import net.minecraft.world.entity.decoration.painting.Painting;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
 import net.minestom.datagen.DataGenerator;

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

@@ -1,8 +1,7 @@
 package net.minestom.generators;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.flag.FeatureFlags;
 import net.minestom.datagen.DataGenerator;
 
@@ -13,9 +12,9 @@ public final class FeatureFlagGenerator extends DataGenerator {
     public JsonObject generate() throws Exception {
         JsonObject flags = new JsonObject();
 
-        Set<ResourceLocation> featureFlags = FeatureFlags.REGISTRY.toNames(FeatureFlags.REGISTRY.allFlags());
+        Set<Identifier> featureFlags = FeatureFlags.REGISTRY.toNames(FeatureFlags.REGISTRY.allFlags());
         int idCounter = 0;
-        for (ResourceLocation namespace : featureFlags) {
+        for (Identifier namespace : featureFlags) {
             JsonObject flag = new JsonObject();
             flag.addProperty("id", idCounter++);
             flags.add(namespace.toString(), flag);

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

@@ -3,12 +3,10 @@
 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.resources.RegistryOps;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.util.Util;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minestom.datagen.DataGenerator;

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

@@ -2,7 +2,7 @@
 
 import com.google.gson.JsonObject;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 import net.minestom.datagen.DataGenerator;
 
@@ -18,7 +18,7 @@ public JsonObject generate() {
             villagerProfessionJson.addProperty("id", registry.getId(villagerProfession));
             SoundEvent workSound = villagerProfession.workSound();
             if (workSound != null) {
-                ResourceLocation workSoundRL = soundEventRegistry.getKey(workSound);
+                Identifier workSoundRL = soundEventRegistry.getKey(workSound);
                 if (workSoundRL != null) {
                     villagerProfessionJson.addProperty("workSound", workSoundRL.toString());
                 }

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

@@ -2,7 +2,7 @@ metadata.format.version = "1.1"
 
 [versions]
 gson = "2.13.2"
-minecraft = "1.21.10"
+minecraft = "1.21.11"
 
 slf4j-api = "2.0.17"
 logback = "1.5.19"