Make Water Circle color based on actual biome water color

PinkGoosik · Mar 30, 2024 · 4dc41a8 · 4dc41a8
1 parent 9eaa6d0
commit 4dc41a8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/visuality/event/CirclesOnWaterEvent.java b/src/main/java/visuality/event/CirclesOnWaterEvent.java
@@ -39,8 +39,7 @@ public static void onTick(ClientWorld world) {
 			if(!(biome.getPrecipitation(topPos).equals(Biome.Precipitation.RAIN)) || !(biome.doesNotSnow(player.getSteppingPos()))) continue;
 			if(world.getBlockState(topPos.down()).isOf(Blocks.WATER) && world.getBlockState(topPos).isAir()) {
 				if(world.getFluidState(topPos.down()).getLevel() == 8) {
-					int color = config.waterCircles.colored ? biome.getWaterColor() : 0;
-					ParticleUtils.add(world, VisualityParticles.WATER_CIRCLE, topPos.getX() + random.nextDouble(), topPos.getY() + 0.05D, topPos.getZ() + random.nextDouble(), color);
+					ParticleUtils.add(world, VisualityParticles.WATER_CIRCLE, topPos.getX() + random.nextDouble(), topPos.getY() + 0.05D, topPos.getZ() + random.nextDouble());
 				}
 			}
 		}

diff --git a/src/main/java/visuality/particle/WaterCircleParticle.java b/src/main/java/visuality/particle/WaterCircleParticle.java
@@ -1,33 +1,38 @@
 package visuality.particle;
 
+import net.minecraft.client.color.world.BiomeColors;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import visuality.VisualityMod;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
 public class WaterCircleParticle extends SpriteBillboardParticle {
 	private final SpriteProvider sprites;
 	private static final Quaternionf QUATERNION = new Quaternionf(0F, -0.7F, 0.7F, 0F);
 
-	private WaterCircleParticle(ClientWorld world, double x, double y, double z, double color, SpriteProvider sprites) {
+	private WaterCircleParticle(ClientWorld world, double x, double y, double z, SpriteProvider sprites) {
 		super(world, x, y, z, 0, 0, 0);
 		this.maxAge = 5 + this.random.nextInt(3);
 		this.setVelocity(0D, 0D, 0D);
-		if(color != 0) this.setColor((int) color);
+		if (VisualityMod.config.waterCircles.colored) this.setColor();
 		this.scale(2F + (float) this.random.nextInt(11) / 10);
 		this.sprites = sprites;
 		this.setSpriteForAge(sprites);
 	}
 
-	public void setColor(int rgbHex) {
-		float red = (float) ((rgbHex & 16711680) >> 16) / 255.0F;
-		float green = (float) ((rgbHex & '\uff00') >> 8) / 255.0F;
-		float blue = (float) ((rgbHex & 255)) / 255.0F;
+	public void setColor() {
+		var waterColor = BiomeColors.getWaterColor(this.world, BlockPos.ofFloored(x, y, z));
+		var red = ColorHelper.Argb.getRed(waterColor) / 255.0f;
+		var green = ColorHelper.Argb.getGreen(waterColor) / 255.0f;
+		var blue = ColorHelper.Argb.getBlue(waterColor) / 255.0f;
 		this.setColor(red, green, blue);
 	}
 
@@ -79,7 +84,7 @@ public ParticleTextureSheet getType() {
 
 	public record Factory(SpriteProvider sprites) implements ParticleFactory<DefaultParticleType> {
 		public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double velX, double velY, double velZ) {
-			return new WaterCircleParticle(world, x, y, z, velX, sprites);
+			return new WaterCircleParticle(world, x, y, z, sprites);
 		}
 	}
 }