move fill fluids setting into the break config; only available if avoid fluids is enabled

Author: beanbag44

src/main/kotlin/com/lambda/config/groups/BreakSettings.kt

@@ -29,7 +29,6 @@ import com.lambda.interaction.managers.breaking.BreakConfig.BreakMode
 import com.lambda.interaction.managers.breaking.BreakConfig.SwingMode
 import com.lambda.util.NamedEnum
 import net.minecraft.block.Block
-import net.minecraft.world.attribute.EnvironmentAttributeModifier.override
 import java.awt.Color
 
 open class BreakSettings(
@@ -79,9 +78,9 @@ open class BreakSettings(
 
 	// Block
 	override val ignoredBlocks by c.setting("${prefix}Ignored Blocks", emptySet<Block>(), description = "Blocks that wont be broken", visibility = visibility).group(*baseGroup, Group.General).index()
-	override val avoidLiquids by c.setting("${prefix}Avoid Liquids", true, "Avoids breaking blocks that would cause liquid to spill", visibility = visibility).group(*baseGroup, Group.General).index()
+	override val avoidFluids by c.setting("${prefix}Avoid Fluids", true, "Avoids breaking blocks that would cause fluids to spill", visibility = visibility).group(*baseGroup, Group.General).index()
 	override val avoidSupporting by c.setting("${prefix}Avoid Supporting", true, "Avoids breaking the block supporting the player", visibility = visibility).group(*baseGroup, Group.General).index()
-
+	override val fillFluids by c.setting("Fill Fluids", true, "Fills fluids in order to break blocks that would initially spill them") { visibility() && avoidFluids }.group(*baseGroup, Group.General).index()
 	// Tool
 	override val efficientOnly by c.setting("${prefix}Efficient Tools Only", true, "Only use tools suitable for the given block (will get the item drop)") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()
 	override val suitableToolsOnly by c.setting("${prefix}Suitable Tools Only", true, "Only use tools suitable for the given block (will get the item drop)") { visibility() && swapMode.isEnabled() }.group(*baseGroup, Group.General).index()

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

@@ -94,7 +94,7 @@ class BreakSim private constructor(simInfo: SimInfo)
 			return
 		}
 
-		if (breakConfig.avoidLiquids && affectsFluids()) return
+		if (breakConfig.avoidFluids && affectsFluids()) return
 
 		val (swapStack, stackSelection) = getSwapStack() ?: return
 		val instant = instantBreakable(
@@ -265,15 +265,17 @@ class BreakSim private constructor(simInfo: SimInfo)
 		}
 
 		if (affectedFluids.isNotEmpty()) {
-			val liquidOutOfBounds = affectedFluids.any { !world.worldBorder.contains(it.key) }
-			if (liquidOutOfBounds) {
+			val fluidOutOfBounds = affectedFluids.any { !world.worldBorder.contains(it.key) }
+			if (fluidOutOfBounds) {
 				result(GenericResult.Ignored(pos))
 				return true
 			}
 
-			affectedFluids.forEach { (fluidPos, fluidState) ->
-				result(BreakResult.Submerge(fluidPos, fluidState))
-				sim(fluidPos, fluidState, TargetState.Solid(emptySet()))
+			if (breakConfig.fillFluids) {
+				affectedFluids.forEach { (fluidPos, fluidState) ->
+					result(BreakResult.Submerge(fluidPos, fluidState))
+					sim(fluidPos, fluidState, TargetState.Solid(emptySet()))
+				}
 			}
 			result(BreakResult.BlockedByFluid(pos, state, affectedFluids.keys))
 			return true

src/main/kotlin/com/lambda/interaction/construction/simulation/result/Rank.kt

@@ -21,7 +21,6 @@ enum class Rank {
     // solvable
     PlaceSuccess,
     BreakSuccess,
-    InteractSuccess,
     WrongItem,
     BreakItemCantMine,
     PlaceBlockedByPlayer,

src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/BreakResult.kt

@@ -21,7 +21,6 @@ import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.graphics.mc.RenderBuilder
-import com.lambda.graphics.mc.renderer.TickedRenderer
 import com.lambda.graphics.util.DirectionMask.mask
 import com.lambda.interaction.construction.simulation.context.BreakContext
 import com.lambda.interaction.construction.simulation.result.BuildResult
@@ -114,8 +113,8 @@ sealed class BreakResult : BuildResult() {
     }
 
     /**
-     * The block is a liquid and first has to be submerged.
-     * @param pos The position of the block that is a liquid.
+     * The block is a fluid and first has to be submerged.
+     * @param pos The position of the block that is a fluid.
      */
     data class Submerge(
         override val pos: BlockPos,
@@ -132,7 +131,7 @@ sealed class BreakResult : BuildResult() {
     }
 
     /**
-     * The block is blocked by another liquid block that first has to be submerged.
+     * The block is blocked by another fluid block that first has to be submerged.
      */
     data class BlockedByFluid(
         override val pos: BlockPos,

src/main/kotlin/com/lambda/interaction/managers/breaking/BreakConfig.kt

@@ -50,7 +50,8 @@ interface BreakConfig : ActionConfig, ISettingGroup {
 	val breakConfirmation: BreakConfirmationMode
 	val breaksPerTick: Int
 
-	val avoidLiquids: Boolean
+	val avoidFluids: Boolean
+	val fillFluids: Boolean
 	val avoidSupporting: Boolean
 	val ignoredBlocks: Collection<Block>
 

src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt

@@ -61,7 +61,7 @@ object FastBreak : Module(
 				}
 				breakConfig.apply {
 					editTyped(
-						::avoidLiquids,
+						::avoidFluids,
 						::avoidSupporting,
 						::efficientOnly,
 						::suitableToolsOnly

src/main/kotlin/com/lambda/module/modules/player/Nuker.kt

@@ -47,7 +47,6 @@ object Nuker : Module(
 	private val flattenMode by setting("Flatten Mode", FlattenMode.Standard)
 	private val directionalDig by setting("Directional Dig", DigDirection.None)
 	private val onGround by setting("On Ground", false, "Only break blocks when the player is standing on ground")
-	private val fillFluids by setting("Fill Fluids", false, "Removes liquids by filling them in before breaking")
 	private val fillFloor by setting("Fill Floor", false)
 	private val baritoneSelection by setting("Baritone Selection", false, "Restricts nuker to your baritone selection")
 	private val inverseSelection by setting("Inverse Selection", false, "Breaks blocks outside of the baritone selection and ignores blocks inside") { baritoneSelection }
@@ -75,7 +74,7 @@ object Nuker : Module(
 					.filter { flattenMode == FlattenMode.None || isInFlatten(it) }
 					.filter { isWithinDigDirection(it) }
 					.filter { isInBaritoneSelection(it) == !inverseSelection }
-					.associateWith { if (fillFluids) TargetState.Air else TargetState.Empty }
+					.associateWith { if (breakConfig.fillFluids) TargetState.Air else TargetState.Empty }
 
 				if (fillFloor) {
 					val floor = BlockPos.iterateOutwards(player.blockPos.down(), width, 0, width)

src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt

@@ -35,7 +35,6 @@ import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafeAutomated
 import com.lambda.util.BlockUtils.blockState
-import com.lambda.util.ChatUtils.colors
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import com.lambda.util.math.distSq
@@ -116,7 +115,7 @@ object PacketMine : Module(
 				}
 				breakConfig.apply {
 					editTyped(
-						::avoidLiquids,
+						::avoidFluids,
 						::avoidSupporting,
 						::efficientOnly,
 						::suitableToolsOnly

src/main/kotlin/com/lambda/module/modules/render/NoRender.kt

@@ -20,22 +20,12 @@ package com.lambda.module.modules.render
 import com.lambda.config.groups.EntitySelectionSettings
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.EntityUtils.blockEntityMap
-import com.lambda.util.EntityUtils.bossEntityMap
 import com.lambda.util.EntityUtils.createNameMap
-import com.lambda.util.EntityUtils.decorationEntityMap
-import com.lambda.util.EntityUtils.miscEntityMap
-import com.lambda.util.EntityUtils.mobEntityMap
-import com.lambda.util.EntityUtils.passiveEntityMap
-import com.lambda.util.EntityUtils.playerEntityMap
-import com.lambda.util.EntityUtils.projectileEntityMap
-import com.lambda.util.EntityUtils.vehicleEntityMap
 import com.lambda.util.NamedEnum
 import com.lambda.util.reflections.scanResult
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.client.particle.Particle
 import net.minecraft.entity.Entity
-import net.minecraft.entity.SpawnGroup
 
 //ToDo: Implement unimplemented settings. (Keep in mind compatibility with other mods like sodium)
 object NoRender : Module(

src/main/kotlin/com/lambda/util/player/prediction/MovementPrediction.kt

@@ -24,7 +24,7 @@ import com.lambda.context.SafeContext
  *
  * Currently not implemented:
  * - Elytra movement
- * - Movement in liquids
+ * - Movement in fluids
  * - Ladder climbing
  * - Movement in webs
  * - Sneaking safewalk