Skip to content
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

Jump to bottom

Restructure ASPaper for paper hardfork #149

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft

Restructure ASPaper for paper hardfork #149

wants to merge 32 commits into from

Conversation

ComputerNerd100
Copy link
Member

This PR captures the work to restructure the ASPaper repository for paper's hardfork.

Current objectives & tasklist:

  • - Clean up gradle build logic
  • - Update dependencies
  • - Publish ASP-Core artifacts for forks (partially complete)
  • - Replace NBT library
  • - Bump SRF version due to NBT library change
  • - Expand Slime Properties API
  • - Convert to modern APIs (e.g. java.io -> java.nio) (partially complete)
  • - Convert to paperweight v2 and rewrite/restructure patches
  • - Rewrite SRF upgraders as a separately published module (shaded in plugin, optional for API consumers)
  • - Ensure API is fully javadoc'd
  • - Update general documentation
  • - Write release notes

kyngs and others added 27 commits August 11, 2024 22:52
@kyngs
Update to 1.21.1
9d5c151
@ComputerNerd100
Update Upstream
c337bad 
Automatically updated to Paper commit: a8cb8e6745dab32139d954d732a3423a454545ab
[ci skip] Fix JavaDocs for HeightMap#MOTION_BLOCKING_NO_LEAVES (#11291)

