diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
index 2f4366e47..d830f3643 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
@@ -29,6 +29,7 @@ import com.dfsek.terra.fabric.data.Codecs;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,9 +48,6 @@ public class FabricEntryPoint implements ModInitializer {
     @Override
     public void onInitialize() {
         logger.info("Initializing Terra Fabric mod...");
-        // register the things
-        Registry.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), Codecs.FABRIC_CHUNK_GENERATOR_WRAPPER);
-        Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), Codecs.TERRA_BIOME_SOURCE);
     
         FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
                 CommandExecutionCoordinator.simpleCoordinator(),
@@ -57,8 +55,14 @@ public class FabricEntryPoint implements ModInitializer {
                 commandSender -> (ServerCommandSource) commandSender
         );
         
+        
         manager.brigadierManager().setNativeNumberSuggestions(false);
         
         TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager));
     }
+    
+    public static void register() { // register the things
+        Registry.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), Codecs.FABRIC_CHUNK_GENERATOR_WRAPPER);
+        Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), Codecs.TERRA_BIOME_SOURCE);
+    }
 }
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/ChunkGenerator_ChunkGeneratorRegistrationMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/ChunkGenerator_ChunkGeneratorRegistrationMixin.java
new file mode 100644
index 000000000..2526c59d0
--- /dev/null
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/ChunkGenerator_ChunkGeneratorRegistrationMixin.java
@@ -0,0 +1,19 @@
+package com.dfsek.terra.fabric.mixin.lifecycle;
+
+
+import com.dfsek.terra.fabric.FabricEntryPoint;
+
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+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.CallbackInfo;
+
+
+@Mixin(ChunkGenerator.class)
+public class ChunkGenerator_ChunkGeneratorRegistrationMixin {
+    @Inject(method = "<clinit>", at = @At("RETURN"))
+    private static void registerTerraGenerators(CallbackInfo ci) {
+        FabricEntryPoint.register();
+    }
+}
diff --git a/platforms/fabric/src/main/resources/terra.mixins.json b/platforms/fabric/src/main/resources/terra.mixins.json
index d92e00890..079c9cc2e 100644
--- a/platforms/fabric/src/main/resources/terra.mixins.json
+++ b/platforms/fabric/src/main/resources/terra.mixins.json
@@ -1,50 +1,51 @@
 {
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.dfsek.terra.fabric.mixin",
-  "compatibilityLevel": "JAVA_16",
-  "mixins": [
-    "access.BiomeEffectsAccessor",
-    "access.MobSpawnerLogicAccessor",
-    "access.StateAccessor",
-    "access.StructureAccessorAccessor",
-    "implementations.BiomeMixin",
-    "implementations.HandleImplementationMixin",
-    "implementations.block.BlockMixin",
-    "implementations.block.entity.BlockEntityMixin",
-    "implementations.block.entity.LootableContainerBlockEntityMixin",
-    "implementations.block.entity.MobSpawnerBlockEntityMixin",
-    "implementations.block.entity.SignBlockEntityMixin",
-    "implementations.block.state.BlockStateMixin",
-    "implementations.block.state.PropertyMixin",
-    "implementations.chunk.ChunkRegionMixin",
-    "implementations.chunk.WorldChunkMixin",
-    "implementations.chunk.data.ProtoChunkMixin",
-    "implementations.entity.EntityMixin",
-    "implementations.entity.EntityTypeMixin",
-    "implementations.entity.PlayerEntityMixin",
-    "implementations.entity.ServerCommandSourceMixin",
-    "implementations.inventory.LockableContainerBlockEntityMixin",
-    "implementations.inventory.item.ItemMixin",
-    "implementations.inventory.item.ItemStackMixin",
-    "implementations.inventory.meta.EnchantmentMixin",
-    "implementations.inventory.meta.ItemStackDamageableMixin",
-    "implementations.inventory.meta.ItemStackMetaMixin",
-    "implementations.world.ChunkRegionMixin",
-    "implementations.world.ServerWorldMixin",
-    "lifecycle.MinecraftServerMixin",
-      "lifecycle.MinecraftServer_BiomeRegistrationMixin"
-  ],
-  "client": [
-    "access.GeneratorTypeAccessor",
-    "lifecycle.client.MinecraftClientMixin"
-  ],
-  "server": [
-    "lifecycle.server.GeneratorOptionsMixin",
-    "lifecycle.server.ServerMainMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "refmap": "terra-refmap.json"
+    "required": true,
+    "minVersion": "0.8",
+    "package": "com.dfsek.terra.fabric.mixin",
+    "compatibilityLevel": "JAVA_16",
+    "mixins": [
+        "access.BiomeEffectsAccessor",
+        "access.MobSpawnerLogicAccessor",
+        "access.StateAccessor",
+        "access.StructureAccessorAccessor",
+        "implementations.BiomeMixin",
+        "implementations.HandleImplementationMixin",
+        "implementations.block.BlockMixin",
+        "implementations.block.entity.BlockEntityMixin",
+        "implementations.block.entity.LootableContainerBlockEntityMixin",
+        "implementations.block.entity.MobSpawnerBlockEntityMixin",
+        "implementations.block.entity.SignBlockEntityMixin",
+        "implementations.block.state.BlockStateMixin",
+        "implementations.block.state.PropertyMixin",
+        "implementations.chunk.ChunkRegionMixin",
+        "implementations.chunk.WorldChunkMixin",
+        "implementations.chunk.data.ProtoChunkMixin",
+        "implementations.entity.EntityMixin",
+        "implementations.entity.EntityTypeMixin",
+        "implementations.entity.PlayerEntityMixin",
+        "implementations.entity.ServerCommandSourceMixin",
+        "implementations.inventory.LockableContainerBlockEntityMixin",
+        "implementations.inventory.item.ItemMixin",
+        "implementations.inventory.item.ItemStackMixin",
+        "implementations.inventory.meta.EnchantmentMixin",
+        "implementations.inventory.meta.ItemStackDamageableMixin",
+        "implementations.inventory.meta.ItemStackMetaMixin",
+        "implementations.world.ChunkRegionMixin",
+        "implementations.world.ServerWorldMixin",
+        "lifecycle.ChunkGenerator_ChunkGeneratorRegistrationMixin",
+        "lifecycle.MinecraftServer_BiomeRegistrationMixin",
+        "lifecycle.MinecraftServerMixin"
+    ],
+    "client": [
+        "access.GeneratorTypeAccessor",
+        "lifecycle.client.MinecraftClientMixin"
+    ],
+    "server": [
+        "lifecycle.server.GeneratorOptionsMixin",
+        "lifecycle.server.ServerMainMixin"
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    },
+    "refmap": "terra-refmap.json"
 }
\ No newline at end of file