From 7f21362a2aea77049fe9f075ba86b626812ffd22 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Mon, 10 Jan 2022 11:28:37 -0700 Subject: [PATCH 1/2] fix dripleaf and azalea behavior change so rebuilds --- .../java/baritone/pathing/movement/MovementHelper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 3db7e44e7..6578aba1e 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -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; } From e37d81d3fc574461a5e69455d694a9a4821888de Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 20 Jan 2022 15:19:35 -0700 Subject: [PATCH 2/2] fix runClient to actually have the right sourceSet by default --- build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle b/build.gradle index 2050d0207..0de75c0c5 100755 --- a/build.gradle +++ b/build.gradle @@ -67,6 +67,12 @@ loom { } } mixin.defaultRefmapName = "mixins.baritone.refmap.json" + + runs { + client { + source = sourceSets.launch + } + } }