Reworked registries

Author: emyfops

…mbda/core/registry/AgnosticRegistries.kt …in/com/lambda/core/AgnosticRegistries.ktcommon/src/main/kotlin/com/lambda/core/registry/AgnosticRegistries.kt renamed to common/src/main/kotlin/com/lambda/core/AgnosticRegistries.kt common/src/main/kotlin/com/lambda/core/registry/AgnosticRegistries.kt renamed to common/src/main/kotlin/com/lambda/core/AgnosticRegistries.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.core.registry
+package com.lambda.core
 
 import net.minecraft.registry.Registry
 import net.minecraft.registry.RegistryKey
@@ -29,36 +29,22 @@ import net.minecraft.util.Identifier
  * It allows for environment-agnostic registry handling.
  */
 object AgnosticRegistries {
-    private val registries = HashMap<
+    val registries = HashMap<
             RegistryKey<out Registry<*>?>,
-            MutableList<RegistryHolder<*>>
+            MutableList<Pair<Identifier, *>>
             >()
 
     /**
      * Registers a temporary registry holder.
-     * This should be called after the controller has dumped its registries.
-     * If not, the holder will not be dumped into its respective registry.
+     *
+     * This should be called before the given registry has been loaded.
      *
      * @param registry The registry to register the holder for.
      * @param id The identifier for the registry entry.
      * @param value The value to register.
-     *
-     * @return The registry holder.
-     */
-    fun <T> register(registry: Registry<T>, id: Identifier, value: T): RegistryHolder<T> {
-        val holder = RegistryHolder(id, value)
-
-        registries.getOrPut(registry.key) { mutableListOf() }.add(holder)
-        return holder
-    }
-
-    /**
-     * Loads the temporary registry holders into the actual registry.
-     * This should be called after all registry holders have been created.
-     *
-     * @param registry The registry to dump into.
      */
-    fun dump(registry: Registry<*>?) = dump(registry, wrapper = null)
+    fun <T> register(registry: Registry<T>, id: Identifier, value: T) =
+        registries.getOrPut(registry.key) { mutableListOf() }.add(id to value)
 
     /**
      * Loads the temporary registry holders into the actual registry.
@@ -69,27 +55,31 @@ object AgnosticRegistries {
      *
      * @return Whether there were temporary registries or not or null if the registry is null.
      */
-    fun dump(registry: Registry<*>?, wrapper: RegistryWrapper<*>?): Boolean? {
-        if (registry == null || registry !is SimpleRegistry) return null
+    fun <T : Any> dump(registry: Registry<T>, wrapper: RegistryWrapper<T> = defaultWrapper(registry)): Boolean? {
         val key = registry.key
 
-        registries[key]?.forEach { it.handleRegister(wrapper ?: defaultWrapper(registry)) }
+        registries[key]?.forEach { (id, value) ->
+            @Suppress("Unchecked_cast")
+            val v = value as? T ?: return@forEach
+            wrapper.registerForHolder(id, v)
+        }
+
         return registries.remove(key) != null
     }
 
     /**
      * Default registry wrapper for vanilla registries.
      */
-    @Suppress("UNCHECKED_CAST")
-    private fun defaultWrapper(registry: SimpleRegistry<*>): RegistryWrapper<*> {
-        return object : RegistryWrapper<Any> {
-            override fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T> {
-                registry.frozen = false // fuck off
-                val entry = Registry.registerReference(registry as Registry<T>, id, value)
-                registry.frozen = true
+    fun <T : Any> defaultWrapper(registry: Registry<T>) = object : RegistryWrapper<T> {
+        override fun registerForHolder(id: Identifier, value: T): RegistryEntry<T> {
+            val simple = registry as? SimpleRegistry
+            val frozen = simple?.frozen ?: true // will never be null
+
+            simple?.let { it.frozen = false } // fuck off
+            val entry = Registry.registerReference(registry, id, value)
+            simple?.let { it.frozen = frozen }
 
-                return entry
-            }
+            return entry
         }
     }
 }

…/lambda/core/registry/RegistryWrapper.kt …otlin/com/lambda/core/RegistryWrapper.ktcommon/src/main/kotlin/com/lambda/core/registry/RegistryWrapper.kt renamed to common/src/main/kotlin/com/lambda/core/RegistryWrapper.kt common/src/main/kotlin/com/lambda/core/registry/RegistryWrapper.kt renamed to common/src/main/kotlin/com/lambda/core/RegistryWrapper.kt

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.core.registry
+package com.lambda.core
 
 import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.util.Identifier
 
 interface RegistryWrapper<T> {
-    fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T>
+    fun registerForHolder(id: Identifier, value: T): RegistryEntry<T>
 }

common/src/main/kotlin/com/lambda/core/registry/RegistryHolder.kt

@@ -18,7 +18,7 @@
 package com.lambda.sound
 
 import com.lambda.core.Loadable
-import com.lambda.core.registry.AgnosticRegistries
+import com.lambda.core.AgnosticRegistries
 import net.minecraft.registry.Registries
 
 object SoundRegistry : Loadable {

common/src/main/kotlin/com/lambda/sound/SoundRegistry.kt

@@ -21,15 +21,15 @@ import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.MOD_NAME
 import com.lambda.Lambda.VERSION
-import com.lambda.core.registry.AgnosticRegistries
+import com.lambda.core.AgnosticRegistries
 import net.fabricmc.api.ClientModInitializer
 import net.minecraft.registry.Registries
 
 object LambdaFabric : ClientModInitializer {
     override fun onInitializeClient() {
-        Lambda.initialize {
-            Registries.REGISTRIES.forEach(AgnosticRegistries::dump)
-            LOG.info("$MOD_NAME Fabric $VERSION was successfully initialized after $it ms\n")
+        Lambda.initialize { time ->
+            Registries.REGISTRIES.forEach { AgnosticRegistries.dump(it) }
+            LOG.info("$MOD_NAME Fabric $VERSION was successfully initialized after $time ms\n")
         }
     }
 }