Merge pull request #4553 from rfresh2/packLoadFix-1.20.5

Fix registry loading when custom registries present
cabaletta · Nov 21, 2024 · 1bfc030 · 1bfc030
2 parents b550b92 + 81c53d5
commit 1bfc030
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -37,13 +37,16 @@
 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;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
 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<RegistryAccess> 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<RegistryLayer> 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,