|
37 | 37 | import net.minecraft.server.level.progress.ChunkProgressListener; |
38 | 38 | import net.minecraft.server.packs.PackType; |
39 | 39 | import net.minecraft.server.packs.VanillaPackResources; |
| 40 | +import net.minecraft.server.packs.repository.BuiltInPackSource; |
| 41 | +import net.minecraft.server.packs.repository.Pack; |
40 | 42 | import net.minecraft.server.packs.repository.PackRepository; |
41 | 43 | import net.minecraft.server.packs.repository.ServerPacksSource; |
42 | 44 | import net.minecraft.server.packs.resources.CloseableResourceManager; |
43 | 45 | import net.minecraft.server.packs.resources.MultiPackResourceManager; |
44 | 46 | import net.minecraft.server.packs.resources.ResourceManager; |
45 | 47 | import net.minecraft.world.RandomSequences; |
46 | 48 | import net.minecraft.world.flag.FeatureFlagSet; |
| 49 | +import net.minecraft.world.flag.FeatureFlags; |
47 | 50 | import net.minecraft.world.item.Item; |
48 | 51 | import net.minecraft.world.item.ItemStack; |
49 | 52 | import net.minecraft.world.item.Items; |
@@ -306,14 +309,17 @@ public static Unsafe getUnsafe() { |
306 | 309 |
|
307 | 310 | public static CompletableFuture<RegistryAccess> load() { |
308 | 311 | 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 | + ); |
310 | 316 | LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = loadAndReplaceLayer( |
311 | 317 | closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES |
312 | 318 | ); |
313 | 319 | return ReloadableServerResources.loadResources( |
314 | 320 | closeableResourceManager, |
315 | 321 | layeredRegistryAccess, |
316 | | - WorldDataConfiguration.DEFAULT.enabledFeatures(), |
| 322 | + FeatureFlags.VANILLA_SET, |
317 | 323 | Commands.CommandSelection.INTEGRATED, |
318 | 324 | 2, |
319 | 325 | Runnable::run, |
|
0 commit comments