not launching atm

natanfudge · May 5, 2023 · 84aeda0 · 84aeda0
1 parent 61c4adf
commit 84aeda0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -6,7 +6,11 @@ plugins {
 }
 
 configurations {
-    shadowCommon
+    common
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
 }
 
 architectury {
@@ -37,15 +41,8 @@ dependencies {
     // Uncomment to add the test mod at runtime
 //    runtimeOnly project(path: ":TestFabricMod", configuration: "namedElements")
 
-    implementation(project(path: ":common", configuration: "dev")) {
-        transitive = false
-    }
-    developmentFabric(project(path: ":common", configuration: "dev")) {
-        transitive = false
-    }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) {
-        transitive = false
-    }
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }
 
 
@@ -62,15 +59,26 @@ processResources {
 }
 
 shadowJar {
+    exclude "architectury.common.json"
     configurations = [project.configurations.shadowCommon]
     classifier "dev-shadow"
 }
 
 remapJar {
+//    injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
     classifier "fabric"
 }
+jar {
+    classifier "dev"
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
 
 // Asset files will otherwise be missing when debugging
 //task copyAssetFilesForDebugging(type: Copy) {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -7,7 +7,11 @@ plugins {
 }
 
 configurations {
-    shadowCommon
+    common
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
 }
 
 architectury {
@@ -27,15 +31,9 @@ dependencies {
     // Uncomment to add the test mod at runtime
 //    runtimeOnly project(path: ":TestForgeMod", configuration: "namedElements")
 
-    compileOnly(project(path: ":common", configuration: "dev")) {
-        transitive = false
-    }
-    developmentForge(project(path: ":common", configuration: "dev")) {
-        transitive = false
-    }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) {
-        transitive = false
-    }
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+
 }
 
 processResources {
@@ -48,6 +46,7 @@ processResources {
 
 shadowJar {
     exclude "fabric.mod.json"
+    exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
     classifier "dev-shadow"
@@ -71,7 +70,11 @@ jar {
 java {
     withSourcesJar()
 }
-
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
 
 
 curseforge {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ mod_version = "4.4.0"
 
 # Gradle Plugins
 architectury_plugin = "3.4-SNAPSHOT"
-architectury_loom = "1.0-SNAPSHOT"
+architectury_loom = "1.1-SNAPSHOT"
 minotaur = "2.5.0"
 loom_quiltflower = "1.8.0"
 cursegradle = "1.4.0" # Must be updated in settings.gradle as well!
@@ -34,7 +34,7 @@ overrides_modrinth = "mc"
 # Mods & Libraries
 yarn_mappings = "1.19.4+build.1"
 fabric_loader = "0.14.19"
-fabric_api = "0.77.0+1.19.4"
+fabric_api = "0.78.0+1.19.4"
 quilt_loader = "0.17.6"
 forge = "45.0.43"
 architectury_api = "8.1.79"