Merge pull request #178 from refinedmods/release/0.18.0

Release v0.18.0
refinedmods · Sep 9, 2024 · 61e3da6 · 61e3da6
2 parents 4b4aed2 + 33cefc2
commit 61e3da6
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.18.0] - 2024-09-09
+
+### Fixed
+
+-   Resources not updating correctly on NeoForge.
+
 ## [0.17.1] - 2024-08-08
 
 ### Fixed
@@ -368,7 +374,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Gradle helpers for Fabric and Forge projects.
 -   CI workflows.
 
-[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.17.1...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.18.0...HEAD
+
+[0.18.0]: https://github.com/refinedmods/refinedarchitect/compare/v0.17.1...v0.18.0
 
 [0.17.1]: https://github.com/refinedmods/refinedarchitect/compare/v0.17.0...v0.17.1
 

diff --git a/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt b/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt
@@ -15,6 +15,7 @@ open class CommonExtension(private val project: Project) : BaseExtension(project
                 mappingsVersion.set(parchmentVersion)
             }
         }
+        project.artifacts.add("commonResources", project.file("src/generated/resources/"))
         project.extensions.getByType<JavaPluginExtension>().apply {
             sourceSets["main"].resources.srcDir("src/generated/resources")
         }

diff --git a/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt b/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt
@@ -12,6 +12,11 @@ open class FabricExtension(private val project: Project) : BaseExtension(project
     var modId: String? = null
 
     fun fabric() {
+        project.configurations["commonJava"].isCanBeResolved = true
+        project.configurations["commonJava"].isCanBeConsumed = modId == null
+        project.configurations["commonResources"].isCanBeResolved = true
+        project.configurations["commonResources"].isCanBeConsumed = modId == null
+
         project.dependencies.add("minecraft", "com.mojang:minecraft:${mcVersion}")
         project.dependencies.add("mappings", project.extensions.getByType<LoomGradleExtensionAPI>().layered() {
             officialMojangMappings()
@@ -46,25 +51,16 @@ open class FabricExtension(private val project: Project) : BaseExtension(project
                 }
             }
         }
-        project.tasks.withType<Jar>().configureEach {
-            from("../LICENSE.md")
-        }
-    }
-
-    fun addProject(dependency: Project) {
-        project.dependencies.add("api", dependency)
-        project.dependencies.add("include", dependency)
-    }
-
-    fun compileWithProject(dependency: Project) {
-        project.evaluationDependsOn(":" + dependency.name)
-        val sourceSets = dependency.extensions.getByType<JavaPluginExtension>().sourceSets
         project.tasks.withType<JavaCompile>().configureEach {
-            source(sourceSets["main"].allSource)
+            dependsOn(project.configurations["commonJava"])
+            source(project.configurations["commonJava"])
         }
         project.tasks.withType<ProcessResources>().configureEach {
-            from(sourceSets["main"].resources)
+            dependsOn(project.configurations["commonResources"])
+            from(project.configurations["commonResources"])
+        }
+        project.tasks.withType<Jar>().configureEach {
+            from("../LICENSE.md")
         }
-        project.dependencies.add("compileOnly", dependency)
     }
 }
diff --git a/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt b/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt
@@ -1,17 +1,22 @@
-import net.neoforged.moddevgradle.dsl.NeoForgeExtension as NfExtension
 import org.gradle.api.Project
-import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
+import org.gradle.language.jvm.tasks.ProcessResources
+import net.neoforged.moddevgradle.dsl.NeoForgeExtension as NfExtension
 
 open class NeoForgeExtension(private val project: Project) : BaseExtension(project) {
     var modId: String? = null
 
     fun neoForge() {
         val sourceSets = project.extensions.getByType<JavaPluginExtension>().sourceSets
+        project.configurations["commonJava"].isCanBeResolved = true
+        project.configurations["commonJava"].isCanBeConsumed = modId == null
+        project.configurations["commonResources"].isCanBeResolved = true
+        project.configurations["commonResources"].isCanBeConsumed = modId == null
         project.extensions.getByType<NfExtension>().apply {
             version.set(neoForgeVersion)
             addModdingDependenciesTo(sourceSets["test"])
@@ -37,10 +42,15 @@ open class NeoForgeExtension(private val project: Project) : BaseExtension(proje
             }
         }
         sourceSets["main"].resources.srcDirs.add(project.file("src/generated/resources"))
+        project.tasks.withType<JavaCompile>().configureEach {
+            dependsOn(project.configurations["commonJava"])
+            source(project.configurations["commonJava"])
+        }
+        project.tasks.withType<ProcessResources>().configureEach {
+            dependsOn(project.configurations["commonResources"])
+            from(project.configurations["commonResources"])
+        }
         project.tasks.withType<Jar>().configureEach {
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-            // These come in from the common API jars but should not end up in the neoforge jar
-            exclude("fabric.mod.json")
             from("../LICENSE.md")
         }
     }
@@ -79,21 +89,4 @@ open class NeoForgeExtension(private val project: Project) : BaseExtension(proje
             }
         }
     }
-
-    fun compileWithProject(dependency: Project) {
-        project.evaluationDependsOn(":" + dependency.name)
-        project.dependencies.add("compileOnly", dependency)
-        project.dependencies.add("testCompileOnly", dependency)
-        val sourceSets = dependency.extensions.getByType<JavaPluginExtension>().sourceSets
-        project.tasks.withType<Jar>().configureEach {
-            from(sourceSets["main"].output)
-        }
-        project.extensions.getByType<NfExtension>().apply {
-            mods {
-                getByName(modId!!) {
-                    modSourceSets.add(sourceSets["main"])
-                }
-            }
-        }
-    }
 }
diff --git a/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts b/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts
@@ -9,6 +9,17 @@ repositories {
     mavenCentral()
 }
 
+configurations {
+    create("commonJava") {
+        isCanBeResolved = false
+        isCanBeConsumed = true
+    }
+    create("commonResources") {
+        isCanBeResolved = false
+        isCanBeConsumed = true
+    }
+}
+
 version = "0.0.0"
 
 if (System.getenv("GITHUB_SHA") != null) {
@@ -48,3 +59,8 @@ tasks.withType<ProcessResources> {
         expand("version" to project.version)
     }
 }
+
+artifacts {
+    add("commonJava", sourceSets["main"].java.sourceDirectories.singleFile)
+    add("commonResources", sourceSets["main"].resources.sourceDirectories.singleFile)
+}