Update Minestom to latest version

buildSrc/src/main/kotlin/Versions.kt

@@ -87,6 +87,6 @@ object Versions {
     }
 
     object Minestom {
-        const val minestom = "1_21_5-4d91778331"
+        const val minestom = "1_21_5-1e8b8693ac"
     }
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java

@@ -2,17 +2,17 @@
 
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.world.biome.Biome;
 
 
 public class MinestomBiome implements PlatformBiome {
-    private final DynamicRegistry.Key<Biome> biome;
+    private final RegistryKey<Biome> biome;
 
-    public MinestomBiome(DynamicRegistry.Key<Biome> biome) { this.biome = biome; }
+    public MinestomBiome(RegistryKey<Biome> biome) { this.biome = biome; }
 
     @Override
-    public DynamicRegistry.Key<Biome> getHandle() {
+    public RegistryKey<Biome> getHandle() {
         return biome;
     }
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java

@@ -8,7 +8,7 @@
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 
 import net.kyori.adventure.key.Key;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import org.intellij.lang.annotations.Subst;
 import org.jetbrains.annotations.NotNull;
 
@@ -21,6 +21,6 @@ public PlatformBiome load(@NotNull AnnotatedType annotatedType, @NotNull Object
         @Subst("name:value")
         String id = (String) o;
         Key key = Key.key(id);
-        return new MinestomBiome(DynamicRegistry.Key.of(key));
+        return new MinestomBiome(RegistryKey.unsafeOf(key));
     }
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java

@@ -8,6 +8,7 @@
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.color.Color;
 import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.world.biome.Biome;
 import net.minestom.server.world.biome.BiomeEffects;
 import org.intellij.lang.annotations.Subst;
@@ -24,7 +25,7 @@ public class MinestomUserDefinedBiomeFactory implements BiomeFactory {
     @Override
     public UserDefinedBiome create(ConfigPack pack, com.dfsek.terra.api.world.biome.Biome source) {
         VanillaBiomeProperties properties = source.getContext().get(VanillaBiomeProperties.class);
-        DynamicRegistry.Key<Biome> parentKey = ((MinestomBiome) source.getPlatformBiome()).getHandle();
+        RegistryKey<Biome> parentKey = ((MinestomBiome) source.getPlatformBiome()).getHandle();
         Biome parent = mergeNullable(biomeRegistry.get(parentKey), plainsBiome);
         BiomeEffects parentEffects = parent.effects();
         Key key = Key.key("terra", createBiomeID(pack, source.getID()));
@@ -57,7 +58,7 @@ public UserDefinedBiome create(ConfigPack pack, com.dfsek.terra.api.world.biome.
             .effects(effectsBuilder.build())
             .build();
 
-        DynamicRegistry.Key<Biome> registryKey = MinecraftServer.getBiomeRegistry().register(key, target);
+        RegistryKey<Biome> registryKey = MinecraftServer.getBiomeRegistry().register(key, target);
         return new UserDefinedBiome(key, registryKey, source.getID(), target);
     }
 

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/UserDefinedBiome.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.minestom.biome;
 
 import net.kyori.adventure.key.Key;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.world.biome.Biome;
 
 
-public record UserDefinedBiome(Key key, DynamicRegistry.Key<Biome> registry, String id, Biome biome) {
+public record UserDefinedBiome(Key key, RegistryKey<Biome> registry, String id, Biome biome) {
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java

@@ -7,6 +7,7 @@
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.item.Material;
 import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 
 import java.util.Objects;
 
@@ -40,7 +41,7 @@ public boolean conflictsWith(Enchantment other) {
         // Get the registry key for the other enchantment to use in contains
         try {
             DynamicRegistry<net.minestom.server.item.enchant.Enchantment> registry = MinecraftServer.getEnchantmentRegistry();
-            DynamicRegistry.Key<net.minestom.server.item.enchant.Enchantment> otherKey = registry.getKey(otherDelegate);
+            RegistryKey<net.minestom.server.item.enchant.Enchantment> otherKey = registry.getKey(otherDelegate);
             return delegate.exclusiveSet().contains(otherKey);
         } catch (Exception e) {
             // If the key approach fails, fall back to a more basic implementation

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java

@@ -10,7 +10,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.component.EnchantmentList;
 import net.minestom.server.registry.DynamicRegistry;
-import net.minestom.server.registry.DynamicRegistry.Key;
+import net.minestom.server.registry.RegistryKey;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
@@ -59,7 +59,7 @@ public ItemMeta getItemMeta() {
 
     @Override
     public void setItemMeta(ItemMeta meta) {
-        HashMap<Key<net.minestom.server.item.enchant.Enchantment>, Integer> enchantments = new HashMap<>();
+        HashMap<RegistryKey<net.minestom.server.item.enchant.Enchantment>, Integer> enchantments = new HashMap<>();
         DynamicRegistry<net.minestom.server.item.enchant.Enchantment> registry = MinecraftServer.getEnchantmentRegistry();
         meta.getEnchantments().forEach((key, value) -> {
             MinestomEnchantment enchantment = (MinestomEnchantment) key;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java

@@ -104,9 +104,6 @@ public void setPack(ConfigPack pack) {
 
     private void preloadBiomes() {
         this.biomePool.preloadBiomes(world.getBiomeProvider().getBiomes());
-        for(Player player : MinecraftServer.getConnectionManager().getOnlinePlayers()) {
-            player.startConfigurationPhase();
-        }
     }
 
     public void displayStats() {