From cca90071f35d255dbfec49294e1a5eb1c268d5e7 Mon Sep 17 00:00:00 2001 From: Maddy Miller Date: Fri, 10 Apr 2026 13:27:34 +1000 Subject: [PATCH] [Bukkit] Fix regen on 26.1+ --- worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts | 2 +- .../bukkit/adapter/impl/v26_1/PaperweightAdapter.java | 5 +++-- .../main/java/com/sk89q/worldedit/internal/Constants.java | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts b/worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts index 1c1a5bfd0e..f5a8482602 100644 --- a/worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts @@ -6,5 +6,5 @@ plugins { dependencies { // https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/dev-bundle/ - the().paperDevBundle("26.1.1.build.14-alpha") + the().paperDevBundle("26.1.1.build.29-alpha") } diff --git a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java index 59a24f0243..6ad60f3511 100644 --- a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java @@ -139,6 +139,7 @@ import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraft.world.level.levelgen.structure.StructureStart; import net.minecraft.world.level.storage.LevelStorageSource; +import net.minecraft.world.level.storage.SavedDataStorage; import net.minecraft.world.level.storage.TagValueInput; import net.minecraft.world.level.storage.TagValueOutput; import net.minecraft.world.phys.BlockHitResult; @@ -234,7 +235,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { var unused = CraftServer.class.cast(Bukkit.getServer()); int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version(); - if (dataVersion != Constants.DATA_VERSION_MC_26_1 && dataVersion != Constants.DATA_VERSION_MC_26_1_1) { + if (dataVersion < Constants.DATA_VERSION_MC_26_1 || dataVersion > Constants.DATA_VERSION_MC_26_1_2) { logger.warning(WRONG_VERSION); } @@ -793,7 +794,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio env, gen, bukkitWorld.getBiomeProvider(), - originalWorld.getDataStorage(), + new SavedDataStorage(session.getDimensionPath(originalWorld.dimension()), originalWorld.getServer().getFixerUpper(), originalWorld.registryAccess()), loadedWorldData ); try { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java index da5daad1df..3e050451cd 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java @@ -144,4 +144,9 @@ private Constants() { * The DataVersion for Minecraft 26.1.1. */ public static final int DATA_VERSION_MC_26_1_1 = 4788; + + /** + * The DataVersion for Minecraft 26.1.2. + */ + public static final int DATA_VERSION_MC_26_1_2 = 4790; }