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

Fluid rendering fixes #3593

Merged

Conversation

PepperCode1
Copy link
Member

@PepperCode1 PepperCode1 commented Feb 14, 2024

  • Fix default overlay block check using TransparentBlock instead of TranslucentBlock (fix Ice/Honey block/Slime block/Frosted Ice cause water to show flowing animation at the sides #3592)
  • Fix setBlockTransparency/isBlockTransparent not being thread-safe
  • Reuse the same render handler objects for water and lava
  • Fix custom geometry being buffered twice if FluidRenderHandler#renderFluid is invoked directly
  • Fix calling FluidRenderHandler.super.renderFluid not using passed arguments to calculate color
  • Fix calling FluidRenderHandler.super.renderFluid more than once producing incorrect geometry
  • Fix fluids with no handler never receiving water overlay instead of using default behavior
  • Add static FluidRendering#render, which allows invoking FluidRenderHandler#renderFluid with a specified, possibly non-vanilla default renderer

- Fix default overlay block check using TransparentBlock instead of TranslucentBlock
- Fix setBlockTransparency/isBlockTransparent not being thread-safe
- Reuse the same render handler objects for water and lava
- Fix custom geometry being buffered twice if FluidRenderHandler#renderFluid is invoked directly
- Fix calling FluidRenderHandler.super.renderFluid not using passed arguments to calculate color
- Fix calling FluidRenderHandler.super.renderFluid more than once producing incorrect geometry
- Fix fluids with no handler never receiving water overlay instead of using default behavior
@modmuss50 modmuss50 added bug Something isn't working priority:medium Medium priority PRs that should get reviews labels Feb 16, 2024
Copy link
Member

@Technici4n Technici4n 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 from a very quick look.

@modmuss50 modmuss50 added the merge me please Pull requests that are ready to merge label Feb 17, 2024
@modmuss50 modmuss50 merged commit e761c66 into FabricMC:1.20.4 Feb 18, 2024
5 checks passed
modmuss50 pushed a commit that referenced this pull request Feb 18, 2024
* Fluid rendering fixes

- Fix default overlay block check using TransparentBlock instead of TranslucentBlock
- Fix setBlockTransparency/isBlockTransparent not being thread-safe
- Reuse the same render handler objects for water and lava

* Fix implementation issues

- Fix custom geometry being buffered twice if FluidRenderHandler#renderFluid is invoked directly
- Fix calling FluidRenderHandler.super.renderFluid not using passed arguments to calculate color
- Fix calling FluidRenderHandler.super.renderFluid more than once producing incorrect geometry
- Fix fluids with no handler never receiving water overlay instead of using default behavior

* Add way to render fluid with non-vanilla default

- Fix testmod

(cherry picked from commit e761c66)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working merge me please Pull requests that are ready to merge priority:medium Medium priority PRs that should get reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ice/Honey block/Slime block/Frosted Ice cause water to show flowing animation at the sides
3 participants