From fe26168a07a0d20fb0f854a83e2747712de77c6a Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 2 Feb 2022 15:54:39 -0800 Subject: [PATCH 01/12] v1.7.2 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e3fdcf846..6e8b1ff4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx2048M -mod_version=1.7.1 +mod_version=1.7.2 maven_group=baritone archives_base_name=baritone @@ -10,4 +10,4 @@ fabric_version=0.11.6 # # un comment for forge debugging default (as opposed to fabric) # baritone.forge_build=true -# loom.platform=forge \ No newline at end of file +# loom.platform=forge From a3dbec62dc3db933d1072fd56c6b975b2e0a6f0c Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Wed, 2 Feb 2022 21:47:45 -0700 Subject: [PATCH 02/12] fix getting stuck in powdered snow --- src/main/java/baritone/pathing/movement/MovementHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index c5119bec6..87eda9929 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -105,6 +105,9 @@ public interface MovementHelper extends ActionCosts, Helper { if (block == Blocks.BIG_DRIPLEAF) { return false; } + if (block == Blocks.POWDER_SNOW) { + return false; + } if (Baritone.settings().blocksToAvoid.value.contains(block)) { return false; } From 407f4dbbaefb296866d6dd3f39897249eb144a33 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 8 Feb 2022 01:36:32 -0700 Subject: [PATCH 03/12] fix an array oob with dynamic worldheight --- src/api/java/baritone/api/pathing/movement/ActionCosts.java | 4 ++-- src/test/java/baritone/pathing/movement/ActionCostsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/java/baritone/api/pathing/movement/ActionCosts.java b/src/api/java/baritone/api/pathing/movement/ActionCosts.java index 683b1b10e..331631c50 100644 --- a/src/api/java/baritone/api/pathing/movement/ActionCosts.java +++ b/src/api/java/baritone/api/pathing/movement/ActionCosts.java @@ -65,8 +65,8 @@ public interface ActionCosts { static double[] generateFallNBlocksCost() { - double[] costs = new double[257]; - for (int i = 0; i < 257; i++) { + double[] costs = new double[4097]; + for (int i = 0; i < 4096; i++) { costs[i] = distanceToTicks(i); } return costs; diff --git a/src/test/java/baritone/pathing/movement/ActionCostsTest.java b/src/test/java/baritone/pathing/movement/ActionCostsTest.java index 9bfdafb0d..b35ea5a42 100644 --- a/src/test/java/baritone/pathing/movement/ActionCostsTest.java +++ b/src/test/java/baritone/pathing/movement/ActionCostsTest.java @@ -26,7 +26,7 @@ public class ActionCostsTest { @Test public void testFallNBlocksCost() { - assertEquals(FALL_N_BLOCKS_COST.length, 257); // Fall 0 blocks through fall 256 blocks + assertEquals(FALL_N_BLOCKS_COST.length, 4097); // Fall 0 blocks through fall 4096 blocks for (int i = 0; i < 257; i++) { double blocks = ticksToBlocks(FALL_N_BLOCKS_COST[i]); assertEquals(blocks, i, 0.000000000001); // If you add another 0 the test fails at i=217 LOL From 9dad1af960170f0ec1f87617bd36aa222a9f9791 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 8 Feb 2022 01:57:56 -0700 Subject: [PATCH 04/12] move up null check to fix new data-driven caused crash with replaymod --- src/main/java/baritone/utils/BlockStateInterface.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/baritone/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java index c615ff4e1..95c8ba09d 100644 --- a/src/main/java/baritone/utils/BlockStateInterface.java +++ b/src/main/java/baritone/utils/BlockStateInterface.java @@ -97,6 +97,9 @@ public class BlockStateInterface { } public BlockState get0(int x, int y, int z) { // Mickey resigned + if (worldData == null) { + return AIR; + } y -= worldData.dimension.minY(); // Invalid vertical position if (y < 0 || y >= worldData.dimension.height()) { @@ -124,9 +127,6 @@ public class BlockStateInterface { // except here, it's 512x512 tiles instead of 16x16, so even better repetition CachedRegion cached = prevCached; if (cached == null || cached.getX() != x >> 9 || cached.getZ() != z >> 9) { - if (worldData == null) { - return AIR; - } CachedRegion region = worldData.cache.getRegion(x >> 9, z >> 9); if (region == null) { return AIR; From 0ef1558803183edab08dcf47a39d65483141c49d Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 8 Feb 2022 02:09:20 -0700 Subject: [PATCH 05/12] fix this in a "better" way --- .../java/baritone/utils/BlockStateInterface.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/baritone/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java index 95c8ba09d..2ebc1c0fb 100644 --- a/src/main/java/baritone/utils/BlockStateInterface.java +++ b/src/main/java/baritone/utils/BlockStateInterface.java @@ -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,12 +97,9 @@ public class BlockStateInterface { } public BlockState get0(int x, int y, int z) { // Mickey resigned - if (worldData == null) { - return AIR; - } - 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; } @@ -127,6 +124,9 @@ public class BlockStateInterface { // except here, it's 512x512 tiles instead of 16x16, so even better repetition CachedRegion cached = prevCached; if (cached == null || cached.getX() != x >> 9 || cached.getZ() != z >> 9) { + if (worldData == null) { + return AIR; + } CachedRegion region = worldData.cache.getRegion(x >> 9, z >> 9); if (region == null) { return AIR; From bfa644e7a7557e960db3ab1bd9b0065d2cb2cad8 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 8 Feb 2022 11:41:45 -0700 Subject: [PATCH 06/12] oops --- src/api/java/baritone/api/pathing/movement/ActionCosts.java | 2 +- src/test/java/baritone/pathing/movement/ActionCostsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/java/baritone/api/pathing/movement/ActionCosts.java b/src/api/java/baritone/api/pathing/movement/ActionCosts.java index 331631c50..691d73b4d 100644 --- a/src/api/java/baritone/api/pathing/movement/ActionCosts.java +++ b/src/api/java/baritone/api/pathing/movement/ActionCosts.java @@ -66,7 +66,7 @@ public interface ActionCosts { static double[] generateFallNBlocksCost() { double[] costs = new double[4097]; - for (int i = 0; i < 4096; i++) { + for (int i = 0; i < 4097; i++) { costs[i] = distanceToTicks(i); } return costs; diff --git a/src/test/java/baritone/pathing/movement/ActionCostsTest.java b/src/test/java/baritone/pathing/movement/ActionCostsTest.java index b35ea5a42..a6d7e3e72 100644 --- a/src/test/java/baritone/pathing/movement/ActionCostsTest.java +++ b/src/test/java/baritone/pathing/movement/ActionCostsTest.java @@ -27,9 +27,9 @@ public class ActionCostsTest { @Test public void testFallNBlocksCost() { assertEquals(FALL_N_BLOCKS_COST.length, 4097); // Fall 0 blocks through fall 4096 blocks - for (int i = 0; i < 257; i++) { + for (int i = 0; i < 4097; i++) { double blocks = ticksToBlocks(FALL_N_BLOCKS_COST[i]); - assertEquals(blocks, i, 0.000000000001); // If you add another 0 the test fails at i=217 LOL + assertEquals(blocks, i, 0.00000000001); // If you add another 0 the test fails at i=989 LOL } assertEquals(FALL_1_25_BLOCKS_COST, 6.2344, 0.00001); assertEquals(FALL_0_25_BLOCKS_COST, 3.0710, 0.00001); From d0dc8cf726a155c678058f75192f67c848717448 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Mon, 14 Feb 2022 15:35:34 -0700 Subject: [PATCH 07/12] fix amethyst bud stuck --- src/main/java/baritone/pathing/movement/MovementHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 87eda9929..09f9f8081 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -99,7 +99,7 @@ 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.POINTED_DRIPSTONE || block == Blocks.AMETHYST_CLUSTER || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) { return false; } if (block == Blocks.BIG_DRIPLEAF) { From 9b7d3af03dbf54444933f36fcc0102c6344b5807 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Mon, 14 Feb 2022 15:38:52 -0700 Subject: [PATCH 08/12] remove duplicate --- src/main/java/baritone/pathing/movement/MovementHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 09f9f8081..8dc19f446 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -99,7 +99,7 @@ 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 AmethystClusterBlock || 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.POINTED_DRIPSTONE || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) { return false; } if (block == Blocks.BIG_DRIPLEAF) { From 9ba8949a2e3c1192802d4aed4b1cd31aeec838bd Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 8 Mar 2022 17:28:38 -0700 Subject: [PATCH 09/12] fix ` is null` (and sneak in some other changes) --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../baritone/pathing/movement/MovementHelper.java | 3 ++- src/main/java/baritone/process/BuilderProcess.java | 13 ++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf51..84d1f85fd 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 8dc19f446..8ef34a9a2 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -99,7 +99,7 @@ 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 instanceof AmethystClusterBlock || 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) { @@ -291,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 diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java index 6453d58f4..ab3934dde 100644 --- a/src/main/java/baritone/process/BuilderProcess.java +++ b/src/main/java/baritone/process/BuilderProcess.java @@ -847,7 +847,18 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil continue; } // - 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()); + } // } return result; From 89bd2a4a079ab90c134acf7c80e58c643ec1f6ef Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 15 Mar 2022 18:44:39 -0700 Subject: [PATCH 10/12] move death event to work with `doImmediateRespawn` gamerule --- .../java/baritone/launch/mixins/MixinClientPlayNetHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java index a1f321836..94dd931fa 100644 --- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java +++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java @@ -175,7 +175,7 @@ public class MixinClientPlayNetHandler { method = "handlePlayerCombatKill", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V" + target = "Lnet/minecraft/client/player/LocalPlayer;shouldShowDeathScreen()Z" ) ) private void onPlayerDeath(ClientboundPlayerCombatKillPacket packetIn, CallbackInfo ci) { From 95afaf3eace3ef19a473c1913dd1f75b9d5f668e Mon Sep 17 00:00:00 2001 From: Patrick Huber Date: Fri, 25 Mar 2022 21:10:40 +0100 Subject: [PATCH 11/12] Build: print more details on error --- .../src/main/java/baritone/gradle/task/BaritoneGradleTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java index 1aaf3578f..b85717201 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java @@ -83,7 +83,7 @@ class BaritoneGradleTask extends DefaultTask { protected void verifyArtifacts() throws IllegalStateException { if (!Files.exists(this.artifactPath)) { - throw new IllegalStateException("Artifact not found! Run build first!"); + throw new IllegalStateException("Artifact not found! Run build first! Missing file: " + this.artifactPath); } } From 599aa42cd8519296b613ce8e7d73d83087b14768 Mon Sep 17 00:00:00 2001 From: Patrick Huber Date: Sat, 26 Mar 2022 18:59:13 +0100 Subject: [PATCH 12/12] Build: set rootProject.name again (already present up until 1.16 and went missing afterwards) --- settings.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0e6cdeb43..8917ae757 100755 --- a/settings.gradle +++ b/settings.gradle @@ -37,4 +37,6 @@ pluginManagement { } mavenCentral() } -} \ No newline at end of file +} + +rootProject.name = 'baritone'