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

Merge branch 'main' into 'main'

Browse Source 
Fix querying block colors at constant position.

See merge request jeseibel/minecraft-lod-mod!34
This commit is contained in:
James Seibel
2023-08-18 03:05:23 +00:00
parent 2ff1b80650 7e0e51103b
commit 5193a3313d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ public class ClientBlockDetailMap
public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos)
{
return getBlockStateData(state, pos).getAndResolveFaceColor(biome);
return getBlockStateData(state, pos).getAndResolveFaceColor(biome, pos);
}
}
common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java
Vendored
+2 -2
View File
@@ -211,12 +211,12 @@ public class ClientBlockStateCache
isColorResolved = true;
}
public int getAndResolveFaceColor(BiomeWrapper biome)
public int getAndResolveFaceColor(BiomeWrapper biome, DhBlockPos pos)
{
// FIXME: impl per-face colors
if (!needPostTinting) return baseColor;
int tintColor = Minecraft.getInstance().getBlockColors()
.getColor(state, new TintWithoutLevelOverrider(biome), pos, tintIndex);
.getColor(state, new TintWithoutLevelOverrider(biome), McObjectConverter.Convert(pos), tintIndex);
if (tintColor == -1) return baseColor;
return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
}