diff --git a/build.gradle b/build.gradle index adcff58..f76bac0 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ architectury { allprojects { def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv("GITHUB_RUN_NUMBER")) - version = rootProject.mod_version + "-(" + runNumber + ")" + version = rootProject.mod_version + "-" + runNumber group = rootProject.maven_group gradle.projectsEvaluated { @@ -81,7 +81,7 @@ subprojects { jar { from(rootProject.file("LICENSE")) { - rename { "${it}_${mod_name}" } + rename { "${it}_${mod_id}" } } manifest { attributes([ diff --git a/fabric/build.gradle b/fabric/build.gradle index a5b6727..441eff1 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -66,15 +66,11 @@ dependencies { if (test_enable_crimson_moon.toBoolean()) { modImplementation "curse.maven:crimson-moon-${cm_fabric_projectid}:${cm_fabric_fileids}" modImplementation "dev.draylar:world-data:${cm_world_data_ver}" - include "dev.draylar:world-data:${cm_world_data_ver}" modImplementation "draylar.omega-config:omega-config-base:${cm_omega_config_ver}" - include "draylar.omega-config:omega-config-base:${cm_omega_config_ver}" } else { modCompileOnly "curse.maven:crimson-moon-${cm_fabric_projectid}:${cm_fabric_fileids}" modCompileOnly "dev.draylar:world-data:${cm_world_data_ver}" - include "dev.draylar:world-data:${cm_world_data_ver}" modCompileOnly "draylar.omega-config:omega-config-base:${cm_omega_config_ver}" - include "draylar.omega-config:omega-config-base:${cm_omega_config_ver}" } // Lunar @@ -104,6 +100,8 @@ processResources { shadowJar { exclude "architectury.common.json" + exclude "urkazmoontools.accesswidener" + exclude "urkazmoontools.mixins.json" configurations = [project.configurations.shadowBundle] archiveClassifier = 'dev-shadow' diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index f5d9256..4869259 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -32,7 +32,6 @@ ] }, "mixins": [ - "urkazmoontools.mixins.json", "urkazmoontools-common.mixins.json" ], "depends": { diff --git a/forge/build.gradle b/forge/build.gradle index a1955c1..e85120a 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -15,7 +15,7 @@ loom { //extraAccessWideners.add loom.accessWidenerPath.get().asFile.name mixinConfig "urkazmoontools-common.mixins.json" - mixinConfig "urkazmoontools.mixins.json" + //mixinConfig "urkazmoontools.mixins.json" } } @@ -88,6 +88,11 @@ processResources { } shadowJar { + exclude "fabric.mod.json" + exclude "architectury.common.json" + exclude "urkazmoontools.accesswidener" + exclude "urkazmoontools.mixins.json" + configurations = [project.configurations.shadowBundle] archiveClassifier = 'dev-shadow' }