air place additions. Render State option which renders the unplaced block at lower opacity and a rotation scroll bind to change the direction of the block

Author: beanbag44

src/main/kotlin/com/lambda/module/modules/world/AirPlace.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.module.modules.world
 
+import com.lambda.Lambda.mc
 import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
 import com.lambda.config.applyEdits
 import com.lambda.config.settings.complex.Bind
@@ -29,6 +30,7 @@ import com.lambda.graphics.mc.renderer.TickedRenderer.Companion.tickedRenderer
 import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
 import com.lambda.interaction.construction.simulation.context.BuildContext
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.managers.interacting.InteractRequest
 import com.lambda.interaction.managers.interacting.InteractRequest.Companion.interactRequest
 import com.lambda.interaction.managers.rotating.Rotation.Companion.rotation
 import com.lambda.module.Module
@@ -37,33 +39,61 @@ import com.lambda.threading.runSafeAutomated
 import com.lambda.util.InputUtils.isSatisfied
 import com.lambda.util.KeyCode
 import com.lambda.util.NamedEnum
+import com.lambda.util.math.setAlpha
+import com.lambda.util.math.vec3d
 import net.minecraft.block.BlockState
+import net.minecraft.fluid.FlowableFluid
 import net.minecraft.item.BlockItem
+import net.minecraft.item.BucketItem
+import net.minecraft.item.DebugStickItem
 import net.minecraft.item.ItemPlacementContext
+import net.minecraft.state.property.Properties
 import net.minecraft.util.Hand
+import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Box
+import net.minecraft.util.math.Vec3d
+import net.minecraft.util.math.random.Random
 import net.minecraft.world.RaycastContext
 import org.lwjgl.glfw.GLFW
