Skip to content

Re-Implement //regen #598

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
Merged
aurorasmiles merged 68 commits into from
Oct 10, 2020
Merged

Re-Implement //regen #598

aurorasmiles merged 68 commits into from
Oct 10, 2020

Conversation

@aurorasmiles
Copy link
Contributor

@aurorasmiles aurorasmiles commented Sep 3, 2020 •
edited
Loading

Reimplement a working //regen for all current adapters. First trying to get it work on the current one, then try to backport it to the others

Tested on:

  • Paper 1.16.3

  • Spigot 1.16.3

  • Paper 1.16.1

  • Spigot 1.16.1

  • Paper 1.15.2

  • Spigot 1.15.2

@aurorasmiles
Copy link
Contributor Author

aurorasmiles commented Sep 3, 2020 •
edited by unfurl-links bot
Loading

I'd be very glad about any input anyone might have with this.
I think in theory what I got so far is okay-ish, but in practice right now when using this it completely locks up the CPU and crashes your PC :') This is likely happening because of this https://github.com/IntellectualSites/FastAsyncWorldEdit/pull/598/files#diff-73f708a836034be69e6d28118cd6434bR472 but I need to load the chunks sync.

GitHub
Reimplement a working //regen for all current adapters. First trying to get it work on the current one, then try to backport it to the others

@NotMyFault NotMyFault mentioned this pull request Sep 7, 2020
Closed
4 tasks
@MattBDev MattBDev linked an issue Sep 8, 2020 that may be closed by this pull request
//regen unable to function whatsoever #541
Closed
4 tasks
@MattBDev
Formatting and logic tweaks.
37d197a 
Regen will now throw exceptions but they are not caught yet.
ConversionSessions will now be closed when no longer being used instead of left open.
@MattBDev
Copy link
Contributor

MattBDev commented Sep 8, 2020

I made some small changes to the PR. Nothing major.

@MattBDev MattBDev changed the base branch from 1.16 to main September 17, 2020 02:50
@aurorasmiles aurorasmiles marked this pull request as ready for review September 20, 2020 07:56
@aurorasmiles aurorasmiles requested a review from a team as a code owner September 20, 2020 07:56
@aurorasmiles
Copy link
Contributor Author

aurorasmiles commented Sep 21, 2020

It is neither fast nor Async.
I tested it on all supported versions and it is working pretty well
The issue seems that you cant generate the temp world async, and thats why it laggswhen generating them

@MattBDev
Copy link
Contributor

MattBDev commented Sep 22, 2020

I'll have to look and see if there are any workarounds to generating a world asynchronously.

@weaondara
Copy link
Contributor

weaondara commented Sep 22, 2020

performance improved to 1.2 million blocks/second, i.e. 256 chunks take 13 seconds

@aurorasmiles
Copy link
Contributor Author

aurorasmiles commented Oct 8, 2020 •
edited by unfurl-links bot
Loading

1.16.1 Paper: https://waste.cutiepie.at/olix8v613qk8blj7

@aurorasmiles
Copy link
Contributor Author

aurorasmiles commented Oct 8, 2020 •
edited by unfurl-links bot
Loading

1.15.2 Paper: https://waste.cutiepie.at/idz7j8ofb3qyldxf

@aurorasmiles
Copy link
Contributor Author

aurorasmiles commented Oct 8, 2020

Tested on Spigot and Paper from 1.15.2 upwards, with and without custom generators: Works without a problem now

MattBDev
MattBDev requested changes Oct 8, 2020
View reviewed changes
Copy link
Contributor

@MattBDev MattBDev left a comment

Choose a reason for hiding this comment

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

Minor comments and questions. As soon as they are answered/addressed I approve.

aurorasmiles and others added 3 commits October 8, 2020 21:30
@aurorasmiles @MattBDev
Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adap…
7665191 
…ter/impl/FAWE_Spigot_v1_15_R2.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
@aurorasmiles @MattBDev
Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adap…
d9ed469 
…ter/impl/FAWE_Spigot_v1_15_R2.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
@aurorasmiles @MattBDev
Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adap…
87596bf 
…ter/impl/FAWE_Spigot_v1_16_R1.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
SirYwell
SirYwell requested changes Oct 8, 2020
View reviewed changes
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.

Works great now! I've got one remaining point to discuss that I just forgot before...

@aurorasmiles aurorasmiles requested a review from SirYwell October 10, 2020 08:56
@aurorasmiles aurorasmiles merged commit 3c6280b into IntellectualSites:main Oct 10, 2020
@aurorasmiles aurorasmiles deleted the fix-regen branch October 10, 2020 09:57
@Ayon224
Copy link

Ayon224 commented Oct 10, 2020

You guys are all legends! thank you so much for getting this working again :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MattBDev MattBDev MattBDev approved these changes

@SirYwell SirYwell SirYwell approved these changes

@NotMyFault NotMyFault NotMyFault approved these changes

@dordsor21 dordsor21 Awaiting requested review from dordsor21

+2 more reviewers

@me4502 me4502 me4502 left review comments

@weaondara weaondara weaondara left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Enhancement New feature or request hacktoberfest-accepted Apply this label on PRs

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

//regen unable to function whatsoever

8 participants

@aurorasmiles @MattBDev @weaondara @dordsor21 @Ayon224 @me4502 @SirYwell @NotMyFault