StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'kotlin-1.10' into kotlin-1.11.2

Browse Source
This commit is contained in:
octarine-noise
2017-05-06 09:38:10 +02:00
parent 28cead464e a9fba1a18e
commit fde6c47ed3
15 changed files with 103 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/mods/betterfoliage/client/texture/GrassRegistry.kt
View File

@@ -20,6 +20,7 @@ import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.fml.relauncher.Side
import net.minecraftforge.fml.relauncher.SideOnly
import org.apache.logging.log4j.Level
import java.lang.Math.min
const val defaultGrassColor = 0
@@ -93,8 +94,9 @@ object StandardGrassSupport :
logger.log(Level.DEBUG, "$logName: texture ${texture.iconName}")
val hsb = HSB.fromColor(texture.averageColor ?: defaultGrassColor)
val overrideColor = if (hsb.saturation >= Config.shortGrass.saturationThreshold) {
logger.log(Level.DEBUG, "$logName: brightness ${hsb.brightness}")
logger.log(Level.DEBUG, "$logName: saturation ${hsb.saturation} >= ${Config.shortGrass.saturationThreshold}, using texture color")
hsb.copy(brightness = 0.9f).asColor
hsb.copy(brightness = min(0.9f, hsb.brightness * 2.0f)).asColor
} else {
logger.log(Level.DEBUG, "$logName: saturation ${hsb.saturation} < ${Config.shortGrass.saturationThreshold}, using block color")
null