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

Rework PlotHider for 1.18+ support #96

Merged
merged 6 commits into from
Jul 12, 2022
Merged

Rework PlotHider for 1.18+ support #96

merged 6 commits into from
Jul 12, 2022

Conversation

Aurelien30000
Copy link
Member

@Aurelien30000 Aurelien30000 commented Jun 26, 2022 •
edited
Loading

Overview

Fixes #34
Fixes #42
Fixes #75

Description

Improve support for older versions, especially for 1.16+ and implied chunk format changes (https://minecraft.fandom.com/wiki/Talk:Chunk_format#1.16_Chunk_format_changes), by completely revamping block storage/modification system.
All the changes are based on the official Minecraft protocol documentation (https://wiki.vg/Protocol#Chunk_Data_And_Update_Light) and have been tested on 1.16.5/1.17.1/1.18.2/1.19 Paper servers.

The current method to fetch the data packet is not optimal and just for test purposes. I will address this new Wrapper (dmulloy2/ProtocolLib#1592) as soon as it is merged into ProtocolLib v5.
For now then, this PR is in a draft state to let you review the other points.

Overall, we are ready to support newer versions :D !

Submitter Checklist

  • Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
  • Ensure that the pull request title represents the desired changelog entry.
  • New public fields and methods are annotated with @since TODO.
  • I read and followed the contribution guidelines.

@Aurelien30000 Aurelien30000 requested a review from a team as a code owner June 26, 2022 16:42
@Aurelien30000 Aurelien30000 marked this pull request as draft June 26, 2022 16:45
@Aurelien30000 Aurelien30000 changed the title [Draft] Rework plothider for 1.18+ support Rework plothider for 1.18+ support Jun 26, 2022
@Aurelien30000 Aurelien30000 changed the title Rework plothider for 1.18+ support Rework PlotHider for 1.18+ support Jun 26, 2022
@NotMyFault NotMyFault added the Major feature This PR adds a major feature label Jun 27, 2022
NotMyFault
NotMyFault reviewed Jun 27, 2022
View reviewed changes
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

Which mc version range is this change proposed compatible with?

I don't know enough about the internals of PlotHider to submit a qualified review, but testing it on 1.19 works as expected.

gradle/libs.versions.toml Outdated Show resolved Hide resolved
gradle/libs.versions.toml Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/BlockStorage.java Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/palette/APalettedContainer.java Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/palette/APalettedContainer.java Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/palette/APalettedContainer.java Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/palette/APalettedContainer.java Outdated Show resolved Hide resolved
src/main/java/com/plotsquared/plothider/storage/palette/PaddedPalettedContainer.java Show resolved Hide resolved
@Aurelien30000
Copy link
Member Author

Due to java version and PS requirements, PH should only work on 1.16-1.19 (recent PS crash on a 1.15.2 server).
However, old behavior has been kept in LegacyPalettedContainer and PacketHandler but may be removed in a future version.

@NotMyFault
Copy link
Member

Due to java version and PS requirements, PH should only work on 1.16-1.19 (recent PS crash on a 1.15.2 server). However, old behavior has been kept in LegacyPalettedContainer and PacketHandler but may be removed in a future version.

I see, if we enforce Java 17 here too, means we can ignore anything pre 1.16.5.

@Aurelien30000 Aurelien30000 marked this pull request as ready for review June 28, 2022 12:53
@Aurelien30000 Aurelien30000 requested a review from NotMyFault June 28, 2022 12:53
NotMyFault
NotMyFault approved these changes Jun 28, 2022
View reviewed changes
Copy link
Member

@NotMyFault NotMyFault 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, thanks a bunch for your contribution.

(While this is a breaking change, let's not kid ourself, there are no consumers of this plugin but IntellectualSites.)

@NotMyFault NotMyFault requested a review from a team June 28, 2022 14:02
@NotMyFault
Copy link
Member

If nobody else is up for a review, I'll go ahead and add it to this weeks release.

cc @IntellectualSites/plotsquared-team

SirYwell
SirYwell approved these changes Jul 12, 2022
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.

Looks good, just a minor style-wise nitpick

src/main/java/com/plotsquared/plothider/storage/palette/APalettedContainer.java Outdated Show resolved Hide resolved
@NotMyFault NotMyFault merged commit 11208e1 into IntellectualSites:main Jul 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NotMyFault NotMyFault NotMyFault approved these changes

@SirYwell SirYwell SirYwell approved these changes

Assignees
No one assigned
Labels
Major feature This PR adds a major feature
Projects
None yet
Milestone
No milestone
3 participants
@Aurelien30000 @NotMyFault @SirYwell