From c4f093210ad206b854a7524b61b9138985845397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= <duplexsys@protonmail.com>
Date: Tue, 3 Jun 2025 15:15:07 -0600
Subject: [PATCH] Some additional logging

---
 .../lifecycle/util/LifecycleBiomeUtil.java    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
index b286697a3..3ad399862 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
@@ -51,13 +51,35 @@ public final class LifecycleBiomeUtil {
                                       Registry<net.minecraft.world.biome.Biome> registry) {
         RegistryKey<net.minecraft.world.biome.Biome> vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(registry);
 
+        if (vanilla == null) {
+            logger.error("""
+                         Failed to get Vanilla Biome Regiestry key!
+                         Terra Biome ID: {}
+                         Vanilla Biome: {}""", biome.getID(), biome.getPlatformBiome());
+        }
 
         if(pack.getContext().get(PreLoadCompatibilityOptions.class).useVanillaBiomes()) {
             ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(registry.getEntry(registry.get(vanilla)));
         } else {
             VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
 
-            net.minecraft.world.biome.Biome minecraftBiome = BiomeUtil.createBiome(Objects.requireNonNull(registry.get(vanilla)),
+
+            net.minecraft.world.biome.Biome vanilaBiome = registry.get(vanilla);
+            if (vanilaBiome == null) {
+                String vanillaBiomeName;
+                if (vanilla != null ) {
+                    vanillaBiomeName = vanilla.getValue().toString();
+                } else {
+                    vanillaBiomeName = "NULL";
+                }
+                logger.error("""
+                             Failed to get Vanilla Biome!
+                             Terra Biome ID: {}
+                             Vanilla Biome: {}""", biome.getID(), vanillaBiomeName);
+                return;
+            }
+
+            net.minecraft.world.biome.Biome minecraftBiome = BiomeUtil.createBiome(Objects.requireNonNull(vanilaBiome),
                 vanillaBiomeProperties);
 
             Identifier identifier = Identifier.of("terra", BiomeUtil.createBiomeID(pack, id));