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

Merge pull request #3194 from wagyourtail/1.17.1

Browse Source 
fix dripleaf and azalea behavior
This commit is contained in:
Leijurv
2022-02-01 23:57:54 -08:00
committed by GitHub
parent 749fd4fac3 e37d81d3fc
commit 6e03e6859c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -67,6 +67,12 @@ loom {
}
}
mixin.defaultRefmapName = "mixins.baritone.refmap.json"
runs {
client {
source = sourceSets.launch
}
}
}

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

@@ -97,7 +97,10 @@ 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) {
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) {
return false;
}
if (block == Blocks.BIG_DRIPLEAF) {
return false;
}
if (Baritone.settings().blocksToAvoid.value.contains(block)) {
@@ -183,6 +186,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|| block == Blocks.VINE
|| block == Blocks.LADDER
|| block == Blocks.COCOA
|| block instanceof AzaleaBlock
|| block instanceof DoorBlock
|| block instanceof FenceGateBlock
|| block instanceof SnowLayerBlock
@@ -310,6 +314,9 @@ public interface MovementHelper extends ActionCosts, Helper {
if (isBlockNormalCube(state)) {
return true;
}
if (block instanceof AzaleaBlock) {
return true;
}
if (block == Blocks.LADDER || (block == Blocks.VINE && Baritone.settings().allowVines.value)) { // TODO reconsider this
return true;
}