rename placement settings to interaction settings

Author: beanbag44

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

@@ -30,15 +30,15 @@ class InteractSettings(
     c: Configurable,
     baseGroup: NamedEnum
 ) : SettingGroup(c), InteractConfig {
-    override val rotate by c.setting("Rotate For Place", true, "Rotate towards block while placing").group(baseGroup).index()
+    override val rotate by c.setting("Rotate For Interact", 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 sorter by c.setting("Interaction Sorter", ActionConfig.SortMode.Tool, "The order in which placements are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Interaction 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 interactConfirmationMode by c.setting("Interact Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation").group(baseGroup).index()
+    override val maxPendingInteractions by c.setting("Max Pending Interactions", 5, 0..30, 1, "The maximum amount of pending placements").group(baseGroup).index()
+    override val interactionsPerTick by c.setting("Interactions Per Tick", 1, 1..30, 1, "Maximum instant block places per tick").group(baseGroup).index()
+    override val swing by c.setting("Swing On Interact", true, "Swings the players hand when placing").group(baseGroup).index()
+    override val swingType by c.setting("Interact 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/interaction/request/interacting/InteractConfig.kt

@@ -28,9 +28,9 @@ interface InteractConfig : ActionConfig, ISettingGroup {
     val airPlace: AirPlaceMode
     val axisRotateSetting: Boolean
     val axisRotate get() = rotate && airPlace.isEnabled && axisRotateSetting
-    val placeConfirmationMode: PlaceConfirmationMode
-    val maxPendingPlacements: Int
-    val placementsPerTick: Int
+    val interactConfirmationMode: PlaceConfirmationMode
+    val maxPendingInteractions: Int
+    val interactionsPerTick: Int
     val swing: Boolean
     val swingType: BuildConfig.SwingType
     val sounds: Boolean

src/main/kotlin/com/lambda/interaction/request/interacting/InteractManager.kt

@@ -200,14 +200,14 @@ object InteractManager : RequestHandler<InteractRequest>(
             .filter { !isPosBlocked(it.blockPos) }
             .take(
                 min(
-                    interactConfig.maxPendingPlacements - pendingActions.size,
+                    interactConfig.maxPendingInteractions - pendingActions.size,
                     buildConfig.maxPendingInteractions - request.pendingInteractions.size
                 ).coerceAtLeast(0)
             )
             .toMutableList()
         logger.debug("${potentialPlacements.size} potential placements")
 
-        maxPlacementsThisTick = interactConfig.placementsPerTick
+        maxPlacementsThisTick = interactConfig.interactionsPerTick
     }
 
     /**
@@ -339,14 +339,14 @@ object InteractManager : RequestHandler<InteractRequest>(
             sendInteractPacket(hand, hitResult)
         }
 
-        if (interactConfig.placeConfirmationMode != InteractConfig.PlaceConfirmationMode.None) {
+        if (interactConfig.interactConfirmationMode != InteractConfig.PlaceConfirmationMode.None) {
             InteractInfo(interactContext, request.pendingInteractions, request.onPlace, interactConfig).startPending()
         }
 
         val itemStack = itemPlacementContext.stack
         itemStack.decrementUnlessCreative(1, player)
 
-        if (interactConfig.placeConfirmationMode == InteractConfig.PlaceConfirmationMode.AwaitThenPlace)
+        if (interactConfig.interactConfirmationMode == InteractConfig.PlaceConfirmationMode.AwaitThenPlace)
             return ActionResult.SUCCESS
 
         // TODO: Implement restriction checks (e.g., world height) to prevent unnecessary server requests when the
@@ -367,7 +367,7 @@ object InteractManager : RequestHandler<InteractRequest>(
 
         if (interactConfig.sounds) placeSound(state, blockPos)
 
-        if (interactConfig.placeConfirmationMode == InteractConfig.PlaceConfirmationMode.None) {
+        if (interactConfig.interactConfirmationMode == InteractConfig.PlaceConfirmationMode.None) {
             request.onPlace?.invoke(this, interactContext.blockPos)
         }
 

src/main/kotlin/com/lambda/interaction/request/interacting/InteractedBlockHandler.kt

@@ -35,7 +35,7 @@ object InteractedBlockHandler : PostActionHandler<InteractInfo>() {
         DEFAULT.buildConfig.interactionTimeout * 50L
     ) {
         info("${it::class.simpleName} at ${it.context.blockPos.toShortString()} timed out")
-        if (it.interactConfig.placeConfirmationMode != InteractConfig.PlaceConfirmationMode.AwaitThenPlace) {
+        if (it.interactConfig.interactConfirmationMode != InteractConfig.PlaceConfirmationMode.AwaitThenPlace) {
             runSafe {
                 world.setBlockState(it.context.blockPos, it.context.cachedState)
             }
@@ -66,7 +66,7 @@ object InteractedBlockHandler : PostActionHandler<InteractInfo>() {
 
                     pending.stopPending()
 
-                    if (pending.interactConfig.placeConfirmationMode == InteractConfig.PlaceConfirmationMode.AwaitThenPlace)
+                    if (pending.interactConfig.interactConfirmationMode == InteractConfig.PlaceConfirmationMode.AwaitThenPlace)
                         with(pending.context) { placeSound(expectedState, blockPos) }
                     pending.onPlace?.invoke(this, pending.context.blockPos)
                 }