Revert "feat: sync with upstream paperweight for Paper 26.1 support"#5
Merged
Merged
Conversation
…eavesMC#4)" This reverts commit 5df6617.
MC-XiaoHei
pushed a commit
that referenced
this pull request
Jun 1, 2026
Upgrade leavesweight to align with PaperMC/paperweight main branch, which has dropped the Spigot mappings / reobf pipeline since Paper 26.1 (Mojang no longer ships obfuscated server jars starting from that version). - Remove 11 Spigot/reobf-related files (SpigotTasks, SpigotExtension, FixJarForReobf, Generate*ReobfMappings, GenerateSpigotMappings, IncludeMappings, PatchMappings, RelocateClassNameConstants, SpigotRemapJar, UnpackSpigotBuildData, old createBuildTasks). - Add 26 upstream new files: paper-checkstyle plugin, PatchRoulette tasks, DevBundle V7 (SetupHandlerImplV7, RunRemappingCodebookAction, VanillaServerJarDownload, etc.). - Rewrite LeavesclipTasks to the single-jar model (no more mojmap/reobf split), mirroring upstream's PaperclipTasks but keeping Leavesclip branding and the META-INF/build-info output from CreateLeavesclipJar. - Sync ~40 modified files (CoreTasks, DevBundleTasks, PaperweightCore, PaperweightCoreExtension with new filterPatches and updatingMinecraft fields, PaperweightPatcher, etc.). - Preserve Leaves branding: PAPERCLIP_CONFIG="leavesclip", plugin IDs under org.leavesmc.leavesweight.*, publish to repo.leavesmc.org, leavesweight-core / leavesweight-userdev module names. * chore: bump version to 2.2.0-SNAPSHOT for Paper 26.1 support Paper 26.1 dropped the Spigot mappings / reobf pipeline, so this patcher no longer builds the older (1.21.x) Leaves line. Publishing it under the existing 2.1.0-SNAPSHOT would overwrite the 1.21.x patcher on repo.leavesmc.org and break ongoing 1.21.x maintenance (the reason #4 was reverted in #5). Bump to 2.2.0-SNAPSHOT so the 26.1 patcher and the 1.21.x patcher (2.1.0-SNAPSHOT) can coexist.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #4
由于我们没有paperweight那样的patch版本发布方式 以
2.1.0-SNAPSHOT版本发布的破坏性修改 (26.1不再需要reobf 因此新的patcher不再适配旧版本) 会覆盖之前基于1.21.11的2.1.0-SNAPSHOT版本 导致无法继续进行1.21.11版本的维护和开发因此 需要revert这个更新 并在重发布旧版, bump version后再重新发布
26.1的支持