air place option

Author: beanbag44

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

@@ -27,6 +27,7 @@ class PlaceSettings(
     vis: () -> Boolean = { true }
 ) : PlaceConfig(priority) {
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing") { vis() }
+    override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces") { vis() }
     override val placeConfirmationMode by c.setting("Place Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation") { vis() }
     override val maxPendingPlacements by c.setting("Max Pending Placements", 2, 0..5, 1, "The maximum amount of pending placements") { vis() }
     override val placementsPerTick by c.setting("Instant Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick") { vis() }

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -60,6 +60,7 @@ import net.minecraft.entity.ItemEntity
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.sound.SoundCategory
+import net.minecraft.util.Hand
 import net.minecraft.util.math.BlockPos
 
 object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
@@ -338,7 +339,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
                 info.nullify()
                 return false
             }
-            if (info.breakConfig.swing != BreakConfig.SwingMode.End) swingHand(info.breakConfig.swingType)
+            if (info.breakConfig.swing != BreakConfig.SwingMode.End) swingHand(info.breakConfig.swingType, Hand.MAIN_HAND)
             return true
         }
 
@@ -389,10 +390,10 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
                 onBlockBreak(info)
                 PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, ctx.expectedPos, hitResult.side, sequence)
             }
-            if (info.breakConfig.swing != BreakConfig.SwingMode.Start) swingHand(info.breakConfig.swingType)
+            if (info.breakConfig.swing != BreakConfig.SwingMode.Start) swingHand(info.breakConfig.swingType, Hand.MAIN_HAND)
             setBreakCooldown(info.breakConfig.breakDelay)
         } else {
-            if (info.breakConfig.swing == BreakConfig.SwingMode.Constant) swingHand(info.breakConfig.swingType)
+            if (info.breakConfig.swing == BreakConfig.SwingMode.Constant) swingHand(info.breakConfig.swingType, Hand.MAIN_HAND)
         }
 
         return true

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceConfig.kt

@@ -25,6 +25,7 @@ abstract class PlaceConfig(
     priority: Priority
 ) : RequestConfig<PlaceRequest>(priority) {
     abstract val rotateForPlace: Boolean
+    abstract val airPlace: AirPlaceMode
     abstract val placeConfirmationMode: PlaceConfirmationMode
     abstract val maxPendingPlacements: Int
     abstract val placementsPerTick: Int
@@ -36,6 +37,12 @@ abstract class PlaceConfig(
         PlaceManager.registerRequest(this, request)
     }
 
+    enum class AirPlaceMode {
+        None,
+        Standard,
+        Grim
+    }
+
     enum class PlaceConfirmationMode {
         None,
         PlaceThenAwait,

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

@@ -50,13 +50,15 @@ import net.minecraft.item.BlockItem
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.item.ItemStack
 import net.minecraft.item.ItemUsageContext
+import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.sound.SoundCategory
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction
 import net.minecraft.world.GameMode
 
 object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
@@ -197,12 +199,10 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
                 return ActionResult.FAIL
             }
 
-            // checks if the player should be able to interact with the block for if its something
-            // like a furnace or chest where an action would happen
-//            val actionResult = blockState.onUse(world, player, hand, hitResult)
-//            if (actionResult.isAccepted) {
-//                return actionResult
-//            }
+            val actionResult = blockState.onUse(world, player, hand, hitResult)
+            if (actionResult.isAccepted) {
+                return actionResult
+            }
         }
 
         val itemStack = player.getStackInHand(hand)
@@ -261,12 +261,16 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
         else
             pendingPlacements.add(request)
 
-        interaction.sendSequencedPacket(world) { sequence: Int ->
-            PlayerInteractBlockC2SPacket(hand, hitResult, sequence)
+        if (request.buildConfig.placeSettings.airPlace == PlaceConfig.AirPlaceMode.Grim) {
+            airPlaceOffhandSwap()
+            sendPlacePacket(hand, hitResult)
+            airPlaceOffhandSwap()
+        } else {
+            sendPlacePacket(hand, hitResult)
         }
 
         if (request.buildConfig.placeSettings.swing) {
-            swingHand(request.buildConfig.placeSettings.swingType)
+            swingHand(request.buildConfig.placeSettings.swingType, hand)
         }
 
         if (!stackInHand.isEmpty && (stackInHand.count != stackCountPre || interaction.hasCreativeInventory())) {
@@ -296,6 +300,11 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
         return ActionResult.success(world.isClient)
     }
 
+    private fun SafeContext.sendPlacePacket(hand: Hand, hitResult: BlockHitResult) =
+        interaction.sendSequencedPacket(world) { sequence: Int ->
+            PlayerInteractBlockC2SPacket(hand, hitResult, sequence)
+        }
+
     private fun SafeContext.placeSound(item: BlockItem, state: BlockState, pos: BlockPos) {
         val blockSoundGroup = state.soundGroup
         world.playSound(
@@ -308,6 +317,16 @@ object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
         )
     }
 
+    private fun SafeContext.airPlaceOffhandSwap() {
+        connection.sendPacket(
+            PlayerActionC2SPacket(
+                PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND,
+                BlockPos.ORIGIN,
+                Direction.DOWN
+            )
+        )
+    }
+
     override fun preEvent() = UpdateManagerEvent.Place.Pre().post()
     override fun postEvent() = UpdateManagerEvent.Place.Post().post()
 }

common/src/main/kotlin/com/lambda/util/player/PlayerUtils.kt

@@ -47,11 +47,11 @@ fun SafeContext.spawnFakePlayer(
     return entity
 }
 
-fun SafeContext.swingHand(swingType: BuildConfig.SwingType) =
+fun SafeContext.swingHand(swingType: BuildConfig.SwingType, hand: Hand) =
     when (swingType) {
-        BuildConfig.SwingType.Vanilla -> player.swingHand(player.activeHand)
-        BuildConfig.SwingType.Server -> connection.sendPacket(HandSwingC2SPacket(player.activeHand))
-        BuildConfig.SwingType.Client -> swingHandClient(player.activeHand)
+        BuildConfig.SwingType.Vanilla -> player.swingHand(hand)
+        BuildConfig.SwingType.Server -> connection.sendPacket(HandSwingC2SPacket(hand))
+        BuildConfig.SwingType.Client -> swingHandClient(hand)
     }
 
 fun SafeContext.swingHandClient(hand: Hand) {