+import java.awt.Color
 import java.util.concurrent.ConcurrentLinkedQueue
 
 object AirPlace : Module(
 	name = "AirPlace",
 	description = "Allows placing blocks in air",
 	tag = ModuleTag.WORLD
 ) {
-	enum class Group(override val displayName: String) : NamedEnum {
+	private enum class Group(override val displayName: String) : NamedEnum {
 		General("General"),
 		Render("Render")
 	}
 
 	private var distance by setting("Distance", 4.0, 1.0..7.0, 0.01).group(Group.General)
-	private val scrollBind by setting("Scroll Bind", Bind(KeyCode.Unbound.code, GLFW.GLFW_MOD_CONTROL), "Allows you to hold the ctrl key and scroll to adjust distance").group(Group.General)
+	private val buckets by setting("Buckets", true, "Enables air placement for buckets filled with fluids").group(Group.General)
+	private val distanceScrollBind by setting("Distance Scroll Bind", Bind(KeyCode.Unbound.code, GLFW.GLFW_MOD_CONTROL), "Allows you to hold the given key and scroll to adjust distance").group(Group.General)
+	private val rotationScrollBind by setting("Rotation Scroll Bind", Bind(KeyCode.Unbound.code, GLFW.GLFW_MOD_ALT), "Allows you to hold the given key and scroll to adjust the rotation of the block you're placing").group(Group.General)
+
+	private val renderState by setting("Render State", true).group(Group.Render)
+	private val lineColor by setting("Line Color", Color.WHITE).group(Group.Render)
+	private val stateAlpha by setting("State Alpha", 0.5, 0.01..1.0, 0.01).group(Group.Render)
 
 	private var placementPos: BlockPos? = null
+	private var backingState: BlockState? = null
 	private var placementState: BlockState? = null
 	private val pendingInteractions = ConcurrentLinkedQueue<BuildContext>()
 
+	private var request: InteractRequest? = null
+	private var extraPlaceTicks = 0
+
+	private val rotatingProperties = arrayOf(
+		Properties.ROTATION,
+		Properties.FACING,
+		Properties.HORIZONTAL_FACING,
+		Properties.HORIZONTAL_AXIS,
+		Properties.AXIS,
+		Properties.HOPPER_FACING
+	)
+
 	init {
 		setDefaultAutomationConfig {
 			applyEdits {
@@ -72,56 +102,120 @@ object AirPlace : Module(
 		}
 
 		listen<TickEvent.Pre> {
+			if (request?.done == false) {
+				airPlace()
+				extraPlaceTicks++
+				if (extraPlaceTicks > 40) request = null
+				return@listen
+			} else {
+				extraPlaceTicks = 0
+				request = null
+			}
+
 			val selectedStack = player.inventory.selectedStack
-			val blockItem = selectedStack.item as? BlockItem ?: run {
-				placementPos = null
-				placementState = null
+			val blockItem = selectedStack.item as? BlockItem
+			if (blockItem != null) {
+				val placementContext = ItemPlacementContext(
+					world,
+					player, Hand.MAIN_HAND,
+					selectedStack,
+					getHitResult()
+				)
+				setPosAndState(placementContext.blockPos, blockItem.getPlacementState(placementContext))
 				return@listen
 			}
-			val raycastEnd = player.rotation.vector.multiply(distance).add(player.eyePos)
-			val raycastContext = RaycastContext(
-				player.eyePos,
-				raycastEnd,
-				RaycastContext.ShapeType.OUTLINE,
-				RaycastContext.FluidHandling.NONE,
-				player
-			)
-			val placementContext = ItemPlacementContext(
-				world,
-				player, Hand.MAIN_HAND,
-				selectedStack,
-				world.raycast(raycastContext),
-			)
-			placementPos = placementContext.blockPos
-			placementState = blockItem.getPlacementState(placementContext)
+
+			if (buckets) run bucket@{
+				val item = selectedStack.item
+				if (item !is BucketItem) return@bucket
+				val fluid = item.fluid as? FlowableFluid ?: return@bucket
+				if (item.fluid !is FlowableFluid) return@bucket
+				placementPos = getHitResult().blockPos
+				placementState = fluid.defaultState.blockState
+			}
+			setPosAndState()
+			return@listen
 		}
 
 		listen<PlayerEvent.Interact.Block> { if (airPlace()) it.cancel() }
 		listen<PlayerEvent.Interact.Item> { if (airPlace()) it.cancel() }
 
 		tickedRenderer("Air Place Ticked Renderer") { safeContext ->
 			placementPos?.let { pos ->
-				val boxes = placementState?.getOutlineShape(safeContext.world, pos)?.boundingBoxes
-					?: listOf(Box(0.0, 0.0, 0.0, 1.0, 1.0, 1.0))
-				boxes.forEach { box ->
-					box(box.offset(pos)) { hideFill() }
+				placementState?.let { state ->
+					val boxes = state.getOutlineShape(safeContext.world, pos).boundingBoxes.map { it.offset(pos) }
+					boxes.forEach { box ->
+						box(box) {
+							hideFill()
+							outlineColor(lineColor)
+						}
+					}
+					if (renderState) {
+						val model = mc.bakedModelManager.blockModels.getModel(state)
+						val parts = model.getParts(Random.create())
+						parts.forEach { part ->
+							model(
+								part,
+								pos = pos.vec3d,
+								scale = Vec3d(1.0, 1.0, 1.0),
+								pixelPerfect = true,
+								color = Color.WHITE.setAlpha(stateAlpha)
+							)
+						}
+					}
 				}
 			}
 		}
 
 		listen<ButtonEvent.Mouse.Scroll> { event ->
-			if (!scrollBind.isSatisfied()) return@listen
-			event.cancel()
-			distance += event.delta.y
+			if (distanceScrollBind.isSatisfied()) {
+				event.cancel()
+				distance += event.delta.y
+				return@listen
+			} else if (rotationScrollBind.isSatisfied()) {
+				event.cancel()
+				placementState = placementState?.withSteppedRotation(event.delta.y < 0)
+			}
 		}
 	}
 
+	private fun setPosAndState(pos: BlockPos? = null, state: BlockState? = null) {
+		if (state === backingState) {
+			placementPos = pos
+			return
+		}
+		backingState = state
+		placementState = state
+	}
+
+	private fun BlockState.withSteppedRotation(reverse: Boolean): BlockState {
+		var rotatedState = this
+		rotatingProperties.forEach { property ->
+			if (property in rotatedState) {
+				rotatedState = DebugStickItem.cycle(rotatedState, property, reverse)
+			}
+		}
+		return rotatedState
+	}
+
+	private fun SafeContext.getHitResult(): BlockHitResult {
+		val raycastEnd = player.rotation.vector.multiply(distance).add(player.eyePos)
+		val raycastContext = RaycastContext(
+			player.eyePos,
+			raycastEnd,
+			RaycastContext.ShapeType.OUTLINE,
+			RaycastContext.FluidHandling.NONE,
+			player
+		)
+		return world.raycast(raycastContext)
+	}
+
 	private fun SafeContext.airPlace(): Boolean {
 		if (player.inventory.selectedStack.item !is BlockItem) return false
 		placementPos?.let { pos ->
 			placementState?.let { state ->
 				runSafeAutomated {
-					mapOf(pos to TargetState.State(state))
+					request = mapOf(pos to TargetState.State(state))
 						.simulate()
 						.interactRequest(pendingInteractions)
 						?.submit()

src/main/resources/lambda.accesswidener

@@ -6,7 +6,6 @@ transitive-accessible field net/minecraft/client/MinecraftClient paused Z
 transitive-accessible field net/minecraft/client/MinecraftClient thread Ljava/lang/Thread;
 transitive-accessible field net/minecraft/client/MinecraftClient uptimeInTicks J
 transitive-accessible field net/minecraft/client/input/Input movementVector Lnet/minecraft/util/math/Vec2f;
-# REMOVED in 1.21.11: renderTaskQueue - use mc.execute {} instead (inherited from ReentrantThreadExecutor)
 transitive-accessible field net/minecraft/client/option/KeyBinding boundKey Lnet/minecraft/client/util/InputUtil$Key;
 transitive-accessible method net/minecraft/client/MinecraftClient getWindowTitle ()Ljava/lang/String;
 transitive-accessible field net/minecraft/client/option/KeyBinding KEYS_BY_ID Ljava/util/Map;
@@ -26,7 +25,6 @@ transitive-accessible method net/minecraft/item/BlockItem placeFromNbt (Lnet/min
 transitive-accessible method net/minecraft/item/BlockItem postPlacement (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;)Z
 transitive-accessible method net/minecraft/item/BlockItem getPlaceSound (Lnet/minecraft/block/BlockState;)Lnet/minecraft/sound/SoundEvent;
 transitive-accessible field net/minecraft/state/State owner Ljava/lang/Object;
-# MOVED in 1.21.11: BackgroundRenderer$StatusEffectFogModifier -> net/minecraft/client/render/fog/StatusEffectFogModifier
 transitive-accessible class net/minecraft/client/render/fog/StatusEffectFogModifier
 transitive-accessible field net/minecraft/client/particle/NoRenderParticleRenderer EMPTY Lnet/minecraft/client/render/Submittable;
 transitive-accessible field net/minecraft/entity/Entity GLIDING_FLAG_INDEX I
@@ -75,7 +73,7 @@ transitive-accessible field net/minecraft/client/texture/SpriteContents image Ln
 transitive-accessible class net/minecraft/client/gui/screen/SplashOverlay$LogoTexture
 transitive-accessible field com/mojang/blaze3d/systems/RenderSystem$ShapeIndexBuffer indexBuffer Lcom/mojang/blaze3d/buffers/GpuBuffer;
 transitive-accessible field net/minecraft/client/gl/GlGpuBuffer id I
-accessible field net/minecraft/client/MinecraftClient entityRenderManager Lnet/minecraft/client/render/entity/EntityRenderManager;
+transitive-accessible field net/minecraft/client/MinecraftClient entityRenderManager Lnet/minecraft/client/render/entity/EntityRenderManager;
 transitive-accessible field net/minecraft/client/render/RenderLayer renderSetup Lnet/minecraft/client/render/RenderSetup;
 transitive-accessible field net/minecraft/client/render/RenderSetup layeringTransform Lnet/minecraft/client/render/LayeringTransform;
 transitive-accessible field net/minecraft/client/render/LayeringTransform transform Ljava/util/function/Consumer;
@@ -109,9 +107,7 @@ transitive-accessible field net/minecraft/text/Style obfuscated Ljava/lang/Boole
 transitive-accessible field net/minecraft/text/Style clickEvent Lnet/minecraft/text/ClickEvent;
 transitive-accessible field net/minecraft/text/Style hoverEvent Lnet/minecraft/text/HoverEvent;
 transitive-accessible field net/minecraft/text/Style insertion Ljava/lang/String;
-# CHANGED in 1.21.11: font type changed from Identifier to StyleSpriteSource
 transitive-accessible field net/minecraft/text/Style font Lnet/minecraft/text/StyleSpriteSource;
-# CHANGED in 1.21.11: constructor added shadowColor parameter, font type changed to StyleSpriteSource
 transitive-accessible method net/minecraft/text/Style <init> (Lnet/minecraft/text/TextColor;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/text/ClickEvent;Lnet/minecraft/text/HoverEvent;Ljava/lang/String;Lnet/minecraft/text/StyleSpriteSource;)V
 
 # Network
@@ -143,11 +139,10 @@ transitive-accessible method net/minecraft/util/math/Vec3i setY (I)Lnet/minecraf
 transitive-accessible method net/minecraft/util/math/Vec3i setZ (I)Lnet/minecraft/util/math/Vec3i;
 
 # Debug
-# REMOVED in 1.21.11: showDebugHud - use DebugHud.shouldShowDebugHud() method instead
 transitive-accessible field net/minecraft/client/gui/hud/DebugHud renderingChartVisible Z
 transitive-accessible field net/minecraft/client/gui/hud/DebugHud renderingAndTickChartsVisible Z
 transitive-accessible field net/minecraft/client/gui/hud/DebugHud packetSizeAndPingChartsVisible Z
-# REMOVED in 1.21.11: showChunkBorder/showOctree - now controlled via debugHudEntryList.isEntryVisible(DebugHudEntries.CHUNK_BORDERS/CHUNK_SECTION_OCTREE)
+transitive-accessible method net/minecraft/item/DebugStickItem cycle (Lnet/minecraft/block/BlockState;Lnet/minecraft/state/property/Property;Z)Lnet/minecraft/block/BlockState;
 
 # Other
 transitive-accessible field net/minecraft/structure/StructureTemplate blockInfoLists Ljava/util/List;