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

Merge branch '1.17.1' into 1.18.2

Browse Source
This commit is contained in:
ZacSharp
2022-06-03 22:26:24 +02:00
parent 8a0771e5f4 f3c93855bb
commit 4a042510d8
9 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@@ -99,12 +99,15 @@ public interface MovementHelper extends ActionCosts, Helper {
if (block instanceof AirBlock) { // early return for most common case
return true;
}
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.POINTED_DRIPSTONE || block == Blocks.AMETHYST_CLUSTER || block instanceof AzaleaBlock) {
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.SWEET_BERRY_BUSH || block == Blocks.POINTED_DRIPSTONE || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) {
return false;
}
if (block == Blocks.BIG_DRIPLEAF) {
return false;
}
if (block == Blocks.POWDER_SNOW) {
return false;
}
if (Baritone.settings().blocksToAvoid.value.contains(block)) {
return false;
}
@@ -288,6 +291,7 @@ public interface MovementHelper extends ActionCosts, Helper {
return !state.getFluidState().isEmpty()
|| block == Blocks.MAGMA_BLOCK
|| block == Blocks.CACTUS
|| block == Blocks.SWEET_BERRY_BUSH
|| block instanceof BaseFireBlock
|| block == Blocks.END_PORTAL
|| block == Blocks.COBWEB

13
src/main/java/baritone/process/BuilderProcess.java
View File

@@ -847,7 +847,18 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
continue;
}
// <toxic cloud>
result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockPlaceContext(new UseOnContext(ctx.world(), ctx.player(), InteractionHand.MAIN_HAND, stack, new BlockHitResult(new Vec3(ctx.player().position().x, ctx.player().position().y, ctx.player().position().z), Direction.UP, ctx.playerFeet(), false)) {})));
BlockState itemState = ((BlockItem) stack.getItem())
.getBlock()
.getStateForPlacement(
new BlockPlaceContext(
new UseOnContext(ctx.world(), ctx.player(), InteractionHand.MAIN_HAND, stack, new BlockHitResult(new Vec3(ctx.player().position().x, ctx.player().position().y, ctx.player().position().z), Direction.UP, ctx.playerFeet(), false)) {}
)
);
if (itemState != null) {
result.add(itemState);
} else {
result.add(Blocks.AIR.defaultBlockState());
}
// </toxic cloud>
}
return result;

6
src/main/java/baritone/utils/BlockStateInterface.java
View File

@@ -43,7 +43,7 @@ public class BlockStateInterface {
private final ClientChunkCache provider;
private final WorldData worldData;
protected final BlockGetter world;
protected final Level world;
public final BlockPos.MutableBlockPos isPassableBlockPos;
public final BlockGetter access;
@@ -97,9 +97,9 @@ public class BlockStateInterface {
}
public BlockState get0(int x, int y, int z) { // Mickey resigned
y -= worldData.dimension.minY();
y -= world.dimensionType().minY();
// Invalid vertical position
if (y < 0 || y >= worldData.dimension.height()) {
if (y < 0 || y >= world.dimensionType().height()) {
return AIR;
}