[biomes] fix bootstrapping issue in 1.9-1.13

Author: SpaceWalkerRS

libraries/biomes/biomes-mc16w02a-mc18w05a/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java

@@ -1,6 +1,7 @@
 package net.ornithemc.osl.biomes.impl;
 
 import net.minecraft.resource.Identifier;
+import net.minecraft.util.Id2ObjectBiMap;
 import net.minecraft.util.registry.IdRegistry;
 import net.minecraft.world.biome.Biome;
 
@@ -16,5 +17,6 @@
 public final class BiomeIdRegistry {
 
 	public static final IdRegistry<Identifier, Biome> REGISTRY = new IdRegistry<>();
+	public static final Id2ObjectBiMap<Biome> MUTATED_BIOMES = new Id2ObjectBiMap<>();
 
 }

libraries/biomes/biomes-mc16w02a-mc18w05a/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java

@@ -16,7 +16,7 @@
 
 public final class BiomeRegistryImpl {
 
-	public static final Registry<Biome> REGISTRY = VanillaRegistries.registerSimple(RegistryKeys.BIOME, BiomeIdRegistry.REGISTRY, () -> Biome.REGISTRY);
+	public static final Registry<Biome> REGISTRY = VanillaRegistries.registerSimple(RegistryKeys.BIOME, BiomeIdRegistry.REGISTRY);
 
 	private static boolean locked = true;
 
@@ -89,7 +89,7 @@ private static void registerBiomeMutation(NamespacedIdentifier identifier, Biome
 
 	public static void init() {
 		SyncedRegistries.register(RegistryKeys.BIOME);
-		SyncedRegistries.registerMapper(RegistryKeys.BIOME, NamespacedIdentifiers.from("mutated_biome"), Id2ObjectBiMapMapper.of(Biome.MUTATED_BIOMES));
+		SyncedRegistries.registerMapper(RegistryKeys.BIOME, NamespacedIdentifiers.from("mutated_biome"), Id2ObjectBiMapMapper.of(BiomeIdRegistry.MUTATED_BIOMES));
 	}
 
 	public static void unlock() {

libraries/biomes/biomes-mc16w02a-mc18w05a/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java

@@ -15,6 +15,7 @@
 import net.fabricmc.api.Environment;
 
 import net.minecraft.resource.Identifier;
+import net.minecraft.util.Id2ObjectBiMap;
 import net.minecraft.util.registry.IdRegistry;
 import net.minecraft.world.biome.Biome;
 
@@ -53,6 +54,19 @@ public class BiomeMixin implements BiomeExtension, BiomeAccess {
 		return BiomeIdRegistry.REGISTRY;
 	}
 
+	@Redirect(
+		method = "<clinit>",
+		at = @At(
+			value = "NEW",
+			target = "net/minecraft/util/Id2ObjectBiMap"
+		)
+	)
+	private static Id2ObjectBiMap<Biome> osl$biomes$replaceIdMap() {
+		// this allows us to register the muated biomes mapper in
+		// the API entrypoint without triggering a Biome class load
+		return BiomeIdRegistry.MUTATED_BIOMES;
+	}
+
 	@Inject(
 		method = "<clinit>",
 		at = @At(

libraries/biomes/biomes-mc18w06a-mc18w31a/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java

@@ -1,6 +1,7 @@
 package net.ornithemc.osl.biomes.impl;
 
 import net.minecraft.resource.Identifier;
+import net.minecraft.util.Id2ObjectBiMap;
 import net.minecraft.util.registry.IdRegistry;
 import net.minecraft.world.biome.Biome;
 
@@ -16,5 +17,6 @@
 public final class BiomeIdRegistry {
 
 	public static final IdRegistry<Identifier, Biome> REGISTRY = new IdRegistry<>();
+	public static final Id2ObjectBiMap<Biome> MUTATED_BIOMES = new Id2ObjectBiMap<>();
 
 }

libraries/biomes/biomes-mc18w06a-mc18w31a/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java

@@ -16,7 +16,7 @@
 
 public final class BiomeRegistryImpl {
 
-	public static final Registry<Biome> REGISTRY = VanillaRegistries.registerSimple(RegistryKeys.BIOME, BiomeIdRegistry.REGISTRY, () -> Biome.REGISTRY);
+	public static final Registry<Biome> REGISTRY = VanillaRegistries.registerSimple(RegistryKeys.BIOME, BiomeIdRegistry.REGISTRY);
 
 	private static boolean locked = true;
 
@@ -89,7 +89,7 @@ private static void registerBiomeMutation(NamespacedIdentifier identifier, Biome
 
 	public static void init() {
 		SyncedRegistries.register(RegistryKeys.BIOME);
-		SyncedRegistries.registerMapper(RegistryKeys.BIOME, NamespacedIdentifiers.from("mutated_biome"), Id2ObjectBiMapMapper.of(Biome.MUTATED_BIOMES));
+		SyncedRegistries.registerMapper(RegistryKeys.BIOME, NamespacedIdentifiers.from("mutated_biome"), Id2ObjectBiMapMapper.of(BiomeIdRegistry.MUTATED_BIOMES));
 	}
 
 	public static void unlock() {

libraries/biomes/biomes-mc18w06a-mc18w31a/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java

@@ -9,6 +9,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.resource.Identifier;
+import net.minecraft.util.Id2ObjectBiMap;
 import net.minecraft.util.registry.IdRegistry;
 import net.minecraft.world.biome.Biome;
 
@@ -38,6 +39,19 @@ public class BiomeMixin implements BiomeExtension, BiomeAccess {
 		return BiomeIdRegistry.REGISTRY;
 	}
 
+	@Redirect(
+		method = "<clinit>",
+		at = @At(
+			value = "NEW",
+			target = "net/minecraft/util/Id2ObjectBiMap"
+		)
+	)
+	private static Id2ObjectBiMap<Biome> osl$biomes$replaceIdMap() {
+		// this allows us to register the muated biomes mapper in
+		// the API entrypoint without triggering a Biome class load
+		return BiomeIdRegistry.MUTATED_BIOMES;
+	}
+
 	@Inject(
 		method = "init",
 		at = @At(