Skip to content

Commit 1bfc030

Browse files
authored
Merge pull request cabaletta#4553 from rfresh2/packLoadFix-1.20.5
Fix registry loading when custom registries present
2 parents b550b92 + 81c53d5 commit 1bfc030

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/api/java/baritone/api/utils/BlockOptionalMeta.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@
3737
import net.minecraft.server.level.progress.ChunkProgressListener;
3838
import net.minecraft.server.packs.PackType;
3939
import net.minecraft.server.packs.VanillaPackResources;
40+
import net.minecraft.server.packs.repository.BuiltInPackSource;
41+
import net.minecraft.server.packs.repository.Pack;
4042
import net.minecraft.server.packs.repository.PackRepository;
4143
import net.minecraft.server.packs.repository.ServerPacksSource;
4244
import net.minecraft.server.packs.resources.CloseableResourceManager;
4345
import net.minecraft.server.packs.resources.MultiPackResourceManager;
4446
import net.minecraft.server.packs.resources.ResourceManager;
4547
import net.minecraft.world.RandomSequences;
4648
import net.minecraft.world.flag.FeatureFlagSet;
49+
import net.minecraft.world.flag.FeatureFlags;
4750
import net.minecraft.world.item.Item;
4851
import net.minecraft.world.item.ItemStack;
4952
import net.minecraft.world.item.Items;
@@ -306,14 +309,17 @@ public static Unsafe getUnsafe() {
306309

307310
public static CompletableFuture<RegistryAccess> load() {
308311
PackRepository packRepository = Minecraft.getInstance().getResourcePackRepository();
309-
CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
312+
CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(
313+
PackType.SERVER_DATA,
314+
List.of(packRepository.getPack(BuiltInPackSource.VANILLA_ID).open())
315+
);
310316
LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = loadAndReplaceLayer(
311317
closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES
312318
);
313319
return ReloadableServerResources.loadResources(
314320
closeableResourceManager,
315321
layeredRegistryAccess,
316-
WorldDataConfiguration.DEFAULT.enabledFeatures(),
322+
FeatureFlags.VANILLA_SET,
317323
Commands.CommandSelection.INTEGRATED,
318324
2,
319325
Runnable::run,

0 commit comments

Comments
 (0)