Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix breaking blocks

Browse Source
This commit is contained in:
Leijurv
2019-09-19 12:28:56 -07:00
parent 5f674b86f8
commit fa905b8844
6 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/behavior/LookBehavior.java
View File

@@ -72,6 +72,8 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
float oldPitch = ctx.player().rotationPitch;
float desiredPitch = this.target.getPitch();
ctx.player().rotationPitch = desiredPitch;
ctx.player().rotationYaw += (Math.random() - 0.5) * Baritone.settings().randomLooking.value;
ctx.player().rotationPitch += (Math.random() - 0.5) * Baritone.settings().randomLooking.value;
if (desiredPitch == oldPitch && !Baritone.settings().freeLook.value) {
nudgeToLevel();
}

15
src/main/java/baritone/utils/BlockBreakHelper.java
View File

@@ -19,6 +19,8 @@ package baritone.utils;
import baritone.api.utils.Helper;
import baritone.api.utils.IPlayerContext;
import baritone.utils.accessor.IPlayerControllerMP;
import net.minecraft.client.Minecraft;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
@@ -46,8 +48,13 @@ public final class BlockBreakHelper implements Helper {
public void stopBreakingBlock() {
// The player controller will never be null, but the player can be
if (playerContext.player() != null) {
if (playerContext.player() != null && didBreakLastTick) {
if (((IPlayerControllerMP) mc.playerController).getCurrentBlock().getY() != -1) {
// insane bypass to check breaking succeeded
((IPlayerControllerMP) mc.playerController).setIsHittingBlock(true);
}
playerContext.playerController().resetBlockRemoving();
didBreakLastTick = false;
}
}
@@ -57,11 +64,17 @@ public final class BlockBreakHelper implements Helper {
boolean isBlockTrace = trace != null && trace.typeOfHit == RayTraceResult.Type.BLOCK;
if (isLeftClick && isBlockTrace) {
if (!didBreakLastTick) {
((IPlayerControllerMP) Minecraft.getMinecraft().playerController).callSyncCurrentPlayItem();
Minecraft.getMinecraft().playerController.clickBlock(trace.getBlockPos(), trace.sideHit);
playerContext.player().swingArm(EnumHand.MAIN_HAND);
}
tryBreakBlock(trace.getBlockPos(), trace.sideHit);
didBreakLastTick = true;
} else if (didBreakLastTick) {
stopBreakingBlock();
didBreakLastTick = false;
}
((IPlayerControllerMP) Minecraft.getMinecraft().playerController).setIsHittingBlock(false);
}
}

28
src/main/java/baritone/utils/accessor/IPlayerControllerMP.java Normal file
View File

@@ -0,0 +1,28 @@
/*
* 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.accessor;
import net.minecraft.util.math.BlockPos;
public interface IPlayerControllerMP {
void setIsHittingBlock(boolean isHittingBlock);
BlockPos getCurrentBlock();
void callSyncCurrentPlayItem();
}