Make 1.18 to be effectively in a usable state #1452
Merged
Conversation
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
- Untested - Should compile but NMF broken something - Several todos: - biome history//better support (move to biome sections in core) - regen (haha lol no thanks, someone else can do that) - probably actually do the palette stuff that probably won't work in PaperweightPlatformAdapter
dordsor21
requested review from
NotMyFault and
SirYwell
and removed request for
a team
de6fa17 Add getBrush helper for use with instanceof pattern matching (1926)
Fawe 2.0.0 and newer requires Java 17, PlotSquared v4 supports 1.13 and 1.14, Fawe wont work on these versions nevertheless and refuses to load due Java version incompatiblities with older versions. Newer versions can use PlotSquared v6.
MattBDev
reviewed
Dec 8, 2021
Comment on lines
-40
to
+44
| private static final GameProfile FAKE_WORLDEDIT_PROFILE = new GameProfile(UUID.nameUUIDFromBytes("worldedit".getBytes()), "[WorldEdit]"); | ||
|
|
||
| private static final GameProfile FAKE_WORLDEDIT_PROFILE = new GameProfile( | ||
| UUID.nameUUIDFromBytes("worldedit".getBytes()), | ||
| "[WorldEdit]" | ||
| ); |
Contributor
There was a problem hiding this comment.
Why did this change to a multiline assignment? Is it because of our project code style? If it all fits on one line I would prefer to keep it that way.
Member
Author
There was a problem hiding this comment.
I'd assume it's slightly too long?
Edit: setting to one line and doing the cleaner-upper stuff does set to multiple lines
Collaborator
There was a problem hiding this comment.
The diff is the way how our line breaks look like
This the a very nasty commit
NotMyFault
reviewed
Dec 20, 2021
...8/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Alex <mc.cache@web.de>
dordsor21
changed the title
NotMyFault
added a commit
that referenced
this pull request
Jan 5, 2022
* ci: Switch deployment to gh actions and use semver & java 17 * build: Update core dependencies - Drop paranamer, you can access parameter names at runtime with Java 8+ natively * ci: Snapshot builds are the default * ci: Cleanup and finish transition * ci: Trigger initial sync with the OSSRH * revert: OSSRH snapshot deployment was successful, returning to baseline This reverts commit 3a189f6. * ci: Register javadoc jar for lib artifacts * ci: Sign artifacts * build: Set kotlin jvm toolchain * style: Use minimized `version` output * feat: Setup project structure for 1.18 * Exclude 1.17 * Port initial paperweight classes to 1.18 folder structure * Move to Paper 1.18 * Update templates, address JEP deprecations and place a few TODOs * Drop Guava 21 enforcement * Make 1.18 to be effectively in a usable state (#1452) * Update swathes of easy-to-update-sort-of-code. - Untested - Should compile but NMF broken something - Several todos: - biome history//better support (move to biome sections in core) - regen (haha lol no thanks, someone else can do that) - probably actually do the palette stuff that probably won't work in PaperweightPlatformAdapter * ci: Provide basic Jenkinsfile for ghprb pipeline * build: Update paperweight * upstream: Update Upstream de6fa17 Add getBrush helper for use with instanceof pattern matching (1926) * FAWE will now load on startup * it....works? * Begin to allow biome edits (and fix biomes reverting to plains upon editing blocks) * Add new blocks/block properties * Only create biome palette if supplies is null * Fix biome operations * Finally get removing BlockID done (major version change allows it) * refactor!: Drop PlotSquared v4 Fawe 2.0.0 and newer requires Java 17, PlotSquared v4 supports 1.13 and 1.14, Fawe wont work on these versions nevertheless and refuses to load due Java version incompatiblities with older versions. Newer versions can use PlotSquared v6. * docs: Update readme * Added and removed some comments * Added and removed some comments * refactor: Rename worldedit configuration * build: Re-add 1.17 module This the a very nasty commit * chore: Implement missing methods * build: Update paperweight * upstream: Update upstream 6df194e Remove finalize, use a Cleaner instead (1943) 9843a4f Fix snapshots in 1.18 (1959) * ci: Escape workflows * build: Update paperweight to 1.18.1 * build: Update Paster * Fix compilation * Bump to 1.18.1 * Do both 1.18 and 1.18.1 Co-authored-by: Alex <mc.cache@web.de> * Fix single-block lookups * Reserve ordinals 0 through 3 for air/"reserved" * Create block palette data with values * Fix classpath for testing for starlight * Correctly use block rather than sky light layer [not used in paper] Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> * Update version (checking) for semver * build: Fix release drafter base branch * Trigger GHPRB * tests: Add resource pack methods * build: Update paperweight and add 1.17 again * chore: Lazily change build delimiter * build: Deploy API snapshots for 2.0.0 * Update adapters jar * More verbosely get block data and ensure biome layer isn't null * refactor: Address a few `TODO 1.18`'s (cherry picked from commit 0b77932) * fix: Fix `/fawe debugpaste` * refactor! Remove deprecations marked for removal that are not present in upstream (#1483) * Reverse a "debug" change to BukkitImplLoader * Fix parsing of build in FaweVersion * refactor: Do prepared statements properly - Update TextureUtil client jar to 1.18.1 - Limit the update checker to our domain * Add classes with the correct minor version to the start of the adapter candidates list * refactor: Deprecate `IMP` initializors in favor of builders * Fix WEManager (#1487) * Fix WeManager? * Fix WeManager? * Also register WEManager if not available, like TaskManager. * refactor: Also deprecated `IMP` for DBHandler * feat: Add a bunch of new types to the flora generator * use spigot-compatible palette constructor * use spigot-compatible packet constructor * implement 1.18 regen * return air instead of reserved on get blocks * refactor: Shift `FileAlreadyExistsException` catch to a higher level * read the actual block from ZeroBitStorage * Add get default version min/max world height to platform - Fixes #1500 * Add methods to CLIPlatform * Fix #1490 * Fix tests * Don't force tick limiter enable/disable * Use Math.floor instead of int cast 757bef1 * More precise method names in MinecraftVersion - Also ensure correct comparisons are made in FaweBukkit and BukkitServerInterface - Fixes #1504 * Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved" (#1502) * Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved" Also: - Ensure that reserved is never returned in GET block operations - "empty" thus doesn't exist in the GET update methods; remove the needless checks - Allow GET/SET chunks to determine their own default values for non-present blocks/sections * Add comments * Remove mentions of NMS from compilation instruction * Update log4j version, update jd links to use "latest" * Move to BinaryTags where appropriate in adapters * Add comments to changed code * Rename worldedit to fawe where appropriate * Use new language features * chore: Format our loggers properly * Remove unneeded comments * Replace CachedChange class with record * Remove/add some more comments * Remove remaining keywords frm CachedChanged. IJ doesn't warn? * Compress switch statements a bit using enhanced * More enhanced switches * Refactor: getVersionMin/MaxY -> versionMin/MaxY * Throw, catch, and rethrow our own exception to make sure we're finding the culprit to a possible shaded-FAWE. * Don't wrap Exception thrown upon invalid schematic path inside a RuntimeException Fixes #1506 * docs: Put `since` annotation on newly introduced API * docs: Drop clarified todos * Warn user if using small-edit history setting with extended world heights * Refactor: add javadoc to Clipboard#create and improve variables when delegating to another paste method * Fix issue with offset/origin when pasting a clipboard via API without wrapping into a BlockArrayClipboard * build: Remove drop our maven repository * docs: Fix deprecation tag * Fix incorrect toNative method in 1.17 adapter * refactor: Deprecate tick limiter API for public use * ci: dordsor does love rebasing here too * docs: Document annotations * Update upstream fb5ec19 Fix error for snapshot restore missing chunk * docs: Document a few undocumented annotations * feat: Add worldedit.schematic.list.other permission and functionality (#1507) * Add worldedit.schematic.list.other permission and functionality * Implement StringMan#containsUuid * Javadocs * chore: Add since annotation Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> Co-authored-by: Aurélien <43724816+Aurelien30000@users.noreply.github.com> Co-authored-by: SirYwell <hannesgreule@outlook.de> Co-authored-by: JOO200 <github@joo200.de> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Uh oh!
There was an error while loading. Please reload this page.