placement without unepic right click

src/main/java/baritone/pathing/movement/movements/MovementPillar.java

@@ -226,7 +226,7 @@ public class MovementPillar extends Movement {
                 if (!(fr instanceof BlockAir || fr.isReplaceable(ctx.world(), src))) {
                     state.setInput(Input.CLICK_LEFT, true);
                     blockIsThere = false;
-                } else if (ctx.player().isSneaking() && (Objects.equals(src.down(), ctx.objectMouseOver().getBlockPos()) || Objects.equals(src, ctx.objectMouseOver().getBlockPos()))) {
+                } else if (ctx.player().isSneaking() && (Objects.equals(src.down(), ctx.objectMouseOver().getBlockPos()) || Objects.equals(src, ctx.objectMouseOver().getBlockPos())) && ctx.player().posY > dest.getY() + 0.1) {
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
             }

src/main/java/baritone/utils/BlockBreakHelper.java

@@ -31,7 +31,7 @@ public final class BlockBreakHelper implements Helper {
 
     private boolean didBreakLastTick;
 
-    private IPlayerContext playerContext;
+    private final IPlayerContext playerContext;
 
     public BlockBreakHelper(IPlayerContext playerContext) {
         this.playerContext = playerContext;

src/main/java/baritone/utils/BlockPlaceHelper.java

@@ -0,0 +1,53 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils;
+
+import baritone.Baritone;
+import baritone.api.utils.IPlayerContext;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+
+public class BlockPlaceHelper implements Helper {
+    private final IPlayerContext ctx;
+    private int rightClickTimer;
+
+    public BlockPlaceHelper(IPlayerContext playerContext) {
+        this.ctx = playerContext;
+    }
+
+    public void tick(boolean rightClickRequested) {
+        if (rightClickTimer > 0) {
+            rightClickTimer--;
+            return;
+        }
+        RayTraceResult mouseOver = ctx.objectMouseOver();
+        BlockPos pos = mouseOver.getBlockPos();
+        if (!rightClickRequested || ctx.player().isRowingBoat() || pos == null || mouseOver.typeOfHit != RayTraceResult.Type.BLOCK) {
+            return;
+        }
+        rightClickTimer = Baritone.settings().rightClickSpeed.get();
+        for (EnumHand hand : EnumHand.values()) {
+            if (ctx.playerController().processRightClickBlock(ctx.player(), ctx.world(), pos, mouseOver.sideHit, mouseOver.hitVec, hand) == EnumActionResult.SUCCESS) {
+                ctx.player().swingArm(hand);
+                return;
+            }
+        }
+    }
+}

src/main/java/baritone/utils/InputOverrideHandler.java

@@ -24,7 +24,6 @@ import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.input.Input;
 import baritone.behavior.Behavior;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.util.MovementInputFromOptions;
 
 import java.util.HashMap;
@@ -46,38 +45,12 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
     private final Map<Input, Boolean> inputForceStateMap = new HashMap<>();
 
     private final BlockBreakHelper blockBreakHelper;
+    private final BlockPlaceHelper blockPlaceHelper;
 
     public InputOverrideHandler(Baritone baritone) {
         super(baritone);
         this.blockBreakHelper = new BlockBreakHelper(baritone.getPlayerContext());
-    }
-
-    /**
-     * Returns whether or not we are forcing down the specified {@link KeyBinding}.
-     *
-     * @param key The KeyBinding object
-     * @return Whether or not it is being forced down
-     */
-    @Override
-    public final Boolean isInputForcedDown(KeyBinding key) {
-        Input input = Input.getInputForBind(key);
-        if (input == null) {
-            return null;
-        }
-        if (input == Input.CLICK_LEFT && inControl()) {
-            // only override left click off when pathing
-            return false;
-        }
-        if (input == Input.CLICK_RIGHT) {
-            if (isInputForcedDown(Input.CLICK_RIGHT)) {
-                // gettoblock and builder can right click even when not pathing; allow them to do so
-                return true;
-            } else if (inControl()) {
-                // but when we are pathing for real, force right click off
-                return false;
-            }
-        }
-        return null; // dont force any inputs other than left and right click
+        this.blockPlaceHelper = new BlockPlaceHelper(baritone.getPlayerContext());
     }
 
     /**
@@ -115,7 +88,11 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
         if (event.getType() == TickEvent.Type.OUT) {
             return;
         }
+        if (isInputForcedDown(Input.CLICK_LEFT)) {
+            setInputForceState(Input.CLICK_RIGHT, false);
+        }
         blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT));
+        blockPlaceHelper.tick(isInputForcedDown(Input.CLICK_RIGHT));
 
         if (inControl()) {
             if (ctx.player().movementInput.getClass() != PlayerMovementInput.class) {
@@ -131,6 +108,7 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
     }
 
     private boolean inControl() {
+        // if we are not primary (a bot) we should set the movementinput even when idle (not pathing)
         return baritone.getPathingBehavior().isPathing() || baritone != BaritoneAPI.getProvider().getPrimaryBaritone();
     }
 

src/main/java/baritone/utils/player/PrimaryPlayerController.java

@@ -19,12 +19,18 @@ package baritone.utils.player;
 
 import baritone.api.utils.IPlayerController;
 import baritone.utils.Helper;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ClickType;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameType;
+import net.minecraft.world.World;
 
 /**
  * Implementation of {@link IPlayerController} that chains to the primary player controller's methods
@@ -60,4 +66,10 @@ public enum PrimaryPlayerController implements IPlayerController, Helper {
     public GameType getGameType() {
         return mc.playerController.getCurrentGameType();
     }
+
+    @Override
+    public EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand) {
+        // primaryplayercontroller is always in a WorldClient so this is ok
+        return mc.playerController.processRightClickBlock(player, (WorldClient) world, pos, direction, vec, hand);
+    }
 }