Fix inconsistency between vanilla and modded glass. Closes #4679

[Managarmr719]

Fixes #4679.

Changed BlockFluidRenderer::renderFluid to check the material instead of the block itself, so all blocks with Material.GLASS should now work fine.

[mezz]

Looks like a good, simple fix.

[williewillus]

do forge fluids handle this properly? they use ModelFluid instead of vanilla's BlockFluidRenderer

[mezz]

I just checked and Forge fluids don't handle any kind of glass, the sides are always flowing. I think that can be considered a different issue though, the Forge fluids probably still have a few rendering inconsistencies vs vanilla.

[mezz]

I think this will make water render incorrectly against glass panes.
Please check that the block is solid on the side that the fluid is against.

[HenryLoenwind]

I don't think glass isSolid?

[Managarmr719]

@mezz The way it is now, water against glass panes renders water_overlay, which differs from vanilla behaviour, normally it would render water_overlay for glass blocks and water_flow for everything else (including glass panes).

[Managarmr719]

@mezz It does cause some issues with glass panes. :\

Before:

After:

[Managarmr719]

Water blocks against glass panes now render correctly. BlockFluidRenderer::renderFluid now checks if the adjacent blocks are not glass panes and only then renders water_overlay.

[mezz]

I think it's important to look at the reasoning behind why glass works this way, and look at the block's properties instead of using anything like == or instanceof Block. Ideally these rules should work for modded blocks properly, without people having to really think about it.

[Managarmr719]

Something like this if (state.getBlockFaceShape(blockAccess, blockpos, EnumFacing.UP) == BlockFaceShape.SOLID) { ... }? By doing things this way, only "full" blocks should use water_overlay and from what I tested it seems to work fine, even with modded blocks.

[Managarmr719]

It would also need to check the bottom otherwise slabs would not work properly.

[Managarmr719]

Improved over the example above. Now checks the block faces that are against the water block to see if they're solid.

[mezz]

Looks good, just need to fix the patches so there are no import changes.

[mezz]

Patches to Minecraft code should not change the imports.
Instead of importing, use the fully qualifies name where you need it, like net.minecraft.block.state.BlockFaceShape.SOLID

[mezz]

I think EnumFacing.VALUES[i1+2] should be EnumFacing.getHorizontal(i1)

[Managarmr719]

That doesn't work because VALUES and HORIZONTALS are ordered differently. (getHorizontal() just returns the values from HORIZONTALS)

VALUES[2] -> NORTH
VALUES[3] -> SOUTH
VALUES[4] -> WEST
VALUES[5] -> EAST

HORIZONTALS[0] -> SOUTH
HORIZONTALS[1] -> WEST
HORIZONTALS[2] -> NORTH
HORIZONTALS[3] -> EAST

BlockFluidRenderer::renderFluid checks the adjacent blocks in the same order as VALUES, so if I used EnumFacing.getHorizontal(i1) it would check the wrong side of the block, it wouldn't check the side that's against water.

[Managarmr719]

Probably would make sense to make HORIZONTALS follow the same order as VALUES. Then it would be possible to use getHorizontal(i1) instead of VALUES[i1+2]. Although it would break something that depends on it being in the current order. :\

[mezz]

Yuck, ok. Nothing we can do about that, yeah.

[mezz]

Can you make a final screenshot to show this off?

[Managarmr719]

Here are some screenshots but I also found some issues.

Here's an image showing what makes water render water_overlay and what doesn't:

Water next to any solid face now renders water_overlay.

1. Glass Pane
2. Diamond Glass Pane - Diamond Glass
3. Diamond Glass Stairs (side) - Diamond Glass
4. Stone Slab
5. Structuralduct with Hardened Silver Glass Cover - Thermal Dynamics *1
6. Cobblestone Structure Pipe with Facade: Glass - Buildcraft *2
7. Thickened Glass - Extra Utilities
8. Glass
9. Diamond Glass - Diamond Glass
10. Ice
11. Hardened Copper Glass - Thermal Foundation
12. Diamond Glass Stairs (back to water) - Diamond Glass

Issues:

1.

As you can see in the image below, it wasn't working properly, the water is flowing even with the cover. I managed to fix this by also checking isSideSolid().

Before:

After:

2.

This one also doesn't work right and it's even worse than the first. It's always solid even without a facade on, wich makes it look like this when underwater:

[mezz]

I think just one check for getBlockFaceShape should be good enough, checking both seems like a workaround for a minor bug in BuildCraft.

[Managarmr719]

Reset to previous commit, I don't know if that's the best way to do it, but I thought it would make more sense than leaving it in and having another undoing it. Anyway, now it only checks getBlockFaceShape.