Skip to content

bump 到 2.2.0-SNAPSHOT,以适配 26.1 系列版本() - #6

Merged
MC-XiaoHei merged 2 commits into
LeavesMC:mainfrom
HyacinthHaru:feat/paper-26.1-support
Jun 1, 2026
Merged

bump 到 2.2.0-SNAPSHOT,以适配 26.1 系列版本()#6
MC-XiaoHei merged 2 commits into
LeavesMC:mainfrom
HyacinthHaru:feat/paper-26.1-support

Conversation

@HyacinthHaru

Copy link
Copy Markdown
Contributor

如题,上次 pr 后又被撤回了,这次 bump 后继续做()

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.
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 LeavesMC#4 was
reverted in LeavesMC#5).

Bump to 2.2.0-SNAPSHOT so the 26.1 patcher and the 1.21.x patcher
(2.1.0-SNAPSHOT) can coexist.
@MC-XiaoHei
MC-XiaoHei merged commit f955628 into LeavesMC:main Jun 1, 2026
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants