fix: support new world / dimension directory structure and fix per-world plots - #4874
fix: support new world / dimension directory structure and fix per-world plots#4874PierreSchwang wants to merge 16 commits into
Conversation
70d3cb1 to
eac6a4f
Compare
|
@NO-UUID can you verify this resolves your issue? |
while the actual folder p2 is looking for is: /home/minecraft/creative/worlds/buildtest/dimensions/minecraft/world/region server.properties: bukkit.yml |
|
So I guess it would work with just world-container: ./worlds/ but not with level-name=buildtest ? |
|
Actually no, even after changing level-name to world in server.properties, it would still error: and in this case should be |
There was a problem hiding this comment.
Pull request overview
This PR updates PlotSquared’ world file I/O to support Minecraft 26.1’s changed world/dimension directory layout (fixing trim failures like “could not find region folder”), and migrates several code paths from java.io.File to java.nio.file.Path.
Changes:
- Add platform APIs for resolving dimension/world paths (
getWorldContainer,getWorldPath) and update Bukkit implementation. - Update world/region file discovery and deletion to use NIO (
Files.*) and the new directory structure. - Adjust legacy world upload/import/conversion utilities to operate on the new paths.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| Core/src/main/java/com/plotsquared/core/util/WorldUtil.java | Updates region traversal and world download zip creation to use NIO + new layout. |
| Core/src/main/java/com/plotsquared/core/util/RegionManager.java | Updates region file deletion to use Path/Files. |
| Core/src/main/java/com/plotsquared/core/util/CloseShieldOutputStream.java | Adds output stream wrapper to prevent closing an underlying stream. |
| Core/src/main/java/com/plotsquared/core/PlotPlatform.java | Introduces new platform APIs to resolve dimension/world paths. |
| Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java | Changes single-plot world deletion to NIO. |
| Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java | Updates single-plot world migration/copy logic to NIO. |
| Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java | Updates debug import to walk the world container via NIO. |
| Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java | Updates single-plot world rename during DB import to Files.move. |
| Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java | Implements the new platform path resolution methods for Bukkit. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
No clue how I should get the actual level key by the world name (as those are two co-existing things now???), given I don't have any world reference at many places. The underlying platform world would return a NamespacedKey / Key / whatever API definition exists, but I only have the user inputted name or plot world string, which might not be loaded in bukkit at the point of usage... |
|
Technically there is no need to get the key from the loaded world as it will always be that of the dimension folder names |
|
I think both will exist at least for some time? If word is defined (with generator) in bukkit.yml it should be available right away? I think? |
|
Also I think this affects more than just trim? Road regen and stuff like that too? |
e441942 to
d678c86
Compare
|
@NO-UUID Feel free to test with the recent updates. I haven't tested everything but my first tests were fine so far. Haven't yet tested pre-26.1 either, but I'll do that when it works for the newer version ig. |
…access world after deletion
…errors on startup)
PierreSchwang
changed the title
|
So far so good, this fixed: Tested on: |
|
So far so good, been running it on 4 different Paper instances (with different configs) and everything appears to be working. Edit: All running Paper 26.1.2 |
Thank you for the extensive testing! |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 1 comment.
Suppressed comments (1)
Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java:85
Files.walkFileTree(path, …)will throw (and log an error) if the plot world folder doesn't exist (e.g., already deleted or never created). Adding an existence check avoids noisy error logs for a non-fatal condition.
try {
Files.walkFileTree(path, RecursiveDirectoryRemovalWalker.INSTANCE);
} catch (IOException e) {
LOGGER.error("Failed to delete plot world for single plot area", e);
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
the method would throw much earlier given accessing the platform world and unloading the world would fail. Also, administrators shouldn't touch plot worlds themselves (especially during runtime). |
Overview
Fixes #4872
Description
MC 26 changed the world /dimension / level folder structure quite drastically, which this PR attempts to implement. Trim works in the latest version. I also updated all other usages of I/O world access. download of world files should also work now (even though it's been deprecated for quite a while).
I've not tested the changes on older versions yet. Feel free to.
Submitter Checklist
@since TODO.