Work on getting stuff to build

Author: lukebemish

build.gradle

@@ -33,10 +33,6 @@ subprojects { p ->
     apply plugin: 'java-library'
     apply plugin: libs.plugins.registrationutils.get().pluginId
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-    java.withSourcesJar()
-    java.withJavadocJar()
-
     registrationUtils {
         group 'org.groovymc.cgl.reg'
     }

buildSrc/src/main/groovy/convention.consumer.gradle

@@ -13,7 +13,7 @@ configurations {
 }
 
 dependencies {
-    allCompileOnly project(path: ':common', configuration: 'namedElements')
+    allCompileOnly project(path: ':common', configuration: 'exportedClasses')
     for (def sourceSet in ['main', 'extension', 'transform']) {
         for (def type in ['Java', 'Groovy', 'Resources']) {
             add("${sourceSet}Common${type}", project(path: ':common', configuration: "${sourceSet}Common${type}"))

buildSrc/src/main/groovy/convention.shared.gradle

@@ -9,7 +9,6 @@ group = rootProject.group
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 java.withSourcesJar()
-java.withJavadocJar()
 
 sourceSets {
     extension {
@@ -102,7 +101,7 @@ processResources {
 sourcesJar {
     dependsOn(configurations.rootProjectLicense)
     from(configurations.rootProjectLicense) {
-        rename { "${it}_${artifact_id}" }
+        rename { "${it}_${rootProject.name}" }
     }
     from sourceSets.extension.allSource
     from sourceSets.transform.allSource
@@ -111,7 +110,7 @@ sourcesJar {
 jar {
     dependsOn(configurations.rootProjectLicense)
     from(configurations.rootProjectLicense) {
-        rename { "${it}_${artifact_id}" }
+        rename { "${it}_${rootProject.name}" }
     }
 
     dependsOn tasks.named(sourceSets.extension.classesTaskName)

common/build.gradle

@@ -15,6 +15,10 @@ configurations {
             }
         }
     }
+    exportedClasses {
+        canBeResolved = false
+        canBeConsumed = true
+    }
 }
 
 loom {
@@ -61,8 +65,14 @@ afterEvaluate {
 
 artifacts {
     for (def sourceSet in ['main', 'extension', 'transform']) {
-        add("${sourceSet}CommonJava", sourceSets.main.java.sourceDirectories.singleFile)
-        add("${sourceSet}CommonGroovy", sourceSets.main.groovy.sourceDirectories.singleFile)
-        add("${sourceSet}CommonResources", sourceSets.main.resources.sourceDirectories.singleFile)
+        add("${sourceSet}CommonJava", sourceSets.named(sourceSet).get().java.sourceDirectories.singleFile)
+        add("${sourceSet}CommonGroovy", sourceSets.named(sourceSet).get().groovy.sourceDirectories.singleFile)
+        add("${sourceSet}CommonResources", sourceSets.named(sourceSet).get().resources.sourceDirectories.singleFile)
+        def outputClasses = project.objects.directoryProperty()
+        sourceSets.named(sourceSet).get().output.classesDirs.files.each {
+            add('exportedClasses', it) {
+                builtBy tasks.named(sourceSets.named(sourceSet).get().classesTaskName)
+            }
+        }
     }
 }

common/src/main/resources/mods.groovy

@@ -0,0 +1,59 @@
+MultiplatformModsDotGroovy.make {
+    modLoader = 'gml'
+    loaderVersion = '[1,)'
+
+    license = 'LGPL-3.0-or-later'
+    issueTrackerUrl = 'https://github.com/GroovyMC/CommonGroovyLibrary/issues'
+
+    mod {
+        modId = buildProperties['mod_id']
+        displayName = buildProperties['mod_name']
+        version = buildProperties['version']
+        displayUrl = 'https://github.com/GroovyMC/CommonGroovyLibrary'
+
+        description = "A library for common easy Groovy mod development."
+        author = buildProperties['mod_author']
+
+        dependencies {
+            minecraft = ">=${buildProperties['minecraftVersion']}"
+
+            onForge {
+                mod('neoforge') {
+                    versionRange = ">=${buildProperties['platformVersion']}"
+                }
+                mod('gml') {
+                    versionRange = ">=${buildProperties['gml_version']}"
+                }
+            }
+
+            onFabric {
+                mod('groovyduvet_core') {
+                    versionRange = ">=${buildProperties['groovyduvet_core_version']}"
+                }
+                mod('fabric_loader') {
+                    versionRange = ">=${buildProperties['platformVersion']}"
+                }
+            }
+        }
+
+        entrypoints {
+            entrypoint('main') {
+                adapter = 'groovyduvet'
+                value = 'org.groovymc.cgl.impl.fabric.CGLFabric'
+            }
+        }
+    }
+
+    onFabric {
+        modmenu = [
+            'badges':['library'],
+            'parent':[
+                'id':'groovyduvet',
+                'name':'GroovyDuvet',
+                'description':'Language adapter and wrapper libraries for Groovy mods on Quilt',
+                'icon':'assets/groovyduvet/icon.png',
+                'badges':['library']
+            ]
+        ]
+    }
+}

fabric/build.gradle

@@ -56,6 +56,7 @@ afterEvaluate {
     configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
 
     dependencies {
+        compileOnly reg.loaderSpecific()
         transformCompileOnly reg.loaderSpecific()
         extensionCompileOnly reg.loaderSpecific()
     }

neoforge/build.gradle

@@ -56,6 +56,7 @@ afterEvaluate {
     configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
 
     dependencies {
+        compileOnly reg.loaderSpecific()
         transformCompileOnly reg.loaderSpecific()
         extensionCompileOnly reg.loaderSpecific()
     }

neoforge/src/test/groovy/cgltest/CommandTest.groovy

@@ -4,9 +4,9 @@ import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.Level
-import net.minecraftforge.event.RegisterCommandsEvent
-import net.minecraftforge.eventbus.api.SubscribeEvent
-import net.minecraftforge.fml.common.Mod
+import net.neoforged.bus.api.SubscribeEvent
+import net.neoforged.fml.common.Mod
+import net.neoforged.neoforge.event.RegisterCommandsEvent
 
 @Mod.EventBusSubscriber
 class CommandTest {