From 13497a02a4f37a3743460689a211c28541e1a2e7 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Mon, 20 Jun 2022 21:46:06 -0700
Subject: [PATCH] register stuff with events

---
 .../dfsek/terra/forge/ForgeEntryPoint.java    | 10 ++--------
 .../forge/mixin/lifecycle/RegistryMixin.java  | 20 -------------------
 .../main/resources/terra.forge.mixins.json    |  3 +--
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/RegistryMixin.java

diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java
index 692bc838d..305dee743 100644
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java
@@ -50,16 +50,8 @@ public class ForgeEntryPoint {
         return TERRA_PLUGIN;
     }
     
-    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);
-    }
-    
     public ForgeEntryPoint() {
-        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);
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-        
         modEventBus.register(this);
     }
     
@@ -69,6 +61,8 @@ public class ForgeEntryPoint {
             logger.info("Loading Terra data...");
             LifecycleUtil.initialize();
         });
+        event.register(Registry.CHUNK_GENERATOR_KEY, helper -> helper.register(new Identifier("terra:terra"), Codecs.FABRIC_CHUNK_GENERATOR_WRAPPER));
+        event.register(Registry.BIOME_SOURCE_KEY, helper -> helper.register(new Identifier("terra:terra"), Codecs.TERRA_BIOME_SOURCE));
         event.register(Keys.BLOCKS, helper -> logger.debug("Block registration detected."));
     }
 }
diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/RegistryMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/RegistryMixin.java
deleted file mode 100644
index 18633dc0f..000000000
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/RegistryMixin.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dfsek.terra.forge.mixin.lifecycle;
-
-
-import net.minecraft.util.registry.Registry;
-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;
-
-import com.dfsek.terra.forge.ForgeEntryPoint;
-
-
-// Register Terra things to the builtin registries.
-@Mixin(Registry.class)
-public class RegistryMixin {
-    @Inject(method = "<clinit>", at = @At("RETURN"))
-    private static void registerTerraGenerators(CallbackInfo ci) {
-        ForgeEntryPoint.register();
-    }
-}
diff --git a/platforms/forge/src/main/resources/terra.forge.mixins.json b/platforms/forge/src/main/resources/terra.forge.mixins.json
index 77d2c9e44..e68b6351b 100644
--- a/platforms/forge/src/main/resources/terra.forge.mixins.json
+++ b/platforms/forge/src/main/resources/terra.forge.mixins.json
@@ -35,8 +35,7 @@
       "implementations.terra.world.ChunkRegionMixin",
       "implementations.terra.world.ServerWorldMixin",
       "lifecycle.DataPackContentsMixin",
-      "lifecycle.NoiseConfigMixin",
-      "lifecycle.RegistryMixin"
+      "lifecycle.NoiseConfigMixin"
     ],
     "client": [
     ],