From 81c53d5db170e6347d9b93fdce2c574ce782170d Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Fri, 8 Nov 2024 23:44:28 -0800 Subject: [PATCH 1/3] only load vanilla pack for registry access --- src/api/java/baritone/api/utils/BlockOptionalMeta.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index bca2875c3..ce8c41e96 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -37,6 +37,8 @@ import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.VanillaPackResources; +import net.minecraft.server.packs.repository.BuiltInPackSource; +import net.minecraft.server.packs.repository.Pack; import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.server.packs.repository.ServerPacksSource; import net.minecraft.server.packs.resources.CloseableResourceManager; @@ -44,6 +46,7 @@ import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.RandomSequences; import net.minecraft.world.flag.FeatureFlagSet; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -306,14 +309,17 @@ public static Unsafe getUnsafe() { public static CompletableFuture load() { PackRepository packRepository = Minecraft.getInstance().getResourcePackRepository(); - CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected()); + CloseableResourceManager closeableResourceManager = new MultiPackResourceManager( + PackType.SERVER_DATA, + List.of(packRepository.getPack(BuiltInPackSource.VANILLA_ID).open()) + ); LayeredRegistryAccess layeredRegistryAccess = loadAndReplaceLayer( closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES ); return ReloadableServerResources.loadResources( closeableResourceManager, layeredRegistryAccess, - WorldDataConfiguration.DEFAULT.enabledFeatures(), + FeatureFlags.VANILLA_SET, Commands.CommandSelection.INTEGRATED, 2, Runnable::run, From 1a258b2becd3ebb51d73e4b4bd4a3c2ad0f7b1a2 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Mon, 18 Nov 2024 00:14:08 -0800 Subject: [PATCH 2/3] fix litematica remapping error --- .../utils/schematic/litematica/LitematicaHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java index 081d32cc8..febe985d2 100644 --- a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java +++ b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java @@ -29,6 +29,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.util.Tuple; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; @@ -98,7 +99,7 @@ public static Tuple getSchematic(int i) { int minY = Integer.MAX_VALUE; int minZ = Integer.MAX_VALUE; HashMap subRegions = new HashMap<>(); - WorldSchematic schematicWorld = SchematicWorldHandler.getSchematicWorld(); + Level schematicWorld = SchematicWorldHandler.getSchematicWorld(); for (Map.Entry entry : placement.getEnabledRelativeSubRegionPlacements().entrySet()) { SubRegionPlacement subPlacement = entry.getValue(); Vec3i pos = transform(subPlacement.getPos(), placement.getMirror(), placement.getRotation()); @@ -152,4 +153,4 @@ public String toString() { return name; } } -} \ No newline at end of file +} From 91a1f05ff25d072e3b1db97f57a971c88a06d547 Mon Sep 17 00:00:00 2001 From: leijurv Date: Wed, 20 Nov 2024 01:23:03 -0800 Subject: [PATCH 3/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c2417806c..fa5a624e4 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Minecraft Minecraft Minecraft + Minecraft

@@ -70,6 +71,7 @@ Baritone is the pathfinding system used in [Impact](https://impactclient.net/) s | [1.20.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-forge-1.10.1.jar) | [1.20.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-fabric-1.10.1.jar) | | [1.20.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar) | [1.20.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) | | [1.20.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar) | [1.20.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) | +| [1.21.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.11.1/baritone-api-forge-1.11.1.jar) | [1.21.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.11.1/baritone-api-fabric-1.11.1.jar) | **Message for 2b2t players looking for 1.19/1.20 Baritone** If you like, please try the beta for Baritone Elytra for 2b2t, find it in #announcements of [the Baritone discord](http://discord.gg/s6fRBAUpmr). It supports 1.19.4 and 1.20.1, Forge or Fabric. If you have to see it to believe it, watch [this YouTube video](https://youtu.be/NnSlQi-68eQ).