Merge pull request #32 from Avanatiker/28-120x-121x-forge-neoforge-cannot-use-locked-vanilla-registries-urgent

[1.20.x, 1.21.x] [Forge, NeoForge] Cannot use locked vanilla registries

Author: emyfops

common/src/main/kotlin/com/lambda/core/Loadable.kt

@@ -1,5 +1,8 @@
 package com.lambda.core
 
+/**
+ * Represents a loadable object.
+ */
 interface Loadable {
     fun load() = this::class.simpleName?.let { "Loaded $it" } ?: "Loaded"
-}
+}

common/src/main/kotlin/com/lambda/core/PingManager.kt

@@ -26,4 +26,4 @@ object PingManager : Loadable {
             pings.add(Util.getMeasuringTimeMs() - event.packet.startTime)
         }
     }
-}
+}

common/src/main/kotlin/com/lambda/core/TimerManager.kt

@@ -16,4 +16,4 @@ object TimerManager : Loadable {
             }
         }
     }
-}
+}

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

@@ -0,0 +1,26 @@
+package com.lambda.core.registry
+
+import net.minecraft.registry.Registry
+import net.minecraft.registry.RegistryKey
+import net.minecraft.util.Identifier
+
+
+object RegistryController {
+    private val REGISTRIES = HashMap<RegistryKey<out Registry<*>?>, MutableList<RegistryHolder<*>>>()
+
+    fun <T> register(registry: Registry<T>, id: Identifier, value: T): RegistryHolder<T> {
+        val holder = RegistryHolder(id, value)
+
+        REGISTRIES.computeIfAbsent(registry.key) { mutableListOf(holder) }
+        return holder
+    }
+
+    /**
+     * Loads the temporary registry holders into the actual registry.
+     * This should be called after all registry holders have been created.
+     */
+    fun register(resourceKey: RegistryKey<out Registry<*>?>, registry: RegistryWrapper<*>) {
+        REGISTRIES[resourceKey]?.forEach { it.handleRegister(registry) }
+        REGISTRIES.remove(resourceKey)
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.lambda.core.registry
+
+import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.util.Identifier
+import java.util.function.Supplier
+
+
+class RegistryHolder<T> internal constructor(
+    val id: Identifier,
+    var value: T,
+) : Supplier<T> {
+    private var holder: RegistryEntry<T>? = null
+
+    override fun get(): T {
+        with(holder) {
+            checkNotNull(this) { "RegistryHolder not populated" }
+
+            return this.value()
+        }
+    }
+
+    fun handleRegister(registry: RegistryWrapper<*>) {
+        this.holder = registry.registerForHolder(id, value)
+    }
+}

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

@@ -0,0 +1,8 @@
+package com.lambda.core.registry
+
+import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.util.Identifier
+
+interface RegistryWrapper<T> {
+    fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T>
+}

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaFont.kt

@@ -26,4 +26,4 @@ enum class LambdaFont(private val fontName: String) {
             return "Loaded ${entries.size} fonts"
         }
     }
-}
+}

common/src/main/kotlin/com/lambda/gui/AbstractGuiConfigurable.kt

@@ -17,11 +17,12 @@ abstract class AbstractGuiConfigurable(
     var mainWindows by setting("windows", defaultWindows)
     open var customWindows = mutableListOf<CustomModuleWindow>()
 
-    private val defaultWindows get() =
-        tags.mapIndexed { index, tag ->
-            TagWindow(tag, ownerGui).apply {
-                val step = 5.0
-                position = Vec2d((width + step) * index, 0.0) + step
+    private val defaultWindows
+        get() =
+            tags.mapIndexed { index, tag ->
+                TagWindow(tag, ownerGui).apply {
+                    val step = 5.0
+                    position = Vec2d((width + step) * index, 0.0) + step
+                }
             }
-        }
-}
+}

common/src/main/kotlin/com/lambda/interaction/RotationManager.kt

@@ -1,10 +1,9 @@
 package com.lambda.interaction
 
 import com.lambda.Lambda.mc
-import com.lambda.config.groups.IRotationConfig
 import com.lambda.config.groups.RotationSettings
-import com.lambda.core.Loadable
 import com.lambda.context.SafeContext
+import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.*
 import com.lambda.event.listener.SafeListener.Companion.listener

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

@@ -1,13 +1,13 @@
 package com.lambda.sound
 
 import com.lambda.core.Loadable
+import com.lambda.core.registry.RegistryController
 import net.minecraft.registry.Registries
-import net.minecraft.registry.Registry
 
 object SoundRegistry : Loadable {
     override fun load(): String {
         LambdaSound.entries.forEach {
-            Registry.register(Registries.SOUND_EVENT, it.id, it.event)
+            RegistryController.register(Registries.SOUND_EVENT, it.id, it.event)
         }
 
         return "Loaded ${LambdaSound.entries.size} sounds"