Merge pull request #260 from TheNextLvl-net/ver/1.21.9

NonSwag · web-flow · commit c91d34097a75 · 2025-11-15T19:49:12.000+01:00
1.21.9/10 support
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -25,10 +25,10 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.9-pre2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
     compileOnly("net.thenextlvl:per-worlds:1.2.1")
 
-    testImplementation("io.papermc.paper:paper-api:1.21.9-pre2-R0.1-SNAPSHOT")
+    testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
     testImplementation("net.thenextlvl:nbt:3.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation(platform("org.junit:junit-bom:6.1.0-SNAPSHOT"))
diff --git a/api/src/main/java/net/thenextlvl/worlds/api/level/Level.java b/api/src/main/java/net/thenextlvl/worlds/api/level/Level.java
@@ -110,7 +110,9 @@ public interface Level extends Keyed {
      */
     @Contract(pure = true)
     @Deprecated(forRemoval = true, since = "3.3.1")
-    int getSpawnChunkRadius();
+    default int getSpawnChunkRadius() {
+        return 0;
+    }
 
     /**
      * Retrieves the seed value associated with this Level.
@@ -167,6 +169,7 @@ default Optional<World> create() {
      * <li>IllegalStateException: If the overworld hasn't been initialized yet,
      * or another world with the same {@link #getDirectory() directory} already exists</li>
      * <li>IllegalArgumentException: If the world {@link #key() key} or {@link #getName() name} is already in use</li>
+     * <li>IOException: If the world could not be read</li>
      * </ul>
      *
      * @return a {@code CompletableFuture} completing with the created {@link World}
@@ -383,7 +386,9 @@ interface Builder {
         @Nullable
         @Contract(pure = true)
         @Deprecated(forRemoval = true, since = "3.3.1")
-        Integer spawnChunkRadius();
+        default Integer spawnChunkRadius() {
+            return 0;
+        }
 
         /**
          * Sets the radius of chunks around the spawn point that should remain loaded.
@@ -396,7 +401,9 @@ interface Builder {
          */
         @Contract(mutates = "this")
         @Deprecated(forRemoval = true, since = "3.3.1")
-        Builder spawnChunkRadius(@Nullable Integer radius);
+        default Builder spawnChunkRadius(@Nullable Integer radius) {
+            return this;
+        }
 
         /**
          * Retrieves the world seed used for generation, if available.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ tasks.compileJava {
 }
 
 group = "net.thenextlvl.worlds"
-version = "3.8.1"
+version = "3.9.0"
 
 repositories {
     mavenCentral()
@@ -29,7 +29,8 @@ repositories {
 }
 
 dependencies {
-    paperweight.foliaDevBundle("1.21.8-R0.1-SNAPSHOT")
+    // paperweight.foliaDevBundle("1.21.10-R0.1-SNAPSHOT") // fixme: restore folia support once possible
+    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
-gameVersions=1.21.5,1.21.6,1.21.7,1.21.8
-loaders=paper,folia
+gameVersions=1.21.9,1.21.10
+# loaders=paper,folia // fixme: restore folia support once possible
+loaders=paper
diff --git a/src/main/java/net/thenextlvl/worlds/WorldsPlugin.java b/src/main/java/net/thenextlvl/worlds/WorldsPlugin.java
@@ -26,7 +26,6 @@
 import net.thenextlvl.worlds.view.PaperLevelView;
 import net.thenextlvl.worlds.view.PluginGeneratorView;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -143,7 +142,6 @@ public Level.Builder levelBuilder(World world) {
                 .seed(world.getSeed())
                 .biomeProvider(world.getBiomeProvider())
                 .chunkGenerator(world.getGenerator())
-                .spawnChunkRadius(world.getGameRuleValue(GameRule.SPAWN_RADIUS))
                 .key(world.key())
                 .levelStem(switch (world.getEnvironment()) {
                     case NORMAL -> LevelStem.OVERWORLD;
diff --git a/src/main/java/net/thenextlvl/worlds/level/LevelData.java b/src/main/java/net/thenextlvl/worlds/level/LevelData.java
@@ -49,7 +49,6 @@ public abstract class LevelData implements Level {
     protected final boolean worldKnown;
     protected final boolean structures;
     protected final boolean bonusChest;
-    protected final int spawnChunkRadius;
     protected final long seed;
 
     protected LevelData(WorldsPlugin plugin, Builder builder) {
@@ -71,7 +70,6 @@ protected LevelData(WorldsPlugin plugin, Builder builder) {
         this.worldKnown = builder.worldKnown != null ? builder.worldKnown : false;
         this.structures = builder.structures != null ? builder.structures : plugin.getServer().getGenerateStructures();
         this.bonusChest = builder.bonusChest != null ? builder.bonusChest : false;
-        this.spawnChunkRadius = builder.spawnChunkRadius != null ? builder.spawnChunkRadius : plugin.getServer().getSpawnRadius();
         this.seed = builder.seed != null ? builder.seed : ThreadLocalRandom.current().nextLong();
     }
 
@@ -145,11 +143,6 @@ public boolean hasBonusChest() {
         return bonusChest;
     }
 
-    @Override
-    public int getSpawnChunkRadius() {
-        return spawnChunkRadius;
-    }
-
     @Override
     public long getSeed() {
         return seed;
@@ -171,8 +164,7 @@ public Level.Builder toBuilder() {
                 .worldKnown(worldKnown)
                 .structures(structures)
                 .bonusChest(bonusChest)
-                .seed(seed)
-                .spawnChunkRadius(spawnChunkRadius);
+                .seed(seed);
     }
 
     public static class Builder implements Level.Builder {
@@ -186,7 +178,6 @@ public static class Builder implements Level.Builder {
         private @Nullable ChunkGenerator chunkGenerator;
         private @Nullable Generator generator;
         private @Nullable GeneratorType generatorType;
-        private @Nullable Integer spawnChunkRadius;
         private @Nullable Key key;
         private @Nullable LevelStem levelStem;
         private @Nullable Long seed;
@@ -360,17 +351,6 @@ public Level.Builder worldKnown(@Nullable Boolean worldKnown) {
             return this;
         }
 
-        @Override
-        public @Nullable Integer spawnChunkRadius() {
-            return spawnChunkRadius;
-        }
-
-        @Override
-        public Level.Builder spawnChunkRadius(@Nullable Integer radius) {
-            this.spawnChunkRadius = radius;
-            return this;
-        }
-
         @Override
         public @Nullable Long seed() {
             return seed;
@@ -403,7 +383,6 @@ public String toString() {
                ", worldKnown=" + worldKnown +
                ", structures=" + structures +
                ", bonusChest=" + bonusChest +
-               ", spawnChunkRadius=" + spawnChunkRadius +
                ", seed=" + seed +
                '}';
     }
diff --git a/src/main/java/net/thenextlvl/worlds/level/PaperLevel.java b/src/main/java/net/thenextlvl/worlds/level/PaperLevel.java
@@ -5,11 +5,10 @@
 import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.Lifecycle;
 import io.papermc.paper.FeatureHooks;
+import io.papermc.paper.world.PaperWorldLoader;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.nbt.NbtException;
-import net.minecraft.nbt.ReportedNbtException;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.Main;
@@ -22,7 +21,6 @@
 import net.minecraft.world.entity.ai.village.VillageSiege;
 import net.minecraft.world.entity.npc.CatSpawner;
 import net.minecraft.world.entity.npc.WanderingTraderSpawner;
-import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.CustomSpawner;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.GameType;
@@ -36,7 +34,6 @@
 import net.minecraft.world.level.levelgen.WorldOptions;
 import net.minecraft.world.level.storage.LevelDataAndDimensions;
 import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.LevelSummary;
 import net.minecraft.world.level.storage.PrimaryLevelData;
 import net.minecraft.world.level.validation.ContentValidationException;
 import net.thenextlvl.worlds.WorldsPlugin;
@@ -47,7 +44,6 @@
 import org.bukkit.World;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.generator.CraftWorldInfo;
-import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.generator.WorldInfo;
 import org.jspecify.annotations.NullMarked;
 
@@ -72,6 +68,7 @@ public CompletableFuture<World> createAsync() {
     }
 
     /**
+     * @see MinecraftServer#createLevel(LevelStem, PaperWorldLoader.WorldLoadingInfo, LevelStorageSource.LevelStorageAccess, PrimaryLevelData)
      * @see CraftServer#createWorld(org.bukkit.WorldCreator)
      */
     private CompletableFuture<World> createInternal() {
@@ -94,6 +91,7 @@ private CompletableFuture<World> createInternal() {
             return CompletableFuture.failedFuture(e);
         }
 
+        /// Worlds start - find generator and biome provider
         var chunkGenerator = Optional.ofNullable(super.chunkGenerator)
                 .orElseGet(() -> Optional.ofNullable(generator)
                         .map(generator -> generator.generator(name))
@@ -102,6 +100,7 @@ private CompletableFuture<World> createInternal() {
                 .orElseGet(() -> Optional.ofNullable(generator)
                         .map(generator -> generator.biomeProvider(name))
                         .orElseGet(() -> server.getBiomeProvider(name)));
+        /// Worlds end
 
         var dimensionType = resolveDimensionKey();
 
@@ -113,51 +112,16 @@ private CompletableFuture<World> createInternal() {
             return CompletableFuture.failedFuture(ex);
         }
 
-        Dynamic<?> dataTag;
-        if (levelStorageAccess.hasWorldData()) {
-            LevelSummary summary;
-            try {
-                dataTag = levelStorageAccess.getDataTag();
-                summary = levelStorageAccess.getSummary(dataTag);
-            } catch (NbtException | ReportedNbtException | IOException e) {
-                LevelStorageSource.LevelDirectory levelDirectory = levelStorageAccess.getLevelDirectory();
-                plugin.getComponentLogger().warn("Failed to load world data from {}, attempting to use fallback", levelDirectory.dataFile(), e);
-
-                try {
-                    dataTag = levelStorageAccess.getDataTagFallback();
-                    summary = levelStorageAccess.getSummary(dataTag);
-                } catch (NbtException | ReportedNbtException | IOException e1) {
-                    plugin.getComponentLogger().error("Failed to load world data from {}", levelDirectory.oldDataFile(), e1);
-                    plugin.getComponentLogger().error(
-                            "Failed to load world data from {} and {}. World files may be corrupted.",
-                            levelDirectory.dataFile(),
-                            levelDirectory.oldDataFile()
-                    );
-                    return CompletableFuture.failedFuture(e1);
-                }
-
-                levelStorageAccess.restoreLevelDataFromOld();
-            }
-
-            if (summary.requiresManualConversion()) {
-                plugin.getComponentLogger().warn("This world must be opened in an older version (like 1.6.4) to be safely converted");
-                return CompletableFuture.failedFuture(new IllegalStateException("World requires manual conversion"));
-            }
-
-            if (!summary.isCompatible()) {
-                plugin.getComponentLogger().warn("This world was created by an incompatible version.");
-                return CompletableFuture.failedFuture(new IllegalStateException("World is incompatible"));
-            }
-        } else {
-            dataTag = null;
-        }
-
-        var generatorSettings = Optional.ofNullable(preset).orElse(Presets.CLASSIC_FLAT).serialize();
-
         PrimaryLevelData primaryLevelData;
-        WorldLoader.DataLoadContext context = console.worldLoader;
+        WorldLoader.DataLoadContext context = console.worldLoaderContext;
         RegistryAccess.Frozen registryAccess = context.datapackDimensions();
         Registry<LevelStem> contextLevelStemRegistry = registryAccess.lookupOrThrow(Registries.LEVEL_STEM);
+        /// Worlds start - fail if dimension could not be read
+        var levelData = PaperWorldLoader.getLevelData(levelStorageAccess);
+        if (levelData.fatalError()) return CompletableFuture.failedFuture(new IOException("Failed to read level data"));
+        /// Worlds end
+        Dynamic<?> dataTag = levelData.dataTag();
+
         if (dataTag != null) {
             LevelDataAndDimensions levelDataAndDimensions = LevelStorageSource.getLevelDataAndDimensions(
                     dataTag, context.dataConfiguration(), contextLevelStemRegistry, context.datapackWorldgen()
@@ -169,6 +133,7 @@ private CompletableFuture<World> createInternal() {
             WorldOptions worldOptions = new WorldOptions(seed, structures, bonusChest);
             WorldDimensions worldDimensions;
 
+            var generatorSettings = Optional.ofNullable(preset).orElse(Presets.CLASSIC_FLAT).serialize(); /// Worlds - serialize preset
             DedicatedServerProperties.WorldDimensionData properties = new DedicatedServerProperties.WorldDimensionData(generatorSettings, generatorType.presetName().asString());
             levelSettings = new LevelSettings(
                     name,
@@ -217,58 +182,64 @@ private CompletableFuture<World> createInternal() {
             dimensionKey = ResourceKey.create(Registries.DIMENSION, ResourceLocation.fromNamespaceAndPath(key.namespace(), key.value()));
         }
 
-        primaryLevelData.getGameRules().getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(spawnChunkRadius, null);
-
         ServerLevel serverLevel = new ServerLevel(
                 console,
                 console.executor,
                 levelStorageAccess,
                 primaryLevelData,
                 dimensionKey,
                 customStem,
-                MinecraftServer.getServer().progressListenerFactory.create(primaryLevelData.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS)),
                 primaryLevelData.isDebugWorld(),
                 seed,
-                levelStem == net.thenextlvl.worlds.api.generator.LevelStem.OVERWORLD ? list : ImmutableList.of(),
+                levelStem == net.thenextlvl.worlds.api.generator.LevelStem.OVERWORLD ? list : ImmutableList.of(), ///  Worlds
                 true,
                 console.overworld().getRandomSequences(),
                 toBukkit(levelStem.dimensionType()),
                 chunkGenerator, biomeProvider
         );
 
+        /// Worlds start - ensure world is memoized before adding to server
         if (server.getWorld(name) == null) return CompletableFuture.failedFuture(
                 new IllegalStateException("World with name " + name + " was not properly memoized")
         );
+        /// Worlds end
 
         console.addLevel(serverLevel);
 
+        /// Worlds start - initialize world for folia
         var future = new CompletableFuture<World>();
         if (WorldsPlugin.RUNNING_FOLIA) {
-            serverLevel.randomSpawnSelection = new ChunkPos(serverLevel.getChunkSource().randomState().sampler().findSpawnPosition());
+            // fixme: restore folia support once possible
+            // serverLevel.randomSpawnSelection = new ChunkPos(serverLevel.getChunkSource().randomState().sampler().findSpawnPosition());
 
-            var x = serverLevel.randomSpawnSelection.x;
-            var z = serverLevel.randomSpawnSelection.z;
+            // var x = serverLevel.randomSpawnSelection.x;
+            // var z = serverLevel.randomSpawnSelection.z;
 
-            plugin.getServer().getRegionScheduler().run(plugin, serverLevel.getWorld(), x, z, scheduledTask -> {
-                console.initWorld(serverLevel, primaryLevelData, primaryLevelData, primaryLevelData.worldGenOptions());
-                future.complete(serverLevel.getWorld());
-            });
-        } else {
-            console.initWorld(serverLevel, primaryLevelData, primaryLevelData, primaryLevelData.worldGenOptions());
-            future.complete(serverLevel.getWorld());
-        }
+            // plugin.getServer().getRegionScheduler().run(plugin, serverLevel.getWorld(), x, z, scheduledTask -> {
+            //     console.initWorld(serverLevel, primaryLevelData, primaryLevelData.worldGenOptions());
+            //     future.complete(serverLevel.getWorld());
+            // });
+            /// Worlds end
+        } else console.initWorld(serverLevel, primaryLevelData, primaryLevelData.worldGenOptions());
 
         serverLevel.setSpawnSettings(true);
 
-        console.prepareLevels(serverLevel.getChunkSource().chunkMap.progressListener, serverLevel);
-        if (WorldsPlugin.RUNNING_FOLIA)
-            io.papermc.paper.threadedregions.RegionizedServer.getInstance().addWorld(serverLevel);
-        FeatureHooks.tickEntityManager(serverLevel);
-
+        /// Worlds start - persist world extra data
         persistWorld(serverLevel.getWorld(), levelStem, enabled.toBooleanOrElse(true));
         if (generator != null) persistGenerator(serverLevel.getWorld(), generator);
+        /// Worlds end
+
+        /// Worlds start - start entity and region ticking for folia
+        // fixme: restore folia support once possible
+        // if (WorldsPlugin.RUNNING_FOLIA)
+        //     io.papermc.paper.threadedregions.RegionizedServer.getInstance().addWorld(serverLevel);
+        FeatureHooks.tickEntityManager(serverLevel);
+        /// Worlds end
 
-        new WorldLoadEvent(serverLevel.getWorld()).callEvent();
+        console.prepareLevel(serverLevel);
+
+        /// Worlds - complete future immediately if not folia
+        if (!WorldsPlugin.RUNNING_FOLIA) future.complete(serverLevel.getWorld());
         return future;
     }
 
@@ -293,8 +264,9 @@ private ResourceKey<LevelStem> resolveDimensionKey() {
     }
 
     private World.Environment toBukkit(DimensionType type) {
-        if (type.equals(DimensionType.THE_END)) return World.Environment.THE_END;
+        if (type.equals(DimensionType.OVERWORLD)) return World.Environment.NORMAL;
         if (type.equals(DimensionType.THE_NETHER)) return World.Environment.NETHER;
-        return World.Environment.NORMAL;
+        if (type.equals(DimensionType.THE_END)) return World.Environment.THE_END;
+        return World.Environment.CUSTOM;
     }
 }
diff --git a/src/main/java/net/thenextlvl/worlds/view/FoliaLevelView.java b/src/main/java/net/thenextlvl/worlds/view/FoliaLevelView.java
diff --git a/src/main/java/net/thenextlvl/worlds/view/PaperLevelView.java b/src/main/java/net/thenextlvl/worlds/view/PaperLevelView.java

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ tasks.compileJava {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`group = "net.thenextlvl.worlds"`
`22`		`-version = "3.8.1"`
	`22`	`+version = "3.9.0"`
`23`	`23`
`24`	`24`	`repositories {`
`25`	`25`	`mavenCentral()`
`@@ -29,7 +29,8 @@ repositories {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
`32`		`- paperweight.foliaDevBundle("1.21.8-R0.1-SNAPSHOT")`
	`32`	`+ // paperweight.foliaDevBundle("1.21.10-R0.1-SNAPSHOT") // fixme: restore folia support once possible`
	`33`	`+ paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")`
`33`	`34`
`34`	`35`	`implementation(project(":api"))`
`35`	`36`