Resolve issue with FAPI blocking non-FAPI modded biomes in the End.

- Prevent FAPI crash when it sees our biomes

Author: gniftygnome

common/src/main/java/com/terraformersmc/biolith/impl/Biolith.java

@@ -4,6 +4,7 @@
 import com.terraformersmc.biolith.impl.commands.BiolithCommands;
 import com.terraformersmc.biolith.impl.compat.BiolithCompat;
 import com.terraformersmc.biolith.impl.config.BiolithConfigManager;
+import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,4 +26,8 @@ public static void init() {
     public static BiolithConfigManager getConfigManager() {
         return CONFIG_MANAGER;
     }
+
+    public static Identifier id(String name) {
+        return Identifier.of(MOD_ID, name);
+    }
 }

fabric/src/main/java/com/terraformersmc/biolith/impl/BiolithInit.java

@@ -3,11 +3,10 @@
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
 import com.terraformersmc.biolith.impl.compat.BiolithCompat;
 import com.terraformersmc.biolith.impl.data.BiomePlacementLoader;
-import com.terraformersmc.biolith.impl.data.IdentifiableResourceReloaderWrapper;
 import com.terraformersmc.biolith.impl.data.SurfaceGenerationLoader;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
 import net.minecraft.resource.ResourceType;
 
 public class BiolithInit implements ModInitializer {
@@ -24,8 +23,9 @@ public void onInitialize() {
             ServerLifecycleEvents.SERVER_STOPPED.register(BiomeCoordinator::handleServerStopped);
 
             // Implement our resource reloaders The Fabric Way (tm).
-            ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new IdentifiableResourceReloaderWrapper("biome_placement_loader", new BiomePlacementLoader()));
-            ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new IdentifiableResourceReloaderWrapper("surface_generation_loader", new SurfaceGenerationLoader()));
+            ResourceLoader serverDataLoader = ResourceLoader.get(ResourceType.SERVER_DATA);
+            serverDataLoader.registerReloader(Biolith.id("biome_placement_loader"), new BiomePlacementLoader());
+            serverDataLoader.registerReloader(Biolith.id("surface_generation_loader"), new SurfaceGenerationLoader());
 
             // Call loader-agnostic init.
             Biolith.init();

fabric/src/main/java/com/terraformersmc/biolith/impl/data/IdentifiableResourceReloaderWrapper.java

@@ -0,0 +1,25 @@
+package com.terraformersmc.biolith.impl.mixin;
+
+import net.fabricmc.fabric.impl.biome.TheEndBiomeData;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.source.util.MultiNoiseUtil;
+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;
+
+@Mixin(TheEndBiomeData.Overrides.class)
+public class MixinFapiTheEndBiomeDataOverrides {
+    /*
+     * Not only is FAPI not responsible for End biome placement under Biolith, but also they arbitrarily decided
+     * to block mods from adding End biomes via alternative means.  We bypass their picker to avoid this check.
+     */
+    @Inject(method = "pick(IIILnet/minecraft/world/biome/source/util/MultiNoiseUtil$MultiNoiseSampler;Lnet/minecraft/registry/entry/RegistryEntry;)Lnet/minecraft/registry/entry/RegistryEntry;",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void biolith$bypassBiomeAPI(int x, int y, int z, MultiNoiseUtil.MultiNoiseSampler noise, RegistryEntry<Biome> vanillaBiome, CallbackInfoReturnable<RegistryEntry<Biome>> cir) {
+        cir.setReturnValue(vanillaBiome);
+    }
+}

fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinFapiTheEndBiomeDataOverrides.java

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_17",
   "plugin": "com.terraformersmc.biolith.impl.mixin.BiolithFabricMixinConfigPlugin",
   "mixins": [
+    "MixinFapiTheEndBiomeDataOverrides",
     "MixinFapiTheEndBiomes",
     "MixinMBBiomeSource",
     "MixinSaveLoader",