Make slime spawn checks use tag again and rename config option (#7910)

This commit is contained in:
Noah van der Aa 2022-06-10 00:48:46 +02:00 committed by GitHub
parent 6249dd5ecb
commit 181a8479b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions

View file

@ -1293,7 +1293,7 @@ index 0000000000000000000000000000000000000000..d69d203eea014fc9fb40a556f0771dba
+}
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a1a7e9764dc6f64cc2968baf5958d0cde87cbe2
index 0000000000000000000000000000000000000000..5bcce63166657f80eaa8446d3dd64a5cba62f198
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -0,0 +1,465 @@
@ -1444,9 +1444,9 @@ index 0000000000000000000000000000000000000000..4a1a7e9764dc6f64cc2968baf5958d0c
+
+ public class SlimeSpawnHeight extends ConfigurationPart {
+
+ public SwampBiome swampBiome;
+ public SurfaceSpawnableSlimeBiome surfaceBiome;
+
+ public class SwampBiome extends ConfigurationPart {
+ public class SurfaceSpawnableSlimeBiome extends ConfigurationPart {
+ public double maximum = 70;
+ public double minimum = 50;
+ }
@ -3053,10 +3053,10 @@ index 0000000000000000000000000000000000000000..75f612b04f872d0d014fdc40b07c1511
+}
diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..da56027e1ddb0649e5b860ffa6c95af388a75442
index 0000000000000000000000000000000000000000..749498b349a0504270e2ba84fd8f30bd749833a7
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
@@ -0,0 +1,320 @@
@@ -0,0 +1,321 @@
+package io.papermc.paper.configuration.transformation.world;
+
+import io.papermc.paper.configuration.Configuration;
@ -3244,6 +3244,7 @@ index 0000000000000000000000000000000000000000..da56027e1ddb0649e5b860ffa6c95af3
+ moveFromRoot(builder, "spawn-limits", "entities", "spawning");
+ moveFromRoot(builder, "despawn-ranges", "entities", "spawning");
+ moveFromRoot(builder, "wateranimal-spawn-height", "entities", "spawning");
+ builder.addAction(path("slime-spawn-height", "swamp-biome"), TransformAction.rename("surface-biome"));
+ moveFromRoot(builder, "slime-spawn-height", "entities", "spawning");
+ moveFromRoot(builder, "wandering-trader", "entities", "spawning");
+ moveFromRoot(builder, "all-chunks-are-slime-chunks", "entities", "spawning");