build: update

auioc · Aug 16, 2022 · 7e8f623 · 7e8f623
1 parent 059cf75
commit 7e8f623
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
-        // classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -16,8 +15,10 @@ apply plugin: 'eclipse'
 apply plugin: 'org.spongepowered.mixin'
 
 group = 'org.auioc.mcmod'
-archivesBaseName = "arnicalib"
-project.ext.modVersion= "${arnicalib_version}"
+archivesBaseName = 'arnicalib'
+project.ext.modVersion = "${arnicalib_version}"
+project.ext.modName = 'ArnicaLib'
+project.ext.modId = 'arnicalib'
 apply from: 'gradle/version.gradle'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -32,7 +33,7 @@ minecraft {
             property 'user.language', 'en'
             property 'log4j.configurationFile', 'log4j2.xml'
             property 'mixin.debug', 'true'
-            arg '-mixin.config=arnicalib.mixin.json'
+            arg "-mixin.config=${project.modId}.mixin.json"
             mods {
                 arnicalib {
                     source sourceSets.main
@@ -46,7 +47,7 @@ minecraft {
             property 'user.language', 'en'
             property 'log4j.configurationFile', 'log4j2.xml'
             property 'mixin.debug', 'true'
-            arg '-mixin.config=arnicalib.mixin.json'
+            arg "-mixin.config=${project.modId}.mixin.json"
             mods {
                 arnicalib {
                     source sourceSets.main
@@ -66,7 +67,7 @@ dependencies {
 }
 
 mixin {
-    add sourceSets.main, 'arnicalib.mixin-refmap.json'
+    add sourceSets.main, "${project.modId}.mixin-refmap.json"
 }
 
 apply from: 'gradle/tasks.gradle'

diff --git a/gradle/artifacts.gradle b/gradle/artifacts.gradle
@@ -1,16 +1,16 @@
 def jarManifest = [
-        "Specification-Title": 'arnicalib',
+        "Specification-Title": project.modId,
         "Specification-Vendor": 'AUIOC',
         "Specification-Version": '1',
-        "Implementation-Title": project.name,
-        "Implementation-Version": "${project.modVersion}",
+        "Implementation-Title": project.modName,
+        "Implementation-Version": project.modVersion,
         "Implementation-Vendor" :'AUIOC',
         "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
         "TweakClass": 'org.spongepowered.asm.launch.MixinTweaker',
         "TweakOrder": 0,
-        "MixinConfigs": 'arnicalib.mixin.json',
-        "ArnicaLib-Version": "${project.archivesBaseName}-${project.fullVersion}"
+        "MixinConfigs": "${project.modId}.mixin.json",
     ]
+jarManifest."${project.modName}-Version" = "${project.archivesBaseName}-${project.fullVersion}"
 
 jar {
     manifest {attributes(jarManifest)}