Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864)

Fix weighted baked models not respecting children render types
Allow fluid container model to use base texture as particle
Fix inverted behavior in composite model building. Fixes #8871
This commit is contained in:
Néstor Amador authored and GitHub committed 2022-07-20 15:25:07 -07:00
1 parent 427b335cac
commit 8cd2c9c63f
8 files changed
+117 -26

No files matched your search

@@ -272,14 +272,14 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads)
{
var modelBuilder = IModelBuilder.of(true, isSideLit, false, transforms, overrides, particle, renderTypes);
var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes);
quads.forEach(modelBuilder::addUnculledFace);
children.add(modelBuilder.build());
}
private void flushQuads(RenderTypeGroup renderTypes)
{
if (Objects.equals(renderTypes, lastRenderTypes))
if (!Objects.equals(renderTypes, lastRenderTypes))
{
if (quads.size() > 0)
{
@@ -128,6 +128,7 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
TextureAtlasSprite particleSprite = particleLocation != null ? spriteGetter.apply(particleLocation) : null;
if (particleSprite == null) particleSprite = fluidSprite;
if (particleSprite == null) particleSprite = baseSprite;
if (particleSprite == null && !coverIsMask) particleSprite = coverSprite;
// If the fluid is lighter than air, rotate 180deg to turn it upside down