From 14273268c897d8432787d263fd80d50ef11c6edf Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Mon, 20 Jun 2022 21:03:30 -0700
Subject: [PATCH] remove RegistryMixin

---
 .../dfsek/terra/forge/ForgeEntryPoint.java    |  9 ++++-----
 .../forge/mixin/lifecycle/RegistryMixin.java  | 20 -------------------
 .../main/resources/terra.forge.mixins.json    |  3 +--
 3 files changed, 5 insertions(+), 27 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 64b58c67d..d00d3622f 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
@@ -17,6 +17,8 @@
 
 package com.dfsek.terra.forge;
 
+import com.dfsek.terra.api.util.generic.Lazy;
+
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import net.minecraftforge.eventbus.api.EventPriority;
@@ -47,11 +49,6 @@ 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() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
         
@@ -60,6 +57,8 @@ public class ForgeEntryPoint {
     }
     
     private void commonSetup(FMLCommonSetupEvent event) {
+        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);
         logger.info("Initializing Terra Forge mod...");
     }
     
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": [
     ],