working but needs major improvements

Author: beanbag44

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

@@ -22,9 +22,8 @@ import com.lambda.config.groups.BreakSettings
 import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.EatSettings
 import com.lambda.config.groups.HotbarSettings
-import com.lambda.config.groups.InteractSettings
 import com.lambda.config.groups.InventorySettings
-import com.lambda.config.groups.PlaceSettings
+import com.lambda.config.groups.InteractSettings
 import com.lambda.config.groups.RotationSettings
 import com.lambda.context.Automated
 import com.lambda.event.events.onStaticRender
@@ -52,8 +51,7 @@ open class AutomationConfig(
 
     override val buildConfig = BuildSettings(this, Group.Build)
     override val breakConfig = BreakSettings(this, Group.Break)
-    override val placeConfig = PlaceSettings(this, Group.Place)
-    override val interactConfig = InteractSettings(this, Group.Interact)
+    override val interactConfig = InteractSettings(this, Group.Place)
     override val rotationConfig = RotationSettings(this, Group.Rotation)
     override val inventoryConfig = InventorySettings(this, Group.Inventory)
     override val hotbarConfig = HotbarSettings(this, Group.Hotbar)

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

@@ -24,7 +24,6 @@ import com.lambda.interaction.request.breaking.BreakConfig
 import com.lambda.interaction.request.hotbar.HotbarConfig
 import com.lambda.interaction.request.interacting.InteractConfig
 import com.lambda.interaction.request.inventory.InventoryConfig
-import com.lambda.interaction.request.placing.PlaceConfig
 import com.lambda.interaction.request.rotating.RotationConfig
 
 interface MutableAutomationConfig : Automated {
@@ -34,7 +33,6 @@ interface MutableAutomationConfig : Automated {
 
 	override val buildConfig: BuildConfig get() = automationConfig.buildConfig
 	override val breakConfig: BreakConfig get() = automationConfig.breakConfig
-	override val placeConfig: PlaceConfig get() = automationConfig.placeConfig
 	override val interactConfig: InteractConfig get() = automationConfig.interactConfig
 	override val rotationConfig: RotationConfig get() = automationConfig.rotationConfig
 	override val inventoryConfig: InventoryConfig get() = automationConfig.inventoryConfig

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

@@ -67,7 +67,7 @@ open class BreakSettings(
     override val swingType by c.setting("Break Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swing != SwingMode.None }.group(baseGroup, Group.General).index()
 
     // Rotate
-    override val rotateForBreak by c.setting("Rotate For Break", false, "Rotate towards block while breaking").group(baseGroup, Group.General).index()
+    override val rotate by c.setting("Rotate For Break", false, "Rotate towards block while breaking").group(baseGroup, Group.General).index()
 
     // Pending / Post
     override val breakConfirmation by c.setting("Break Confirmation", BreakConfirmationMode.BreakThenAwait, "The style of confirmation used when breaking").group(baseGroup, Group.General).index()

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

@@ -22,16 +22,23 @@ import com.lambda.config.SettingGroup
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.interacting.InteractConfig
+import com.lambda.interaction.request.interacting.InteractConfig.AirPlaceMode
+import com.lambda.interaction.request.interacting.InteractConfig.PlaceConfirmationMode
 import com.lambda.util.NamedEnum
 
 class InteractSettings(
     c: Configurable,
     baseGroup: NamedEnum
 ) : SettingGroup(c), InteractConfig {
-    override val rotate by c.setting("Rotate For Interact", true, "Rotates the player to look at the block when interacting").group(baseGroup).index()
-    override val sorter by c.setting("Interact Sorter", ActionConfig.SortMode.Tool, "The order in which interactions are performed").group(baseGroup).index()
-    override val swingHand by c.setting("Swing On Interact", true, "Swings the players hand after interacting").group(baseGroup).index()
-    override val tickStageMask by c.setting("Interact Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), description = "The sub-tick timing at which interact actions are performed").group(baseGroup).index()
-    override val interactSwingType by c.setting("Interact Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swingHand }.group(baseGroup).index()
-    override val interactConfirmationMode by c.setting("Interact Confirmation Mode", InteractConfig.InteractConfirmationMode.InteractThenAwait, "The style of confirmation for interactions").group(baseGroup).index()
+    override val rotate by c.setting("Rotate For Place", true, "Rotate towards block while placing").group(baseGroup).index()
+    override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces").group(baseGroup).index()
+    override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { airPlace.isEnabled }.group(baseGroup).index()
+    override val sorter by c.setting("Place Sorter", ActionConfig.SortMode.Tool, "The order in which placements are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Place Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), description = "The sub-tick timing at which place actions are performed").group(baseGroup).index()
+    override val placeConfirmationMode by c.setting("Place Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation").group(baseGroup).index()
+    override val maxPendingPlacements by c.setting("Max Pending Placements", 5, 0..30, 1, "The maximum amount of pending placements").group(baseGroup).index()
+    override val placementsPerTick by c.setting("Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick").group(baseGroup).index()
+    override val swing by c.setting("Swing On Place", true, "Swings the players hand when placing").group(baseGroup).index()
+    override val swingType by c.setting("Place Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swing }.group(baseGroup).index()
+    override val sounds by c.setting("Place Sounds", true, "Plays the placing sounds").group(baseGroup).index()
 }

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

@@ -21,15 +21,13 @@ import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.EatConfig
 import com.lambda.interaction.request.breaking.BreakConfig
 import com.lambda.interaction.request.hotbar.HotbarConfig
-import com.lambda.interaction.request.interacting.InteractConfig
 import com.lambda.interaction.request.inventory.InventoryConfig
-import com.lambda.interaction.request.placing.PlaceConfig
+import com.lambda.interaction.request.interacting.InteractConfig
 import com.lambda.interaction.request.rotating.RotationConfig
 
 interface Automated {
     val buildConfig: BuildConfig
     val breakConfig: BreakConfig
-    val placeConfig: PlaceConfig
     val interactConfig: InteractConfig
     val rotationConfig: RotationConfig
     val inventoryConfig: InventoryConfig

src/main/kotlin/com/lambda/context/Automated.kt

@@ -32,18 +32,20 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import java.awt.Color
 
-class InteractContext(
+data class InteractContext(
     override val hitResult: BlockHitResult,
     override val rotationRequest: RotationRequest,
     override var hotbarIndex: Int,
+    override val blockPos: BlockPos,
     override var cachedState: BlockState,
     override val expectedState: BlockState,
-    val automated: Automated
+    val placing: Boolean,
+    val sneak: Boolean,
+    val currentDirIsValid: Boolean = false,
+    private val automated: Automated
 ) : BuildContext(), LogContext, Automated by automated {
-    private val baseColor = Color(35, 254, 79, 25)
-    private val sideColor = Color(35, 254, 79, 100)
-
-    override val blockPos: BlockPos = hitResult.blockPos
+    private val baseColor = Color(35, 188, 254, 50)
+    private val sideColor = Color(35, 188, 254, 100)
 
     override val sorter get() = interactConfig.sorter
 
@@ -58,19 +60,23 @@ class InteractContext(
     }
 
     fun requestDependencies(request: InteractRequest): Boolean {
-        val hotbarRequest = submit(HotbarRequest(hotbarIndex, request), false)
-        val validRotation = if (request.interactConfig.rotate) submit(rotationRequest, false).done else true
+        val hotbarRequest = submit(HotbarRequest(hotbarIndex, this), false)
+        val validRotation = if (request.interactConfig.rotate) {
+            submit(rotationRequest, false).done && currentDirIsValid
+        } else true
         return hotbarRequest.done && validRotation
     }
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
-        group("Interaction Context") {
+        group("Place Context") {
             text(blockPos.getLogContextBuilder())
             text(hitResult.getLogContextBuilder())
             text(rotationRequest.getLogContextBuilder())
             value("Hotbar Index", hotbarIndex)
             value("Cached State", cachedState)
             value("Expected State", expectedState)
+            value("Sneak", sneak)
+            value("Current Dir Is Valid", currentDirIsValid)
         }
     }
 }

src/main/kotlin/com/lambda/interaction/construction/context/InteractContext.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.processing
 
+import com.lambda.context.SafeContext
 import net.minecraft.block.BlockState
 import net.minecraft.util.math.BlockPos
 
@@ -25,7 +26,19 @@ import net.minecraft.util.math.BlockPos
  * optimize how blocks are simulated. Some blocks might only be placeable on certain sides, so it is
  * unnecessary to scan all of them, for example.
  */
-abstract class PlacementProcessor {
-    abstract fun acceptsState(state: BlockState): Boolean
-    abstract fun preProcess(state: BlockState, pos: BlockPos, accumulator: PreProcessingInfoAccumulator)
+
+interface StateProcessor {
+	fun acceptsState(state: BlockState, targetState: BlockState): Boolean
+	context(safeContext: SafeContext)
+	fun PreProcessingInfoAccumulator.preProcess(state: BlockState, targetState: BlockState, pos: BlockPos)
+}
+
+interface PropertyPreProcessor {
+	fun acceptsState(targetState: BlockState): Boolean
+	fun PreProcessingInfoAccumulator.preProcess(state: BlockState, targetState: BlockState)
+}
+
+interface PropertyPostProcessor {
+	fun acceptsState(state: BlockState, targetState: BlockState): Boolean
+	fun PreProcessingInfoAccumulator.preProcess(state: BlockState, targetState: BlockState)
 }