fix water colors for 1.20.1 and 1.21.1

Author: moehreag

1.20/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java

@@ -312,7 +312,7 @@ public void updateMapView() {
 						var floorColor = floorBlock.getMapColor(level, mutableBlockPos2).col;
 						int biomeColor = enableBiomeBlending.get() ? BiomeColors.getAverageWaterColor(level, mutableBlockPos) : mapColor.col;
 						float shade = level.getShade(Direction.UP, true);
-						int waterColor = biomeColor;
+						int waterColor = ARGB.fromABGR(biomeColor);
 						waterColor = ARGB.colorFromFloat(1f, ARGB.redFloat(waterColor) * shade, ARGB.greenFloat(waterColor) * shade, ARGB.blueFloat(waterColor) * shade);
 						waterColor = ARGB.average(waterColor, ARGB.scaleRGB(floorColor, 1f - fluidDepth / 15f));
 						color = waterColor;

1.20/src/main/java/io/github/axolotlclient/waypoints/map/WorldMapScreen.java

@@ -700,7 +700,7 @@ public void update(int caveY, boolean atSurface, Level level) {
 						var floorColor = floorBlock.getMapColor(level, mutableBlockPos2).col;
 						int biomeColor = mapColor.col; //BiomeColors.getAverageWaterColor(level, mutableBlockPos);
 						float shade = level.getShade(Direction.UP, true);
-						int waterColor = biomeColor;
+						int waterColor = ARGB.fromABGR(biomeColor);
 						waterColor = ARGB.colorFromFloat(1f, ARGB.redFloat(waterColor) * shade, ARGB.greenFloat(waterColor) * shade, ARGB.blueFloat(waterColor) * shade);
 						waterColor = ARGB.average(waterColor, ARGB.scaleRGB(floorColor, 1f - fluidDepth / 15f));
 						color = waterColor;

1.21/src/main/java/io/github/axolotlclient/waypoints/map/Minimap.java

@@ -312,7 +312,7 @@ public void updateMapView() {
 						var floorColor = floorBlock.getMapColor(level, mutableBlockPos2).col;
 						int biomeColor = enableBiomeBlending.get() ? BiomeColors.getAverageWaterColor(level, mutableBlockPos) : mapColor.col;
 						float shade = level.getShade(Direction.UP, true);
-						int waterColor = biomeColor;
+						int waterColor = ARGB.fromABGR(biomeColor);
 						waterColor = ARGB.colorFromFloat(1f, ARGB.redFloat(waterColor) * shade, ARGB.greenFloat(waterColor) * shade, ARGB.blueFloat(waterColor) * shade);
 						waterColor = ARGB.average(waterColor, ARGB.scaleRGB(floorColor, 1f - fluidDepth / 15f));
 						color = waterColor;

1.21/src/main/java/io/github/axolotlclient/waypoints/map/WorldMapScreen.java

@@ -709,7 +709,7 @@ public void update(int caveY, boolean atSurface, Level level) {
 						var floorColor = floorBlock.getMapColor(level, mutableBlockPos2).col;
 						int biomeColor = mapColor.col; //BiomeColors.getAverageWaterColor(level, mutableBlockPos);
 						float shade = level.getShade(Direction.UP, true);
-						int waterColor = biomeColor;
+						int waterColor = ARGB.fromABGR(biomeColor);
 						waterColor = ARGB.colorFromFloat(1f, ARGB.redFloat(waterColor) * shade, ARGB.greenFloat(waterColor) * shade, ARGB.blueFloat(waterColor) * shade);
 						waterColor = ARGB.average(waterColor, ARGB.scaleRGB(floorColor, 1f - fluidDepth / 15f));
 						color = waterColor;

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.0.1-beta.14
+
+- fix water colors for 1.20.1 + 1.21.1
+
 ### 0.0.1-beta.13
 
 - fix minimap scissoring for 1.20.1 + 1.21.1

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=0.0.1-beta.13+3.1.5
+version=0.0.1-beta.14+3.1.5
 
 maven_group=io.github.axolotlclient.waypoints