From 63d0064d697e0d7da3abdf3a9e6af2c7c599e870 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 18 May 2023 22:37:07 -0600 Subject: [PATCH] pre.2 --- gradle.properties | 2 +- src/api/java/baritone/api/utils/BlockOptionalMeta.java | 7 +++++-- .../java/baritone/pathing/movement/MovementHelper.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index ce2e298f9..cf4c644d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,6 @@ mod_version=1.9.3 maven_group=baritone archives_base_name=baritone -minecraft_version=1.20-pre1 +minecraft_version=1.20-pre2 #forge_version=1.19.4-45.0.43 fabric_version=0.14.18 diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index d0eb461a3..8723c3b51 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -33,6 +33,7 @@ import net.minecraft.server.packs.resources.MultiPackResourceManager; import net.minecraft.server.packs.resources.ReloadableResourceManager; import net.minecraft.util.RandomSource; import net.minecraft.util.Unit; +import net.minecraft.world.RandomSequences; import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -53,6 +54,7 @@ import net.minecraft.world.phys.Vec3; import sun.misc.Unsafe; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.*; @@ -219,8 +221,9 @@ public final class BlockOptionalMeta { private static class ServerLevelStub extends ServerLevel { private static Minecraft client = Minecraft.getInstance(); private static Unsafe unsafe = getUnsafe(); - public ServerLevelStub(MinecraftServer $$0, Executor $$1, LevelStorageSource.LevelStorageAccess $$2, ServerLevelData $$3, ResourceKey $$4, LevelStem $$5, ChunkProgressListener $$6, boolean $$7, long $$8, List $$9, boolean $$10) { - super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10); + + public ServerLevelStub(MinecraftServer $$0, Executor $$1, LevelStorageSource.LevelStorageAccess $$2, ServerLevelData $$3, ResourceKey $$4, LevelStem $$5, ChunkProgressListener $$6, boolean $$7, long $$8, List $$9, boolean $$10, @Nullable RandomSequences $$11) { + super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10, $$11); } @Override diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index b69388eb1..2c642b0e3 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -510,14 +510,14 @@ public interface MovementHelper extends ActionCosts, Helper { static boolean canUseFrostWalker(CalculationContext context, BlockState state) { return context.frostWalker != 0 - && state.getBlock() == Blocks.WATER + && state == FrostedIceBlock.meltsInto() && ((Integer) state.getValue(LiquidBlock.LEVEL)) == 0; } static boolean canUseFrostWalker(IPlayerContext ctx, BlockPos pos) { BlockState state = BlockStateInterface.get(ctx, pos); return EnchantmentHelper.hasFrostWalker(ctx.player()) - && state.getBlock() == Blocks.WATER + && state == FrostedIceBlock.meltsInto() && ((Integer) state.getValue(LiquidBlock.LEVEL)) == 0; }