wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use more correct block color getting (thanks greener_ca)

Browse Source
This commit is contained in:
James Seibel
2026-04-08 17:28:10 -05:00
parent 0bd36bff1d
commit 72a888f3ff
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java
+23 -20
View File
@@ -551,21 +551,17 @@ public class ClientBlockStateColorCache
.getTintSource(this.blockState, this.tintIndex);
if (tintSource != null)
{
tintColor = tintSource.color(this.blockState);
// Try colorInWorld first (biome-aware for grass/foliage),
// fall back to colorAsTerrainParticle (biome-aware for water).
// Grass overrides colorAsTerrainParticle to return -1,
// water doesn't override colorInWorld (defaults to -1).
BlockPos mcPos = McObjectConverter.Convert(blockPos);
tintColor = tintSource.colorInWorld(this.blockState, tintOverride, mcPos);
if (tintColor == -1)
{
tintColor = tintSource.colorAsTerrainParticle(this.blockState, tintOverride, mcPos);
}
}
if (tintColor == -1)
{
ClientLevel level = (ClientLevel)this.clientLevelWrapper.getWrappedMcObject();
tintSource.colorInWorld(this.blockState, level, BlockPos.ZERO);
}
if (tintColor == -1)
{
ClientLevel level = (ClientLevel)this.clientLevelWrapper.getWrappedMcObject();
tintSource.colorAsTerrainParticle(this.blockState, level, BlockPos.ZERO);
}
#endif
}
}
@@ -597,12 +593,19 @@ public class ClientBlockStateColorCache
McObjectConverter.Convert(blockPos),
this.tintIndex);
#else
tintColor = Minecraft.getInstance()
.getBlockColors()
.getTintSources(this.blockState)
.get(this.tintIndex)
.color(this.blockState);
#endif
BlockTintSource tintSource = Minecraft.getInstance()
.getBlockColors()
.getTintSource(this.blockState, this.tintIndex);
if (tintSource != null)
{
net.minecraft.core.BlockPos mcPos = McObjectConverter.Convert(blockPos);
tintColor = tintSource.colorInWorld(this.blockState, tintOverride, mcPos);
if (tintColor == -1)
{
tintColor = tintSource.colorAsTerrainParticle(this.blockState, tintOverride, mcPos);
}
}
#endif
}
}
}