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.

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

feat: schematic share system, add missing Clipboard method for api compat #2745

Merged
merged 7 commits into from
Jun 2, 2024

Conversation

PierreSchwang
Copy link
Member

@PierreSchwang PierreSchwang commented May 25, 2024

Overview

Followup to #2619
Closes #2740

Description

Cherrypicks upstream commit for the remaining schematic sharing system (added the missing method from #2740)

Added arkitektonika as default share endpoint, marked download-deprecation with forRemoval (as there is now an alternative)

Result on share is the following:
image
(I've tried directly sending the link in chat - but that looked horrendous, to say the least)

Submitter Checklist

Preview Give feedback

me4502 and others added 3 commits May 25, 2024 19:17
* Allow plugins to register new clipboard share destinations

* Rename file, as per request

* Don't use the base enginehub name for EH_pastebin

* Address review comments

* Fixed wrong usage

* Use a second metadata class for clipboard shares

* Newline

* Address comments

* Improve docs

* Apply suggestions from code review

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Use a consumer so that we handle serialization

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/Clipboard.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ClipboardShareDestination.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Fixed a lot of random comments

* Return a consumer from share rather than a URL, allows the share destination to control output

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

(cherry picked from commit 6e2b0a1df8a6077c3cf8193e38dc9817038bcbe9)
@PierreSchwang PierreSchwang requested a review from a team as a code owner May 25, 2024 18:58
@github-actions github-actions bot added the Feature This PR adds a new feature label May 25, 2024
@PierreSchwang PierreSchwang marked this pull request as draft May 25, 2024 19:03
@PierreSchwang PierreSchwang marked this pull request as ready for review May 25, 2024 19:09
Copy link
Member

@SirYwell SirYwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untested, but looks good

Copy link

Please take a moment and address the merge conflicts of your pull request. Thanks!

…cShare

# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/ClipboardTransformBaker.java
@PierreSchwang PierreSchwang changed the title Finalize Schematic-Share-System, add missing Clipboard method for api compat feat: schematic share system, add missing Clipboard method for api compat Jun 2, 2024
@PierreSchwang PierreSchwang merged commit 261ebfa into main Jun 2, 2024
11 checks passed
@PierreSchwang PierreSchwang deleted the feat/upstreamSchematicShare branch June 2, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR adds a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Track upstream API incompatibilities
4 participants