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

Add a BiomeCategories API (#2338) #2777

Merged
merged 6 commits into from
Jun 27, 2024
Merged

Add a BiomeCategories API (#2338) #2777

merged 6 commits into from
Jun 27, 2024

Conversation

dordsor21
Copy link
Member

  • Add a BiomeCategories API

  • licenses

  • Use a supplier to retain the lazy-load & dynamicness of the existing system, but still retaining the inversion of control that this PR was intended to provide

* Add a BiomeCategories API

* licenses

* Use a supplier to retain the lazy-load & dynamicness of the existing system, but still retaining the inversion of control that this PR was intended to provide
@dordsor21 dordsor21 requested a review from a team as a code owner June 13, 2024 18:31
@github-actions github-actions bot added the Feature This PR adds a new feature label Jun 13, 2024
@NotMyFault NotMyFault requested a review from a team June 15, 2024 14:31
Copy link
Member

@PierreSchwang PierreSchwang left a comment

Choose a reason for hiding this comment

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

I see that the temporary regen world was renamed back to worldeditregentempworld - I guess that's intentional? (helps with merge conflicts as well i guess). I have no issue with that whatsoever to be fair.

Is the commented merge conflict in 1.20R1 PaperweightAdapter (L880+) required in the future or is there any specific reason to keep it in?

Looks good otherwise? Might be worth merging before starting work on 1.21

@dordsor21
Copy link
Member Author

I see that the temporary regen world was renamed back to worldeditregentempworld - I guess that's intentional? (helps with merge conflicts as well i guess). I have no issue with that whatsoever to be fair.

Is the commented merge conflict in 1.20R1 PaperweightAdapter (L880+) required in the future or is there any specific reason to keep it in?

Looks good otherwise? Might be worth merging before starting work on 1.21

Ah, no the rename probably shouldn't happen, and the merge conflict was probably missed because it was commented I guess 🙃

Copy link
Member

@PierreSchwang PierreSchwang left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

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

# Conflicts:
#	worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightWorldNativeAccess.java
#	worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightWorldNativeAccess.java
#	worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightWorldNativeAccess.java
#	worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightWorldNativeAccess.java
#	worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicReader.java
@dordsor21 dordsor21 merged commit fee9029 into main Jun 27, 2024
11 checks passed
@dordsor21 dordsor21 deleted the feat/biome-categories branch June 27, 2024 13:15
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.

None yet

5 participants