Replace hyphens in mod IDs with underscores

NeoForge doesn't support hyphens in mod IDs

Author: thecodewarrior

buildSrc/src/main/kotlin/com/teamwizardry/gradle/ModuleInfo.kt

@@ -20,7 +20,7 @@ open class ModuleInfo(val name: String) {
 
     val mavenName: String = name
 
-    val modid: String = "liblib-$name"
+    val modid: String = "liblib_$name"
 
     init {
         dependencies { dep ->

buildSrc/src/main/kotlin/liblib-module-common.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
 val generateFabricMod = tasks.register<GenerateFabricModJson>("generateFabricMod") {
     outputRoot.set(generatedResourcesDir.map { it.asFile })
 
-    id.set("generated-${module.moduleInfo.modid}-common")
+    id.set("generated_${module.moduleInfo.modid}_common")
     version.set("0.0.0")
 
     name.set(provider { "${module.moduleInfo.name} - :common assets" })

buildSrc/src/main/kotlin/liblib-module-testmod.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 val generateFabricMod = tasks.register<GenerateFabricModJson>("generateFabricMod") {
     outputRoot.set(generatedResourcesDir.map { it.asFile })
 
-    id.set("generated-${module.moduleInfo.modid}-testmod")
+    id.set("generated_${module.moduleInfo.modid}_testmod")
     version.set("0.0.0")
 
     name.set(provider { "${module.moduleInfo.name} - :testmod assets" })

buildSrc/src/main/kotlin/module-conventions.gradle.kts

@@ -146,7 +146,7 @@ tasks.named<ProcessResources>("processResources") {
 val generateFabricTestMod = tasks.register<GenerateFabricModJson>("generateFabricTestMod") {
     outputRoot.set(generatedTest.resolve("resources"))
 
-    id.set(module.moduleInfo.modid + "-test")
+    id.set(module.moduleInfo.modid + "_test")
     version.set(commonConfig.version)
 
     name.set(project.provider { "${module.displayName} Tests" })
@@ -162,7 +162,7 @@ val generateFabricTestMod = tasks.register<GenerateFabricModJson>("generateFabri
 
     modMenu.badges.add("library")
     modMenu.parent(
-        id = "librarianlib-test",
+        id = "librarianlib_test",
         name = "LibrarianLib Test Mods",
         description = "The test mods for the various librarianlib modules",
         badges = listOf()

dist/build.gradle.kts

@@ -86,7 +86,7 @@ configureFabricModJson {
 }
 
 configureFabricTestModJson {
-    id.set("librarianlib-test")
+    id.set("librarianlib_test")
     version.set(commonConfig.version)
 
     name.set("LibrarianLib Tests")
@@ -113,7 +113,7 @@ val jar = tasks.named<Jar>("jar") {
 }
 
 val testJar = tasks.register<Jar>("testJar") {
-    archiveBaseName.set("librarianlib-test")
+    archiveBaseName.set("librarianlib_test")
     from(sourceSets.test.get().output)
     from(configurations["includeTest"]) {
         into("META-INF/jars")

modules/albedo/common/src/main/kotlin/com/teamwizardry/librarianlib/albedo/LibLibAlbedo.kt

@@ -2,5 +2,5 @@ package com.teamwizardry.librarianlib.albedo
 
 import com.teamwizardry.librarianlib.LibLibModule
 
-internal object LibLibAlbedo : LibLibModule("liblib-albedo", "Albedo") {
+internal object LibLibAlbedo : LibLibModule("liblib_albedo", "Albedo") {
 }

modules/albedo/common/src/main/kotlin/com/teamwizardry/librarianlib/albedo/base/buffer/BaseRenderBuffer.kt

@@ -16,12 +16,12 @@ import org.joml.Matrix4f
  * The base class for most render buffers. It provides the basic vertex position functions and standard transform
  * matrices.
  *
- * In the shader, add `#include "liblib-albedo:base/transform.glsl"` to your attribute/uniform block and add
+ * In the shader, add `#include "liblib_albedo:base/transform.glsl"` to your attribute/uniform block and add
  * `gl_Position = albedo_base_transform();` to your `main()` body. e.g.
  * ```glsl
  * #version 150
  *
- * #include "liblib-albedo:base/transform.glsl"
+ * #include "liblib_albedo:base/transform.glsl"
  *
  * void main() {
  *     gl_Position = albedo_base_transform();

modules/albedo/common/src/main/kotlin/com/teamwizardry/librarianlib/albedo/base/buffer/BasicBufferImpl.kt

@@ -138,8 +138,8 @@ public class BasicBufferImpl<T : Any>(
                 val flags = features.toTypedArray()
                 val name = "basic_buffer_" + features.joinToString("_") { it.removePrefix("ENABLE_").lowercase() }
                 Shader.build(name)
-                    .vertex(Identifier.of("liblib-albedo:builtin/basic.vert"), *flags)
-                    .fragment(Identifier.of("liblib-albedo:builtin/basic.frag"), *flags)
+                    .vertex(Identifier.of("liblib_albedo:builtin/basic.vert"), *flags)
+                    .fragment(Identifier.of("liblib_albedo:builtin/basic.frag"), *flags)
                     .build()
             }
         }

modules/albedo/common/src/main/kotlin/com/teamwizardry/librarianlib/albedo/base/buffer/FlatColorRenderBuffer.kt

@@ -26,8 +26,8 @@ public class FlatColorRenderBuffer(vbo: VertexBuffer) : BaseRenderBuffer<FlatCol
 
     public companion object {
         private val defaultShader: Shader = Shader.build("flat_color")
-            .vertex(Identifier.of("liblib-albedo:builtin/flat_color.vert"))
-            .fragment(Identifier.of("liblib-albedo:builtin/flat_color.frag"))
+            .vertex(Identifier.of("liblib_albedo:builtin/flat_color.vert"))
+            .fragment(Identifier.of("liblib_albedo:builtin/flat_color.frag"))
             .build()
 
         @JvmStatic

modules/albedo/common/src/main/kotlin/com/teamwizardry/librarianlib/albedo/base/buffer/FlatLinesRenderBuffer.kt

@@ -67,9 +67,9 @@ public class FlatLinesRenderBuffer(vbo: VertexBuffer) :
 
     public companion object {
         private val defaultShader: Shader = Shader.build("flat_lines")
-            .vertex(Identifier.of("liblib-albedo:builtin/flat_lines.vert"))
-            .geometry(Identifier.of("liblib-albedo:builtin/flat_lines.geom"))
-            .fragment(Identifier.of("liblib-albedo:builtin/flat_lines.frag"))
+            .vertex(Identifier.of("liblib_albedo:builtin/flat_lines.vert"))
+            .geometry(Identifier.of("liblib_albedo:builtin/flat_lines.geom"))
+            .fragment(Identifier.of("liblib_albedo:builtin/flat_lines.frag"))
             .build()
 
         @JvmStatic