Update AirPlace

- Use timing is no longer influenced by the module (no longer tries to place every tick)
- Able to use items in your offhand
- Allow it to use armor stands and fireworks

closes #4002
closes #2419

Co-authored-by: thebest9178 <76120883+thebest9178@users.noreply.github.com>

Author: 2 people

src/main/java/meteordevelopment/meteorclient/systems/modules/player/AirPlace.java

@@ -5,20 +5,24 @@
 
 package meteordevelopment.meteorclient.systems.modules.player;
 
+import meteordevelopment.meteorclient.events.entity.player.InteractItemEvent;
 import meteordevelopment.meteorclient.events.render.Render3DEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.renderer.ShapeMode;
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import meteordevelopment.meteorclient.utils.world.BlockUtils;
 import meteordevelopment.orbit.EventHandler;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.SpawnEggItem;
-import net.minecraft.util.Hand;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.item.*;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.Vec3d;
 
 public class AirPlace extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -80,24 +84,44 @@ public AirPlace() {
     }
 
     @EventHandler
-    private void onTick(TickEvent.Post event) {
+    private void onTick(TickEvent.Pre event) {
+        if (!InvUtils.testInHands(this::placeable)) return;
+        if (mc.crosshairTarget != null && mc.crosshairTarget.getType() != HitResult.Type.MISS) return;
+
         double r = customRange.get() ? range.get() : mc.player.getBlockInteractionRange();
         hitResult = mc.getCameraEntity().raycast(r, 0, false);
+    }
+
+    @EventHandler
+    private void onInteractItem(InteractItemEvent event) {
+        if (!(hitResult instanceof BlockHitResult bhr) || !placeable(mc.player.getStackInHand(event.hand))) return;
 
-        if (!(hitResult instanceof BlockHitResult blockHitResult) || !(mc.player.getMainHandStack().getItem() instanceof BlockItem) && !(mc.player.getMainHandStack().getItem() instanceof SpawnEggItem)) return;
+        Block toPlace = Blocks.OBSIDIAN;
+        Item i = mc.player.getStackInHand(event.hand).getItem();
+        if (i instanceof BlockItem blockItem) toPlace = blockItem.getBlock();
+        if (!BlockUtils.canPlaceBlock(bhr.getBlockPos(), (i instanceof ArmorStandItem || i instanceof BlockItem), toPlace)) return;
 
-        if (mc.options.useKey.isPressed()) {
-            BlockUtils.place(blockHitResult.getBlockPos(), Hand.MAIN_HAND, mc.player.getInventory().getSelectedSlot(), false, 0, true, true, false);
-        }
+        Vec3d hitPos = Vec3d.ofCenter(bhr.getBlockPos());
+
+        BlockHitResult b = new BlockHitResult(hitPos, mc.player.getMovementDirection().getOpposite(), bhr.getBlockPos(), false);
+        BlockUtils.interact(b, event.hand, true);
+
+        event.toReturn = ActionResult.SUCCESS;
     }
 
     @EventHandler
     private void onRender(Render3DEvent event) {
-        if (!(hitResult instanceof BlockHitResult blockHitResult)
-            || !mc.world.getBlockState(blockHitResult.getBlockPos()).isReplaceable()
-            || !(mc.player.getMainHandStack().getItem() instanceof BlockItem) && !(mc.player.getMainHandStack().getItem() instanceof SpawnEggItem)
+        if (!(hitResult instanceof BlockHitResult bhr)
+            || (mc.crosshairTarget != null && mc.crosshairTarget.getType() != HitResult.Type.MISS)
+            || !mc.world.getBlockState(bhr.getBlockPos()).isReplaceable()
+            || !InvUtils.testInHands(this::placeable)
             || !render.get()) return;
 
-        event.renderer.box(blockHitResult.getBlockPos(), sideColor.get(), lineColor.get(), shapeMode.get(), 0);
+        event.renderer.box(bhr.getBlockPos(), sideColor.get(), lineColor.get(), shapeMode.get(), 0);
+    }
+
+    private boolean placeable(ItemStack stack) {
+        Item i = stack.getItem();
+        return i instanceof BlockItem || i instanceof SpawnEggItem || i instanceof FireworkRocketItem || i instanceof ArmorStandItem;
     }
 }