Made the entire thing simpler

emyfops · emyfops · commit 1f6a880af3db · 2024-07-08T19:00:55.000-04:00
diff --git a/common/src/main/kotlin/com/lambda/command/CommandRegistry.kt b/common/src/main/kotlin/com/lambda/command/CommandRegistry.kt
@@ -2,7 +2,7 @@ package com.lambda.command
 
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.LambdaConfig
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import org.reflections.Reflections
 import org.reflections.scanners.Scanners
 import org.reflections.util.ConfigurationBuilder
diff --git a/common/src/main/kotlin/com/lambda/core/Loadable.kt b/common/src/main/kotlin/com/lambda/core/Loadable.kt
@@ -0,0 +1,8 @@
+package com.lambda.core
+
+/**
+ * Represents a loadable object.
+ */
+interface Loadable {
+    fun load() = this::class.simpleName?.let { "Loaded $it" } ?: "Loaded"
+}
diff --git a/common/src/main/kotlin/com/lambda/core/Loader.kt b/common/src/main/kotlin/com/lambda/core/Loader.kt
@@ -24,7 +24,7 @@ object Loader {
     val runtime: String
         get() = "${(System.currentTimeMillis() - started).toDuration(DurationUnit.MILLISECONDS)}"
 
-    private val loadables = listOf(
+    val loadables = listOf(
         ModuleRegistry,
         CommandRegistry,
         RotationManager,
diff --git a/common/src/main/kotlin/com/lambda/core/PingManager.kt b/common/src/main/kotlin/com/lambda/core/PingManager.kt
@@ -1,6 +1,5 @@
 package com.lambda.core
 
-import com.lambda.core.lifecycle.Loadable
 import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
diff --git a/common/src/main/kotlin/com/lambda/core/TimerManager.kt b/common/src/main/kotlin/com/lambda/core/TimerManager.kt
@@ -1,6 +1,5 @@
 package com.lambda.core
 
-import com.lambda.core.lifecycle.Loadable
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.TickEvent
diff --git a/common/src/main/kotlin/com/lambda/core/lifecycle/Loadable.kt b/common/src/main/kotlin/com/lambda/core/lifecycle/Loadable.kt
diff --git a/common/src/main/kotlin/com/lambda/core/registry/RegistryController.kt b/common/src/main/kotlin/com/lambda/core/registry/RegistryController.kt
@@ -7,10 +7,8 @@ import net.minecraft.util.Identifier
 
 object RegistryController {
     private val REGISTRIES = HashMap<RegistryKey<out Registry<*>?>, MutableList<RegistryHolder<*>>>()
-    private var frozen = false
 
     fun <T> register(registry: Registry<T>, id: Identifier, value: T): RegistryHolder<T> {
-        check(!frozen) { "Cannot register, RegistryController is frozen." }
         val holder = RegistryHolder(id, value)
 
         REGISTRIES.computeIfAbsent(registry.key) { mutableListOf(holder) }
@@ -20,10 +18,8 @@ object RegistryController {
     /**
      * Loads the temporary registry holders into the actual registry.
      * This should be called after all registry holders have been created.
-     * It will also freeze the controller to prevent further registrations.
      */
     fun register(resourceKey: RegistryKey<out Registry<*>?>, registry: RegistryWrapper<*>) {
-        frozen = true
         REGISTRIES[resourceKey]?.forEach { it.handleRegister(registry) }
         REGISTRIES.remove(resourceKey)
     }
diff --git a/common/src/main/kotlin/com/lambda/friend/FriendRegistry.kt b/common/src/main/kotlin/com/lambda/friend/FriendRegistry.kt
@@ -2,7 +2,7 @@ package com.lambda.friend
 
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.FriendConfig
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.mojang.authlib.GameProfile
 
 object FriendRegistry : Configurable(FriendConfig), Loadable {
diff --git a/common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaEmoji.kt b/common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaEmoji.kt
@@ -1,6 +1,6 @@
 package com.lambda.graphics.renderer.gui.font
 
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.graphics.renderer.gui.font.glyph.EmojiGlyphs
 
 enum class LambdaEmoji(private val zipUrl: String) {
diff --git a/common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaFont.kt b/common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaFont.kt
@@ -1,6 +1,6 @@
 package com.lambda.graphics.renderer.gui.font
 
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.graphics.renderer.gui.font.glyph.FontGlyphs
 import com.lambda.util.LambdaResource
 import java.awt.Font
diff --git a/common/src/main/kotlin/com/lambda/gui/AbstractGuiConfigurable.kt b/common/src/main/kotlin/com/lambda/gui/AbstractGuiConfigurable.kt
@@ -2,7 +2,7 @@ package com.lambda.gui
 
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.GuiConfig
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.gui.impl.AbstractClickGui
 import com.lambda.gui.impl.clickgui.windows.tag.CustomModuleWindow
 import com.lambda.gui.impl.clickgui.windows.tag.TagWindow
@@ -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
+                }
             }
-        }
 }
diff --git a/common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt b/common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt
@@ -1,7 +1,7 @@
 package com.lambda.interaction
 
 import com.lambda.context.SafeContext
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
 import com.lambda.event.EventFlow.postChecked
 import com.lambda.event.events.PlayerPacketEvent
diff --git a/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt b/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt
@@ -3,7 +3,7 @@ package com.lambda.interaction
 import com.lambda.Lambda.mc
 import com.lambda.config.groups.RotationSettings
 import com.lambda.context.SafeContext
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.*
 import com.lambda.event.listener.SafeListener.Companion.listener
diff --git a/common/src/main/kotlin/com/lambda/interaction/material/ContainerManager.kt b/common/src/main/kotlin/com/lambda/interaction/material/ContainerManager.kt
@@ -1,6 +1,6 @@
 package com.lambda.interaction.material
 
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import com.lambda.event.events.InteractionEvent
 import com.lambda.event.events.ScreenHandlerEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
diff --git a/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt b/common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt
@@ -1,6 +1,6 @@
 package com.lambda.module
 
-import com.lambda.core.lifecycle.Loadable
+import com.lambda.core.Loadable
 import org.reflections.Reflections
 import org.reflections.scanners.Scanners
 import org.reflections.util.ConfigurationBuilder
diff --git a/common/src/main/kotlin/com/lambda/sound/SoundRegistry.kt b/common/src/main/kotlin/com/lambda/sound/SoundRegistry.kt
@@ -1,10 +1,10 @@
 package com.lambda.sound
 
-import com.lambda.core.lifecycle.Lifecycle
+import com.lambda.core.Loadable
 import com.lambda.core.registry.RegistryController
 import net.minecraft.registry.Registries
 
-object SoundRegistry : Lifecycle.Registry {
+object SoundRegistry : Loadable {
     override fun load(): String {
         LambdaSound.entries.forEach {
             RegistryController.register(Registries.SOUND_EVENT, it.id, it.event)
diff --git a/fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt b/fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt
@@ -4,11 +4,25 @@ 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.RegistryController
+import com.lambda.core.registry.RegistryWrapper
 import net.fabricmc.api.ClientModInitializer
+import net.minecraft.registry.Registries
+import net.minecraft.registry.Registry
+import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.util.Identifier
 
 object LambdaFabric : ClientModInitializer {
     override fun onInitializeClient() {
         Lambda.initialize()
         LOG.info("$MOD_NAME Fabric $VERSION initialized.")
+
+        Registries.REGISTRIES.forEach { registry ->
+            RegistryController.register(registry.key, object : RegistryWrapper<Any> {
+                override fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T> {
+                    return Registry.registerReference(registry as Registry<T>, id, value)
+                }
+            })
+        }
     }
 }
diff --git a/forge/src/main/kotlin/com/lambda/forge/LambdaForge.kt b/forge/src/main/kotlin/com/lambda/forge/LambdaForge.kt
@@ -9,10 +9,9 @@ import com.lambda.core.registry.RegistryWrapper
 import net.minecraft.registry.Registry
 import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.util.Identifier
+import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent
-import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent
 import net.minecraftforge.registries.RegisterEvent
 
 
@@ -24,33 +23,12 @@ object LambdaForge {
         LOG.info("$MOD_NAME Forge $VERSION initialized.")
     }
 
-    private fun onConstructMod(event: FMLConstructModEvent) {
-        LOG.info("Construct mod event.")
-    }
-
-    private fun onRegistrySetup(event: RegisterEvent) {
-        LOG.info("Register event for ${event.registryKey}.")
-
+    @SubscribeEvent
+    fun onRegistrySetup(event: RegisterEvent) {
         RegistryController.register(event.registryKey, object : RegistryWrapper<Any> {
             override fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T> {
                 return Registry.registerReference(event.getVanillaRegistry(), id, value)
             }
         })
     }
-
-    private fun onClientSetup(event: FMLClientSetupEvent) {
-        LOG.info("Client setup event.")
-    }
-
-    private fun onSidedSetup(event: FMLClientSetupEvent) {
-        LOG.info("Sided setup event.")
-    }
-
-    private fun onInterModComms(event: FMLClientSetupEvent) {
-        LOG.info("Inter-mod comms event.")
-    }
-
-    private fun onComplete(event: FMLClientSetupEvent) {
-        LOG.info("Complete event.")
-    }
 }
diff --git a/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt b/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt
@@ -9,47 +9,25 @@ import com.lambda.core.registry.RegistryWrapper
 import net.minecraft.registry.Registry
 import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.util.Identifier
+import net.neoforged.bus.api.SubscribeEvent
 import net.neoforged.fml.common.Mod
 import net.neoforged.fml.common.Mod.EventBusSubscriber
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent
-import net.neoforged.fml.event.lifecycle.FMLConstructModEvent
 import net.neoforged.neoforge.registries.RegisterEvent
 
 @Mod(Lambda.MOD_ID)
 @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
 object LambdaNeoForge {
     init {
         Lambda.initialize()
-        LOG.info("$MOD_NAME NeoForge $VERSION initialized.")
+        LOG.info("$MOD_NAME Forge $VERSION initialized.")
     }
 
-    private fun onConstructMod(event: FMLConstructModEvent) {
-        LOG.info("Construct mod event.")
-    }
-
-    private fun onRegistrySetup(event: RegisterEvent) {
-        LOG.info("Register event for ${event.registryKey}.")
-
+    @SubscribeEvent
+    fun onRegistrySetup(event: RegisterEvent) {
         RegistryController.register(event.registryKey, object : RegistryWrapper<Any> {
             override fun <T> registerForHolder(id: Identifier?, value: T): RegistryEntry<T> {
                 return Registry.registerReference(event.registry as Registry<T>, id, value)
             }
         })
     }
-
-    private fun onClientSetup(event: FMLClientSetupEvent) {
-        LOG.info("Client setup event.")
-    }
-
-    private fun onSidedSetup(event: FMLClientSetupEvent) {
-        LOG.info("Sided setup event.")
-    }
-
-    private fun onInterModComms(event: FMLClientSetupEvent) {
-        LOG.info("Inter-mod comms event.")
-    }
-
-    private fun onComplete(event: FMLClientSetupEvent) {
-        LOG.info("Complete event.")
-    }
 }
