Fluid Selection setting in XRay, including flowing water, water, flowing lava and lava. Helpful for removing large areas as you can disable flowing water to only see sources

Author: beanbag44

src/main/java/com/lambda/mixin/render/AbstractBlockRenderContextMixin.java

@@ -32,7 +32,7 @@ public class AbstractBlockRenderContextMixin {
 
     @ModifyReturnValue(method = "shouldDrawSide", at = @At("RETURN"))
     private boolean modifyShouldDrawSide(boolean original) {
-        if (XRay.INSTANCE.isEnabled() && XRay.isSelected(state) && XRay.getOpacity() < 100)
+        if (XRay.INSTANCE.isEnabled() && XRay.getBlockSelection().contains(state.getBlock()) && XRay.getOpacity() < 100)
             return true;
         return original;
     }

src/main/java/com/lambda/mixin/render/AbstractTerrainRenderContextMixin.java

@@ -36,7 +36,7 @@ public class AbstractTerrainRenderContextMixin {
 
     @Inject(method = "bufferQuad", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/impl/client/indigo/renderer/render/AbstractTerrainRenderContext;bufferQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;Lnet/minecraft/client/render/VertexConsumer;)V"), cancellable = true)
     private void injectBufferQuad(MutableQuadViewImpl quad, CallbackInfo ci) {
-        if (XRay.INSTANCE.isDisabled() || XRay.isSelected(blockInfo.blockState)) return;
+        if (XRay.INSTANCE.isDisabled() || XRay.getBlockSelection().contains(blockInfo.blockState.getBlock())) return;
         int opacity = XRay.getOpacity();
 
         if (opacity == 0) ci.cancel();

src/main/java/com/lambda/mixin/render/BlockMixin.java

@@ -29,7 +29,7 @@
 public class BlockMixin {
     @ModifyReturnValue(method = "shouldDrawSide", at = @At("RETURN"))
     private static boolean modifyShouldDrawSide(boolean original, BlockState state, BlockState otherState, Direction side) {
-        if (XRay.INSTANCE.isEnabled() && XRay.isSelected(state) && XRay.getOpacity() < 100)
+        if (XRay.INSTANCE.isEnabled() && XRay.getBlockSelection().contains(state.getBlock()) && XRay.getOpacity() < 100)
             return true;
         return original;
     }

src/main/java/com/lambda/mixin/render/FluidRendererMixin.java

@@ -37,10 +37,11 @@ public class FluidRendererMixin {
 
     @Inject(method = "render", at = @At("HEAD"), cancellable = true)
     private void injectRender(BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, CallbackInfo info) {
-        if (XRay.INSTANCE.isDisabled()) {
+        if (XRay.INSTANCE.isDisabled() || !XRay.getFluidSelection().contains(fluidState.getFluid())) {
             opacity.set(255);
             return;
         }
+
         int alpha = (int) (XRay.getOpacity() * 2.55);
 
         if (alpha == 0) info.cancel();

src/main/java/com/lambda/mixin/render/RenderLayersMixin.java

@@ -34,7 +34,7 @@ private static void injectGetBlockLayer(BlockState state, CallbackInfoReturnable
         if (XRay.INSTANCE.isDisabled()) return;
         final var opacity = XRay.getOpacity();
         if (opacity <= 0 || opacity >= 100) return;
-        if (!XRay.isSelected(state)) cir.setReturnValue(BlockRenderLayer.TRANSLUCENT);
+        if (!XRay.getBlockSelection().contains(state.getBlock())) cir.setReturnValue(BlockRenderLayer.TRANSLUCENT);
     }
 
     @Inject(method = "getFluidLayer", at = @At("HEAD"), cancellable = true)

src/main/java/com/lambda/mixin/render/SodiumBlockRendererMixin.java

@@ -31,7 +31,7 @@
 public class SodiumBlockRendererMixin {
     @Inject(method = "renderModel", at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/model/color/ColorProviderRegistry;getColorProvider(Lnet/minecraft/block/Block;)Lnet/caffeinemc/mods/sodium/client/model/color/ColorProvider;", shift = At.Shift.AFTER), cancellable = true)
     private void injectRenderModel(BlockStateModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
-        if (XRay.INSTANCE.isEnabled() && !XRay.isSelected(state) && XRay.getOpacity() < 100)
+        if (XRay.INSTANCE.isEnabled() && !XRay.getBlockSelection().contains(state.getBlock()) && XRay.getOpacity() < 100)
             ci.cancel();
     }
 }

src/main/java/com/lambda/mixin/render/SodiumFluidRendererImplMixin.java

@@ -34,7 +34,9 @@
 public class SodiumFluidRendererImplMixin {
     @Inject(method = "render", at = @At("HEAD"), cancellable = true)
     private void injectRender(LevelSlice level, BlockState blockState, FluidState fluidState, BlockPos blockPos, BlockPos offset, TranslucentGeometryCollector collector, ChunkBuildBuffers buffers, CallbackInfo info) {
-        if (XRay.INSTANCE.isEnabled() && !XRay.isSelected(blockState) && XRay.getOpacity() < 100)
-            info.cancel();
+        if (XRay.INSTANCE.isEnabled() &&
+                !XRay.getFluidSelection().contains(fluidState.getFluid()) &&
+                XRay.getOpacity() < 100
+        ) info.cancel();
     }
 }

src/main/java/com/lambda/mixin/render/SodiumLightDataAccessMixin.java

@@ -39,8 +39,8 @@ public class SodiumLightDataAccessMixin {
     @ModifyVariable(method = "compute", at = @At(value = "TAIL"), name = "bl")
     private int modifyLight(int value) {
         if (XRay.INSTANCE.isEnabled()) {
-            final var blockState = level.getBlockState(pos);
-            if (XRay.isSelected(blockState)) return 0xFFF;
+            final var block = level.getBlockState(pos).getBlock();
+            if (XRay.getBlockSelection().contains(block)) return 0xFFF;
         }
 
         return value;

src/main/kotlin/com/lambda/config/Config.kt

@@ -30,6 +30,7 @@ import com.lambda.config.settings.StringSetting
 import com.lambda.config.settings.collections.BlockCollectionSetting
 import com.lambda.config.settings.collections.ClassCollectionSetting
 import com.lambda.config.settings.collections.CollectionSetting
+import com.lambda.config.settings.collections.FluidCollectionSetting
 import com.lambda.config.settings.collections.ItemCollectionSetting
 import com.lambda.config.settings.collections.MapSetting
 import com.lambda.config.settings.comparable.BooleanSetting
@@ -49,6 +50,7 @@ import com.lambda.imgui.flag.ImGuiInputTextFlags
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
 import net.minecraft.block.Block
+import net.minecraft.fluid.Fluid
 import net.minecraft.item.Item
 import net.minecraft.registry.Registries
 import net.minecraft.util.math.BlockPos
@@ -242,6 +244,16 @@ abstract class Config(
 
 	@ConfigEntryDsl
 	@JvmName("collectionSetting3")
+	fun setting(
+		name: String,
+		defaultValue: Collection<Fluid>,
+		immutableCollection: Collection<Fluid> = Registries.FLUID.toList(),
+		description: String = "",
+		visibility: () -> Boolean = { true }
+	) = setting(name) { layer -> FluidCollectionSetting(name, description, this, layer, visibility, immutableCollection, defaultValue.toMutableList()) }
+
+	@ConfigEntryDsl
+	@JvmName("collectionSetting4")
 	inline fun <reified T : Any> setting(
 		name: String,
 		defaultValue: Collection<T>,

src/main/kotlin/com/lambda/config/ConfigEditor.kt

@@ -21,6 +21,7 @@ package com.lambda.config
 
 import com.lambda.config.entries.Property
 import com.lambda.config.entries.Setting
+import com.lambda.config.entries.Setting.Companion.onValueChange
 import com.lambda.context.SafeContext
 import kotlin.reflect.KProperty0
 import kotlin.reflect.jvm.isAccessible