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

Update to new Spigot generation API #3659

Merged
merged 13 commits into from
Jun 22, 2022
Merged

Update to new Spigot generation API #3659

merged 13 commits into from
Jun 22, 2022

Conversation

dordsor21
Copy link
Member

@dordsor21 dordsor21 requested a review from a team as a code owner June 8, 2022 18:39
@github-actions github-actions bot added the Feature This PR proposes a new feature label Jun 8, 2022
@dordsor21 dordsor21 force-pushed the feature/v7/new-generation-api branch 2 times, most recently from f7d15c1 to ba8844e Compare June 8, 2022 20:12
dordsor21 added 2 commits June 8, 2022 21:12
@dordsor21
Address deprecations in queue/generation code
43150ab
@dordsor21
Move to new generation API
9188c8c 
 - Currently not working due to lack of biome-setting capability via BiomeProvider for flat worlds
@dordsor21 dordsor21 force-pushed the feature/v7/new-generation-api branch from ba8844e to 9188c8c Compare June 8, 2022 20:13
@dordsor21 dordsor21 changed the title Address deprecations in queue/generation code Update to new Spigot generation API Jun 8, 2022
@dordsor21 dordsor21 marked this pull request as draft June 8, 2022 20:15
@PierreSchwang PierreSchwang added the v7 related to, or targeted by, v7 label Jun 9, 2022
dordsor21 added 2 commits June 10, 2022 16:44
@dordsor21
Delegate to platformGenerator in deprecated generation method if appl…
307a1a6 
…icable when using new generation methods (1.19)
@dordsor21
Merge branch 'v7' into feature/v7/new-generation-api
cdc8cdc 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
#	Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkManager.java
@dordsor21 dordsor21 marked this pull request as ready for review June 10, 2022 17:26
@dordsor21
Copy link
Member Author

Biomes now generate properly on 1.19

@NotMyFault
Copy link
Collaborator

Biomes now generate properly on 1.19

The PR doesn't compile at all, see GH actions.

@dordsor21
Copy link
Member Author

There's nothing in this PR to make that happen

@dordsor21
Copy link
Member Author

There's nothing in this PR to make that happen

The same errors occur on the v7 branch.

@NotMyFault
Copy link
Collaborator

NotMyFault commented Jun 11, 2022 •
edited
Loading

There's nothing in this PR to make that happen

The same errors occur on the v7 branch.

Resolved, bom on v7 now points on 1.19.

dordsor21 added 3 commits June 11, 2022 14:12
@dordsor21
Merge branch 'v7' into feature/v7/new-generation-api
666a60a 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@dordsor21
Merge branch 'v7' into feature/v7/new-generation-api
9492532 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
#	Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
#	Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java
#	Core/src/main/java/com/plotsquared/core/location/Location.java
#	Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java
#	Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/ZeroedDelegateScopedQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkManager.java
@dordsor21
Re-add wrongly removed method
6187569
@dordsor21 dordsor21 requested a review from SirYwell June 20, 2022 11:58
@NotMyFault NotMyFault merged commit 75fd9b2 into v7 Jun 22, 2022
@NotMyFault NotMyFault deleted the feature/v7/new-generation-api branch June 22, 2022 12:57
@PierreSchwang PierreSchwang mentioned this pull request Jul 29, 2022
Closed
5 tasks
NotMyFault added a commit that referenced this pull request Mar 6, 2023
@NotMyFault @PierreSchwang
@SirYwell @dordsor21
v7 is here (#3982)
f11f5f0 
* Update MiniMessage to 4.10.1 (#3617)

* chore!: bump MiniMessage to 4.10.1

BREAKING CHANGE: bumping MiniMessage and Adventure removes the adventure Template class and breaks the whole messaging system api wise

* chore: fix minimessage messages, fix circular method reference

* build: Update to Paper 1.18.2 (#3622)

build: Align MM and Adventure version

* Replace legacy color codes in flag examples (#3520)

* chore: Change maven group and artifact ID (#3632)

chore: Change maven group and artifact ID

* v7 is 7.0.0-SNAPSHOT

* build: Update bom

* Chore: General deprecations (#3660)

Address deprecations for removal throughout the plugin

* Address deprecations in queue/generation code (#3658)

* Update to new Spigot generation API (#3659)

* Address deprecations in queue/generation code

* Move to new generation API
 - Currently not working due to lack of biome-setting capability via BiomeProvider for flat worlds

* Any fixes to flat world biome setting will target 1.19

* Ensure compiled is actually set to true in BlockBucket

* Delegate to platformGenerator in deprecated generation method if applicable when using new generation methods (1.19)

* Re-add wrongly removed method

* Handle exceptions using logger

* We can simplify getting relative offset using floormod

* Replace many booleans with EnumSet

* Address comments, remove needless boolean return for populateChunk

* Ensure use of new generation methods only on 1.19 and above

* refactor: simplify timeout logic in uuid pipeline (#3760)

simplify timeout logic

* Fix compile errors

* Revert GAV changes

* Update javadoc links

* Start deployment of v7 snapshots

* Temporarily create javadocs for v7 snapshots

* Temporarily create javadocs for v7 snapshots

* Fixes #3919

* Fix relocation of informative annotations

* Drop HTTP4J (#3916)

* Fixes #3906 by fine-graining the help menu generation localization support

* Clean up merge

* *Actually clean up

* chore: Remove things marked as for removal (#3941)

* chore: Remove things marked as for removal

* Address feedback

Co-authored-by: Alexander Brandes <mc.cache@web.de>

* Resolved conflicts

* Cleanup deprecated methods

* Revert "Cleanup deprecated methods"

This reverts commit 26692d6.

* Record-inize methods (#3976)

* Delete unused HyperverseWorldManager file

* Migrate left over occurrences to enhanced switches (#3979)

* Migrate left-overs to enhanced switches

* More

* Cleanup deprecated methods (#3980)

* Perform code formatting according to editorconfig (#3981)

* Perform code reformatting

* Fix javadoc errors

* Don't format JSON files

---------

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SirYwell SirYwell SirYwell approved these changes

@NotMyFault NotMyFault NotMyFault approved these changes

Assignees
No one assigned
Labels
Feature This PR proposes a new feature v7 related to, or targeted by, v7
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dordsor21 @NotMyFault @SirYwell @PierreSchwang