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 paperweight 1.20.4 - isOpaque does not exist (anymore) #2629

Merged
merged 3 commits into from Mar 17, 2024
Merged

Update paperweight 1.20.4 - isOpaque does not exist (anymore) #2629

merged 3 commits into from Mar 17, 2024

Conversation

PierreSchwang
Copy link
Member

Overview

Closes #2604
Fixes #2607

Tested via #solidspread pattern and #liquid mask. Seems to work.

Submitter Checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter Checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
    Options
  2. Ensure that the pull request title represents the desired changelog entry.
    Options
  3. New public fields and methods are annotated with @since TODO.
    Options
  4. I read and followed the contribution guidelines.
    Options

@PierreSchwang PierreSchwang requested a review from a team as a code owner March 16, 2024 23:14
@github-actions github-actions bot added the Bugfix This PR fixes a bug label Mar 16, 2024
dordsor21
dordsor21 reviewed Mar 16, 2024
View reviewed changes
...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightBlockMaterial.java
@@ -75,7 +66,7 @@ public boolean isFullCube() {

@Override
public boolean isOpaque() {
return blockState.isOpaque();
return blockState.canOcclude();
Copy link
Member

Choose a reason for hiding this comment

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

!canOcclude()?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've orientated myself on the 1.20.3 source of the BlockStateBase#isOpaque method there
image

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, the same was present in 1.20.4-R0.1-20240106.182028-62 - which is kinda weird as therefor isSolid == isTranslucent == isOpaque lol

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, I'm dumb - didn't invert in isTranslucent

@dordsor21
Copy link
Member

Presumably there's nothing paper-specific here?

@PierreSchwang
Copy link
Member Author

Presumably there's nothing paper-specific here?

I'm not really testing with Spigot tbf - will take a look later via testing and looking through the source.
I haven't seen any paper comments at least.

@PierreSchwang
Copy link
Member Author

Presumably there's nothing paper-specific here?

The vanilla mappings contain the methods, so I guess that's fairly safe to use
image
image
image

@NotMyFault NotMyFault merged commit b93f01c into main Mar 17, 2024
11 checks passed
@NotMyFault NotMyFault deleted the fix/1.20.4_isOpaque branch March 17, 2024 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dordsor21 dordsor21 dordsor21 approved these changes

@SirYwell SirYwell SirYwell approved these changes

@NotMyFault NotMyFault NotMyFault approved these changes

Assignees
No one assigned
Labels
Bugfix This PR fixes a bug
Projects
None yet
Milestone
No milestone
4 participants
@PierreSchwang @dordsor21 @SirYwell @NotMyFault