Automatically updated to Paper commit: ba1b0162faaa7bf78d33162f6976586bb3049275
Allow server administrators to disable book size checks (#10457)

Automatically updated to Paper commit: dae906ba452e4a17779aa6438ccd6deb42d7f0df
Add getWorld method that uses adventure Key (#11199)

Automatically updated to Paper commit: 8fd3a67138b5d7a3a21e059eb3c3b766ffdfc281
[ci skip] Clean up book limits patch (#11297)

Automatically updated to Paper commit: be1078f5f2e28c1a1de99e9c96e4003c3f96f6e8
Use player file, not directory, when checking for offline player data

When trying to fall back to offline player data in onlide mode,
we need to use the player file. This fixes a mistake during
update where 'file' was used, but the new code uses 'file1'
for the player file.

Automatically updated to Paper commit: b4bc512cac4d75f9e366479c5d8fdcf4275c85ce
Fix entity limit patch deleting unnecessary entities

We need to continue the save loop, not break from it
when a limit is reached.

Automatically updated to Paper commit: 64c9ee6584ce15e5b486bdc7183fe902e22fddf3
Allow getting/setting the sign's editor uuid (#10637)

* Allow getting/setting the sign's editor uuid

* rebased

---------

Co-authored-by: Jake Potrebic <[email protected]>

Automatically updated to Paper commit: 44017487a81534067fd17e2d5e8669e61e19d719
Fix CraftBukkit drag system (#10703)

Automatically updated to Paper commit: 8c3018a4b177aa0f7658d510bf7d19c5fa8e5b65
Fix Selector Arguments not working with permission (#11286)

Automatically updated to Paper commit: 57dd822393df78a4cb47f7a2c2d037dc2a77d5bd
Leashable API (#10961)

Automatically updated to Paper commit: 2e82fd2d2c1881665e27654977390fa48f5ec346
Add even more Enchantment API (#11115)

Automatically updated to Paper commit: 66a97cc929740475bc8dd192382c4ae59fdeace9
Update item data sanitization (#11227)

Automatically updated to Paper commit: 0e7361704a16c8386d829c26603f3e5c0bf72b39
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284)

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
4068c6aa PR-1053: Change docs for max power in FireworkMeta
6b3c241b SPIGOT-7783, SPIGOT-7784, PR-1051: Add Trial Vault & Spawner event API
5fe300ec PR-1052: Fix broken links and minor improvement for checkstyle.xml

CraftBukkit Changes:
7548afcf2 SPIGOT-7872: Fix crash with event-modified teleports
93480d5d6 SPIGOT-7868, PR-1463: Fix default and max power in FireworkMeta
5060d1a84 SPIGOT-7783, SPIGOT-7784, PR-1460: Add Trial Vault & Spawner event API
11dfcae71 PR-1462: Fix broken links and minor improvement for checkstyle.xml

Spigot Changes:
ca581228 Rebuild patches

Automatically updated to Paper commit: 75655ec1d34f344c7b0ba9f31f2ada87951d277d
Add Configuration for vertical Despawn Ranges (#11279)

Automatically updated to Paper commit: 52ae4ad4666b34d637f2de573ed03c02b0fc6a24
Migrate ArmorStand meta to using entity tag (#11107)

Automatically updated to Paper commit: d5ffc573dc17092ea2cfdd4ce14dac3e70b932f5
Implement more methods for horse inventories (#11147)

Automatically updated to Paper commit: 4829fbf6bd51e2dc86e2f190971c081aac76a201
Handle custom registry elements properly (#11230)

* Handle custom registry elements properly

* update error message

Datapack made painting variant support is added in PaperMC/Paper#11244

* change msg for art conversion

---------

Co-authored-by: Jake Potrebic <[email protected]>

Automatically updated to Paper commit: 78216fef26e454c78dff5e495f6ebe673be56900
Re-implement portalCreateRadius world config (#11267)

Automatically updated to Paper commit: e619744fbdc4963eed0b04c1e44bd1089ce50285
Allow skipping of world symlink validation (#11250)

Automatically updated to Paper commit: 534ab86010330ce3afa732910227585d0dc02d1e
[ci-skip] Revert "Add Configuration for vertical Despawn Ranges (#10440)" (#11278)

This reverts commit 1b8ab116edd5da15791de96aa462db90756848dc.

Automatically updated to Paper commit: 1b8ab116edd5da15791de96aa462db90756848dc
Add Configuration for vertical Despawn Ranges (#10440)

Automatically updated to Paper commit: ec55c11fc074929e4aa1a1ecdaef51da69dbf0be
Fix indestructable light blocks (#11275)

Co-authored-by: Bjarne Koll <[email protected]>

Automatically updated to Paper commit: 95719832bf57ae523982d681cd219e8387c39955
Fix scanForLegacyEnderDragon world config (#11262)

Automatically updated to Paper commit: 81bfda87103e1a47ea184c5da119e79218a8dc1e
[ci skip] Specify rebase location in CONTRIBUTING (#11255)

* [ci skip] Specify rebase location in CONTRIBUTING

* Improve

* remove Paper-MojangAPI mention

---------

Co-authored-by: Bjarne Koll <[email protected]>
Co-authored-by: Lulu13022002 <[email protected]>

Automatically updated to Paper commit: fb530743e5c71cb4faba06339bdeb14a33e06a6a
Apply optimise collision checking in move packet handling patch

Automatically updated to Paper commit: bf5852a6151aa643b87bd0e0f9e3940f867064a3
Fix NPE for PlayerPostRespawnEvent#getRespawnedLocation (#11268)

Automatically updated to Paper commit: 11b4ac7c659ffb7e4790b0856b14117b6d532200
Fix disableEndCredits world config (#11261)

Automatically updated to Paper commit: 9ab644ed290542a9e537d8f529bc6898a3da2e7d
Fix `TooltipContext.create` being wrong(#11254)

Co-authored-by: Jake Potrebic <[email protected]>

Automatically updated to Paper commit: 7c9240f4a63b13be1fdcedbfb0270f9b49b75518
Improve standard messenger logging

Automatically updated to Paper commit: 1798e949e5727f376ccaee51873f21dcdedc9a5f
Fix BasicCommand suggestion arg count (#11241)

Automatically updated to Paper commit: 4a97ba3ea8cb449fe76ed1aef0b572e7cc01d542
Fix `setSendViewDistance`'s return (#11247)

Automatically updated to Paper commit: f97aff74b6f7fd4940c0c0b6cca3f8ac6e1afdef
[ci skip] Fix Effect javadocs (#11182)

Automatically updated to Paper commit: 098bd39092f50cb97a604c2f228f2af29666ca41
Remove arbitrary book page limit (#11228)

Automatically updated to Paper commit: ab0d24aa6f22308352eb363b09c992fc70de4143
Configuration for horizontal-only item merging (#11219)
@kyngs @ComputerNerd100
Re-add null-check in FastChunkPruner.java
cbb8fb2
@notstevy @ComputerNerd100
Migrate back to the gradleup shadow plugin and upgrade version to 8.3.0
ee1a536
@jepu2x @ComputerNerd100
Fix typo: worldData.name() was added twice to WorldsInUse instead of …
80e3297 
…being removed.
@TechStreetDev @ComputerNerd100
fix: issue with chunks not saving sometimes when unloading the world
3e34812
@emmanuelvlad @ComputerNerd100
fix disable dragon fights
17eb817
@emmanuelvlad @ComputerNerd100
fix chunk pdc getting wiped on chunk unload
e36d5ae
@kyngs @ComputerNerd100
Move patch 0016 to the correct folder
3fd836f
@AverageGithub @ComputerNerd100
1.21.3 work maybe donegit add .!
6ba9ed9
@davidmayr @ComputerNerd100
feat: update to da7138233f6392e791d790d1c3407414c855f9c2
4ef6419 
Please enter the commit message for your changes. Lines starting
@davidmayr @ComputerNerd100
fix: missing chunks & entities when chunk saving
05876d7
@davidmayr @ComputerNerd100
fix: pdc not saving when chunks are unloaded
32f2640
@davidmayr @ComputerNerd100
fix: move saving up so block entities can get saved
138ee8b
@kyngs @ComputerNerd100
Attempt to fix #142
991eae1
@ComputerNerd100
Update deps
c394d0f
@ComputerNerd100
Update gradlew to 8.11.1
6c01d44
@ComputerNerd100
Downgrade some versions slightly
b4d01cd 
Paperweight 1.7.7 -> 1.7.5
gradlew 8.11.1 -> 8.10.1
@ComputerNerd100
chore(*): restructuring round 1
e70bcdd
@ComputerNerd100
fix(conventions): call get on gradle property
83bb203
@ComputerNerd100
chore(plugin): rename to ASP
c62213a
@ComputerNerd100
chore(plugin): update plugin jar output name
49f2351
@ComputerNerd100
chore(*): restructuring round 2
b7fd593 
- API/Core: FlowNBT -> AdventureNBT
- Add slime property support for all NBT types
- Start switch to java.nio, legacy support for java.io
- Refactoring for future deprecation and cleanup
@ComputerNerd100
chore(core): remove legacy SRF support
699f99a 
Removes SRF < v12 support
This is to be re-added later once cleaned up and restructured
@ComputerNerd100
chore(api): fix javadoc
bc2d52d
@ComputerNerd100
chore(api): Change SWI extra data to Map
3e9e99c
@ComputerNerd100
chore(impl): Replace FlowNBT with AdventureNBT in all patches
167c327
@ComputerNerd100 ComputerNerd100 self-assigned this Dec 20, 2024
@InfernalSuite InfernalSuite locked and limited conversation to collaborators Dec 20, 2024
@ComputerNerd100
chore(settings): Add toolchain resolver plugin
fa101d8
@ComputerNerd100
chore(conventions): Relocate gradle/build-logic -> buildSrc
50c27aa
@ComputerNerd100
chore(gradlew): Update gradle wrapper to 8.12
a9788b3
@ComputerNerd100
chore(*): Setup initial hard fork structure
f7a4a97 
- Update paperweight to v2 for hard fork support
- Update paperRef to latest hard fork commit
- Add new impl module and configure paperweight
- Patch build scripts
- Update gitignore
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Paul19988 Paul19988 Awaiting requested review from Paul19988

@Owen1212055 Owen1212055 Awaiting requested review from Owen1212055

@kyngs kyngs Awaiting requested review from kyngs

@AverageGithub AverageGithub Awaiting requested review from AverageGithub

@vytskalt vytskalt Awaiting requested review from vytskalt

At least 1 approving review is required to merge this pull request.

Assignees

@ComputerNerd100 ComputerNerd100

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ComputerNerd100 @kyngs @notstevy @jepu2x @TechStreetDev @emmanuelvlad @AverageGithub @davidmayr