Fix #2360 Lazily create LibraryKinds

RedNesto · RedNesto · commit e941c85dc32e · 2024-09-13T12:05:02.000+02:00
The platform started complaining about initializing these during class
 init, even though we use holder classes specifically for them.
 Using a lazy delegate should no longer trigger this warning.
diff --git a/src/main/kotlin/facet/MinecraftLibraryKinds.kt b/src/main/kotlin/facet/MinecraftLibraryKinds.kt
@@ -35,19 +35,21 @@ import com.demonwav.mcdev.platform.neoforge.framework.NEOFORGE_LIBRARY_KIND
 import com.demonwav.mcdev.platform.sponge.framework.SPONGE_LIBRARY_KIND
 import com.demonwav.mcdev.platform.velocity.framework.VELOCITY_LIBRARY_KIND
 
-val MINECRAFT_LIBRARY_KINDS = setOf(
-    BUKKIT_LIBRARY_KIND,
-    SPIGOT_LIBRARY_KIND,
-    PAPER_LIBRARY_KIND,
-    SPONGE_LIBRARY_KIND,
-    FORGE_LIBRARY_KIND,
-    NEOFORGE_LIBRARY_KIND,
-    FABRIC_LIBRARY_KIND,
-    ARCHITECTURY_LIBRARY_KIND,
-    MCP_LIBRARY_KIND,
-    MIXIN_LIBRARY_KIND,
-    BUNGEECORD_LIBRARY_KIND,
-    WATERFALL_LIBRARY_KIND,
-    VELOCITY_LIBRARY_KIND,
-    ADVENTURE_LIBRARY_KIND,
-)
+val MINECRAFT_LIBRARY_KINDS by lazy {
+    setOf(
+        BUKKIT_LIBRARY_KIND,
+        SPIGOT_LIBRARY_KIND,
+        PAPER_LIBRARY_KIND,
+        SPONGE_LIBRARY_KIND,
+        FORGE_LIBRARY_KIND,
+        NEOFORGE_LIBRARY_KIND,
+        FABRIC_LIBRARY_KIND,
+        ARCHITECTURY_LIBRARY_KIND,
+        MCP_LIBRARY_KIND,
+        MIXIN_LIBRARY_KIND,
+        BUNGEECORD_LIBRARY_KIND,
+        WATERFALL_LIBRARY_KIND,
+        VELOCITY_LIBRARY_KIND,
+        ADVENTURE_LIBRARY_KIND,
+    )
+}
diff --git a/src/main/kotlin/platform/adventure/framework/AdventureLibraryKind.kt b/src/main/kotlin/platform/adventure/framework/AdventureLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.adventure.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val ADVENTURE_LIBRARY_KIND: LibraryKind = libraryKind("adventure-api")
+val ADVENTURE_LIBRARY_KIND: LibraryKind by libraryKind("adventure-api")
diff --git a/src/main/kotlin/platform/architectury/framework/ArchitecturyLibraryKind.kt b/src/main/kotlin/platform/architectury/framework/ArchitecturyLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.architectury.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val ARCHITECTURY_LIBRARY_KIND: LibraryKind = libraryKind("architectury-api")
+val ARCHITECTURY_LIBRARY_KIND: LibraryKind by libraryKind("architectury-api")
diff --git a/src/main/kotlin/platform/bukkit/framework/BukkitLibraryKind.kt b/src/main/kotlin/platform/bukkit/framework/BukkitLibraryKind.kt
@@ -23,6 +23,6 @@ package com.demonwav.mcdev.platform.bukkit.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val BUKKIT_LIBRARY_KIND: LibraryKind = libraryKind("bukkit-api")
-val SPIGOT_LIBRARY_KIND: LibraryKind = libraryKind("spigot-api")
-val PAPER_LIBRARY_KIND: LibraryKind = libraryKind("paper-api")
+val BUKKIT_LIBRARY_KIND: LibraryKind by libraryKind("bukkit-api")
+val SPIGOT_LIBRARY_KIND: LibraryKind by libraryKind("spigot-api")
+val PAPER_LIBRARY_KIND: LibraryKind by libraryKind("paper-api")
diff --git a/src/main/kotlin/platform/bungeecord/framework/BungeeCordLibraryKind.kt b/src/main/kotlin/platform/bungeecord/framework/BungeeCordLibraryKind.kt
@@ -23,5 +23,5 @@ package com.demonwav.mcdev.platform.bungeecord.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val BUNGEECORD_LIBRARY_KIND: LibraryKind = libraryKind("bungeecord-api")
-val WATERFALL_LIBRARY_KIND: LibraryKind = libraryKind("waterfall-api")
+val BUNGEECORD_LIBRARY_KIND: LibraryKind by libraryKind("bungeecord-api")
+val WATERFALL_LIBRARY_KIND: LibraryKind by libraryKind("waterfall-api")
diff --git a/src/main/kotlin/platform/fabric/framework/FabricLibraryKind.kt b/src/main/kotlin/platform/fabric/framework/FabricLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.fabric.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val FABRIC_LIBRARY_KIND: LibraryKind = libraryKind("fabric-library")
+val FABRIC_LIBRARY_KIND: LibraryKind by libraryKind("fabric-library")
diff --git a/src/main/kotlin/platform/forge/framework/ForgeLibraryKind.kt b/src/main/kotlin/platform/forge/framework/ForgeLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.forge.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val FORGE_LIBRARY_KIND: LibraryKind = libraryKind("forge-library")
+val FORGE_LIBRARY_KIND: LibraryKind by libraryKind("forge-library")
diff --git a/src/main/kotlin/platform/mcp/framework/McpLibraryKind.kt b/src/main/kotlin/platform/mcp/framework/McpLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.mcp.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val MCP_LIBRARY_KIND: LibraryKind = libraryKind("mcp-library")
+val MCP_LIBRARY_KIND: LibraryKind by libraryKind("mcp-library")
diff --git a/src/main/kotlin/platform/mixin/framework/MixinLibraryKind.kt b/src/main/kotlin/platform/mixin/framework/MixinLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.mixin.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val MIXIN_LIBRARY_KIND: LibraryKind = libraryKind("mixin-library")
+val MIXIN_LIBRARY_KIND: LibraryKind by libraryKind("mixin-library")
diff --git a/src/main/kotlin/platform/neoforge/framework/NeoForgeLibraryKind.kt b/src/main/kotlin/platform/neoforge/framework/NeoForgeLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.neoforge.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val NEOFORGE_LIBRARY_KIND: LibraryKind = libraryKind("neoforge-library")
+val NEOFORGE_LIBRARY_KIND: LibraryKind by libraryKind("neoforge-library")
diff --git a/src/main/kotlin/platform/sponge/framework/SpongeLibraryKind.kt b/src/main/kotlin/platform/sponge/framework/SpongeLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.sponge.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val SPONGE_LIBRARY_KIND: LibraryKind = libraryKind("sponge-api")
+val SPONGE_LIBRARY_KIND: LibraryKind by libraryKind("sponge-api")
diff --git a/src/main/kotlin/platform/velocity/framework/VelocityLibraryKind.kt b/src/main/kotlin/platform/velocity/framework/VelocityLibraryKind.kt
@@ -23,4 +23,4 @@ package com.demonwav.mcdev.platform.velocity.framework
 import com.demonwav.mcdev.util.libraryKind
 import com.intellij.openapi.roots.libraries.LibraryKind
 
-val VELOCITY_LIBRARY_KIND: LibraryKind = libraryKind("velocity-api")
+val VELOCITY_LIBRARY_KIND: LibraryKind by libraryKind("velocity-api")
diff --git a/src/main/kotlin/util/utils.kt b/src/main/kotlin/util/utils.kt
@@ -361,7 +361,8 @@ inline fun <reified T> Iterable<*>.firstOfType(): T? {
     return this.firstOrNull { it is T } as? T
 }
 
-fun libraryKind(id: String): LibraryKind = LibraryKindRegistry.getInstance().findKindById(id) ?: LibraryKind.create(id)
+fun libraryKind(id: String): Lazy<LibraryKind> =
+    lazy { LibraryKindRegistry.getInstance().findKindById(id) ?: LibraryKind.create(id) }
 
 fun String.capitalize(): String =
     replaceFirstChar {
