diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt index 8ca40e08b..31c8e3fe8 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -27,5 +27,6 @@ object Colors { val TRANSPARENT = RGBColor(0, 0, 0, 0) - const val WHITE = 0xFFFFFFFF.toInt() + const val WHITE_RGB = 0xFFFFFF + const val WHITE_RGBA = 0xFFFFFFFF.toInt() } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt index b262030b2..0bdd5842c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/FluidSectionMesher.kt @@ -108,7 +108,7 @@ class FluidSectionMesher( position = Vec3i(offsetX + x, offsetY + y, offsetZ + z) val height = fluid.getHeight(state) - tint = tints.getFluidTint(chunk, fluid, height, position.x, position.y, position.z) ?: Colors.WHITE + tint = tints.getFluidTint(chunk, fluid, height, position.x, position.y, position.z) ?: Colors.WHITE_RGB val cornerHeights = floatArrayOf( getCornerHeight(chunk, chunkPosition, position, fluid), diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintProvider.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintProvider.kt index 3dcb4732f..96644724e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintProvider.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintProvider.kt @@ -19,13 +19,13 @@ import de.bixilon.minosoft.data.registries.fluid.Fluid import de.bixilon.minosoft.data.text.formatting.color.Colors interface TintProvider { - fun getBlockColor(blockState: BlockState, biome: Biome?, x: Int, y: Int, z: Int, tintIndex: Int): Int = Colors.WHITE + fun getBlockColor(blockState: BlockState, biome: Biome?, x: Int, y: Int, z: Int, tintIndex: Int): Int = Colors.WHITE_RGB fun getParticleColor(blockState: BlockState, biome: Biome?, x: Int, y: Int, z: Int): Int { return getBlockColor(blockState, biome, x, y, z, 0) } - fun getItemColor(stack: ItemStack, tintIndex: Int): Int = Colors.WHITE + fun getItemColor(stack: ItemStack, tintIndex: Int): Int = Colors.WHITE_RGB - fun getFluidTint(fluid: Fluid, biome: Biome?, height: Float, x: Int, y: Int, z: Int): Int = Colors.WHITE + fun getFluidTint(fluid: Fluid, biome: Biome?, height: Float, x: Int, y: Int, z: Int): Int = Colors.WHITE_RGB } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/grass/GrassTintCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/grass/GrassTintCalculator.kt index ae50ee66d..b261c71fb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/grass/GrassTintCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/grass/GrassTintCalculator.kt @@ -52,7 +52,7 @@ class GrassTintCalculator : ColorMapTint(FILE) { override fun getParticleColor(blockState: BlockState, biome: Biome?, x: Int, y: Int, z: Int): Int { if (blockState.block is GrassBlock) { // dirt particles - return Colors.WHITE + return Colors.WHITE_RGB } return getBlockColor(biome) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/SugarCaneTintCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/SugarCaneTintCalculator.kt index 75fcf1644..0312856eb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/SugarCaneTintCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/tints/plants/SugarCaneTintCalculator.kt @@ -27,6 +27,6 @@ class SugarCaneTintCalculator(val grassTintCalculator: GrassTintCalculator) : Ti } override fun getItemColor(stack: ItemStack, tintIndex: Int): Int { - return Colors.WHITE + return Colors.WHITE_RGB } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt index dfc0e7b01..bb84f8ffb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt @@ -28,7 +28,7 @@ open class SimpleTextureMesh(context: RenderContext, primitiveType: PrimitiveTyp data.add(position.array) data.add(uv.array) data.add(texture.renderData.shaderTextureId.buffer()) - data.add((tintColor?.rgba ?: Colors.WHITE).buffer()) + data.add((tintColor?.rgba ?: Colors.WHITE_RGBA).buffer()) }