Merge branch '1.18' of github.com-quiqueck:paulevsGitch/BCLib into 1.18

src/main/java/ru/bclib/api/biomes/BiomeAPI.java

@@ -96,8 +96,8 @@ public class BiomeAPI {
 	 *
 	 * @param server - {@link MinecraftServer}
 	 */
-	public static void initRegistry(MinecraftServer server) {
+	public static void initRegistry( Registry<Biome> biomeRegistry) {
-		biomeRegistry = server.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
+		BiomeAPI.biomeRegistry = biomeRegistry;
 		CLIENT.clear();
 	}
 	

src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java

@@ -56,7 +56,7 @@ public class MinecraftServerMixin {
     @Inject(method = "loadLevel", at = @At(value = "RETURN"), cancellable = true)
     private void bclib_loadLevel(CallbackInfo info) {
         bclib_injectRecipes();
-        BiomeAPI.initRegistry(MinecraftServer.class.cast(this));
+        //BiomeAPI.initRegistry(MinecraftServer.class.cast(this));
     }
 
     private void bclib_injectRecipes() {

src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java

@@ -38,7 +38,7 @@ public abstract class ServerLevelMixin extends Level {
 		ServerLevel world = ServerLevel.class.cast(this);
 		LifeCycleAPI._runLevelLoad(world, server, executor, levelStorageAccess, serverLevelData, resourceKey, dimensionType, chunkProgressListener, chunkGenerator, bl, l, list, bl2);
 		
-		BiomeAPI.initRegistry(server);
+		//BiomeAPI.initRegistry(server);
 		BiomeAPI.applyModifications(ServerLevel.class.cast(this));
 		
 		if (bclib_lastWorld != null && bclib_lastWorld.equals(levelStorageAccess.getLevelId())) {

src/main/java/ru/bclib/mixin/common/WorldPresetMixin.java

@@ -0,0 +1,19 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.client.gui.screens.worldselection.WorldPreset;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.bclib.api.biomes.BiomeAPI;
+
+@Mixin(WorldPreset.class)
+public class WorldPresetMixin {
+	@Inject(method = "create", at = @At("HEAD"))
+	private void create(RegistryAccess.RegistryHolder registryHolder, long l, boolean bl, boolean bl2, CallbackInfoReturnable<WorldGenSettings> info) {
+		BiomeAPI.initRegistry(registryHolder.registryOrThrow(Registry.BIOME_REGISTRY));
+	}
+}

src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java

@@ -50,6 +50,7 @@ public class BCLibEndBiomeSource extends BiomeSource {
 	public BCLibEndBiomeSource(Registry<Biome> biomeRegistry, long seed) {
 		super(getBiomes(biomeRegistry));
 		
+		BiomeAPI.initRegistry(biomeRegistry);
 		BiomeAPI.END_LAND_BIOME_PICKER.clearMutables();
 		BiomeAPI.END_VOID_BIOME_PICKER.clearMutables();
 		

src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java

@@ -52,6 +52,7 @@ public class BCLibNetherBiomeSource extends BiomeSource {
 	public BCLibNetherBiomeSource(Registry<Biome> biomeRegistry, long seed) {
 		super(getBiomes(biomeRegistry));
 		
+		BiomeAPI.initRegistry(biomeRegistry);
 		BiomeAPI.NETHER_BIOME_PICKER.clearMutables();
 		
 		this.possibleBiomes().forEach(biome -> {

src/main/resources/bclib.mixins.common.json

@@ -30,6 +30,7 @@
 		"shears.SheepMixin",
 		"PortalShapeMixin",
 		"ServerLevelMixin",
+		"WorldPresetMixin",
 		"AnvilBlockMixin",
 		"AnvilMenuMixin",
 		"TagLoaderMixin",