Update to Minestom 1.21.8

- Move to new tag and registry system

Author: lantice3720

blocks/src/main/java/net/minestom/vanilla/blocks/behaviours/JukeboxBlockBehaviour.java

@@ -12,7 +12,7 @@
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.instance.block.jukebox.JukeboxSong;
 import net.minestom.server.item.ItemStack;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.tag.Tag;
 import net.minestom.server.worldevent.WorldEvent;
 import net.minestom.vanilla.blocks.VanillaBlockBehaviour;
@@ -84,8 +84,7 @@ public boolean onInteract(@NotNull Interaction interaction) {
 
         InventoryManipulation.consumeItemIfNotCreative(player, heldItem, hand);
 
-        JukeboxSong song = heldItem.get(DataComponents.JUKEBOX_PLAYABLE).holder().resolve(MinecraftServer.getJukeboxSongRegistry());
-        DynamicRegistry.Key<JukeboxSong> songKey = MinecraftServer.getJukeboxSongRegistry().getKey(song);
+        RegistryKey<JukeboxSong> songKey = heldItem.get(DataComponents.JUKEBOX_PLAYABLE);
         int songId = MinecraftServer.getJukeboxSongRegistry().getId(songKey);
 
         // TODO: Group packet?

core/src/main/java/net/minestom/vanilla/utils/MinestomUtils.java

@@ -1,5 +1,6 @@
 package net.minestom.vanilla.utils;
 
+import net.kyori.adventure.key.Key;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.component.DataComponents;
 import net.minestom.server.entity.EntityType;
@@ -31,7 +32,15 @@ public static int getEnchantLevel(ItemStack itemStack, Enchantment enchantment,
         return enchants.level(enchant);
     }
 
+    public static int getEnchantLevel(ItemStack itemStack, Key enchantment, int defaultValue) {
+        return getEnchantLevel(itemStack, MinecraftServer.getEnchantmentRegistry().get(enchantment), defaultValue);
+    }
+
     public static RegistryKey<Enchantment> getEnchantKey(Enchantment enchantment) {
         return MinecraftServer.getEnchantmentRegistry().getKey(enchantment);
     }
+
+    public static RegistryKey<Enchantment> getEnchantKey(Key enchantment) {
+        return getEnchantKey(MinecraftServer.getEnchantmentRegistry().get(enchantment));
+    }
 }

datapack-loading/src/main/java/net/minestom/vanilla/datapack/loot/function/InBuiltLootFunctions.java

@@ -20,7 +20,7 @@
 import net.minestom.server.item.component.AttributeList;
 import net.minestom.server.item.component.EnchantmentList;
 import net.minestom.server.item.enchant.Enchantment;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.vanilla.datapack.DatapackLoader;
 import net.minestom.vanilla.datapack.json.JsonUtils;
 import net.minestom.vanilla.datapack.loot.LootTable;
@@ -793,7 +793,7 @@ public ItemStack apply(Context context) {
                 Enchantment enchantment = entry.getKey();
                 int count = entry.getValue().asInt().apply(context::random);
 
-                DynamicRegistry.Key<Enchantment> key = MinestomUtils.getEnchantKey(enchantment);
+                RegistryKey<Enchantment> key = MinestomUtils.getEnchantKey(enchantment);
 
                 if (add) {
                     int previousValue = list.has(key) ? list.level(key) : 0;

datapack-loading/src/main/java/net/minestom/vanilla/datapack/loot/function/InBuiltPredicates.java

@@ -9,7 +9,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.component.EnchantmentList;
 import net.minestom.server.item.enchant.Enchantment;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.vanilla.datapack.DatapackLoader;
 import net.minestom.vanilla.datapack.json.JsonUtils;
 import net.minestom.vanilla.datapack.json.Optional;
@@ -362,7 +362,7 @@ public String condition() {
         public boolean test(LootContext context) {
             ItemStack item = context.getOrThrow(LootContext.TOOL);
             EnchantmentList enchants = item.get(DataComponents.ENCHANTMENTS);
-            DynamicRegistry.Key<Enchantment> enchantment = MinestomUtils.getEnchantKey(this.enchantment);
+            RegistryKey<Enchantment> enchantment = MinestomUtils.getEnchantKey(this.enchantment);
             int level = enchants == null || !enchants.has(enchantment) ? 0 : enchants.level(enchantment);
 
             return ThreadLocalRandom.current().nextFloat() < chances.get(level);

fluid-simulation/src/main/java/io/github/togar2/fluids/FlowableFluid.java

@@ -2,13 +2,11 @@
 
 import it.unimi.dsi.fastutil.shorts.Short2BooleanMap;
 import it.unimi.dsi.fastutil.shorts.Short2BooleanOpenHashMap;
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Point;
-import net.minestom.server.gamedata.tags.Tag;
-import net.minestom.server.gamedata.tags.TagManager;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.Material;
+import net.minestom.server.registry.TagKey;
 import net.minestom.server.utils.Direction;
 
 import java.util.EnumMap;
@@ -242,7 +240,6 @@ private int getAdjacentSourceCount(Instance instance, Point point) {
      */
     private boolean canFill(Instance instance, Point point, Block block, Block flowing) {
         //TODO check waterloggable
-        TagManager tags = MinecraftServer.getTagManager();
         if (block.compare(Block.LADDER)
                 || block.compare(Block.SUGAR_CANE)
                 || block.compare(Block.BUBBLE_COLUMN)
@@ -254,7 +251,7 @@ private boolean canFill(Instance instance, Point point, Block block, Block flowi
                 || block.compare(Block.SEAGRASS)
                 || block.compare(Block.TALL_SEAGRASS)
                 || block.compare(Block.SEA_PICKLE)
-                || Objects.requireNonNull(tags.getTag(Tag.BasicType.BLOCKS, "minecraft:signs")).contains(block.key())
+                || Objects.requireNonNull(Block.staticRegistry().getTag(TagKey.ofHash("#minecraft:all_signs"))).contains(Objects.requireNonNull(block.asKey()))
                 || block.name().contains("door")
                 || block.name().contains("coral")) {
             return false;

gradle.properties

@@ -1,4 +1,4 @@
-minestom_version=2025.07.04-1.21.5
+minestom_version=2025.08.29-1.21.8
 rayfast_version=684e854a48
 jnoise_version=4.0.0
 annotations_version=23.0.0

items/src/main/java/net/minestom/vanilla/items/FlintAndSteelHandler.java

@@ -40,6 +40,7 @@ public boolean onUseOnBlock(PlayerUseItemOnBlockEvent event) {
             // BlockFace blockFace, float cursorX, float cursorY, float cursorZ
             instance.placeBlock(new BlockHandler.PlayerPlacement(
                     Block.FIRE,
+                    atFirePosition,
                     instance,
                     firePosition,
                     player,