Fix failed tests caused by new biome property

Multiverse · Jan 5, 2025 · ddedf2c · ddedf2c
1 parent 71e47d2
commit ddedf2c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java
@@ -13,6 +13,7 @@
 import com.dumptruckman.minecraft.util.Logging;
 import com.google.common.collect.Lists;
 import jakarta.inject.Inject;
+import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.WorldType;
@@ -68,7 +69,7 @@ class CreateCommand extends CoreCommand {
                     .filter(biome -> biome !=Biome.CUSTOM)
                     .map(biome -> biome.getKey().getKey())
                     .toList())
-            .context(Biome::valueOf)
+            .context(biomeStr -> Registry.BIOME.get(NamespacedKey.minecraft(biomeStr)))
             .build());
 
     @Inject

diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java
@@ -11,6 +11,7 @@
 import com.dumptruckman.minecraft.util.Logging;
 import com.google.common.collect.Lists;
 import jakarta.inject.Inject;
+import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
@@ -52,7 +53,7 @@ class ImportCommand extends CoreCommand {
                     .filter(biome -> biome !=Biome.CUSTOM)
                     .map(biome -> biome.getKey().getKey())
                     .toList())
-            .context(Biome::valueOf)
+            .context(biomeStr -> Registry.BIOME.get(NamespacedKey.minecraft(biomeStr)))
             .build());
 
     @Inject

diff --git a/src/test/resources/default_worlds.yml b/src/test/resources/default_worlds.yml
@@ -13,6 +13,7 @@ world:
     currency: '@vault-economy'
   environment: NORMAL
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true
@@ -51,6 +52,7 @@ world_nether:
     currency: '@vault-economy'
   environment: NETHER
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true

diff --git a/src/test/resources/delete_worlds.yml b/src/test/resources/delete_worlds.yml
@@ -13,6 +13,7 @@ world_nether:
     currency: '@vault-economy'
   environment: NETHER
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true

diff --git a/src/test/resources/migrated_worlds.yml b/src/test/resources/migrated_worlds.yml
@@ -13,6 +13,7 @@ world_the_end:
     currency: '@vault-economy'
   environment: THE_END
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true
@@ -56,6 +57,7 @@ world:
     currency: '@vault-economy'
   environment: NORMAL
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true

diff --git a/src/test/resources/newworld_worlds.yml b/src/test/resources/newworld_worlds.yml
@@ -13,6 +13,7 @@ world:
     currency: '@vault-economy'
   environment: NORMAL
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true
@@ -51,6 +52,7 @@ world_nether:
     currency: '@vault-economy'
   environment: NETHER
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true
@@ -82,6 +84,7 @@ newworld:
   auto-heal: true
   auto-load: true
   bed-respawn: true
+  biome: '@vanilla'
   difficulty: NORMAL
   entry-fee:
     enabled: false

diff --git a/src/test/resources/properties_worlds.yml b/src/test/resources/properties_worlds.yml
@@ -13,6 +13,7 @@ world:
     currency: @vault-economy
   environment: NORMAL
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true
@@ -56,6 +57,7 @@ world_nether:
     currency: @vault-economy
   environment: NETHER
   gamemode: SURVIVAL
+  biome: '@vanilla'
   generator: ''
   hidden: false
   hunger: true