Skip to content

[Bukkit] Fix regen on 26.1+ #2946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
me4502 merged 1 commit into from
Apr 10, 2026
Merged

[Bukkit] Fix regen on 26.1+ #2946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ plugins {

dependencies {
// https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/dev-bundle/
the<PaperweightUserDependenciesExtension>().paperDevBundle("26.1.1.build.14-alpha")
the<PaperweightUserDependenciesExtension>().paperDevBundle("26.1.1.build.29-alpha")
}
5 changes: 3 additions & 2 deletions ...-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading