diff --git a/Common/build.gradle b/Common/build.gradle index ea3a28a6..83e22ea2 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -22,8 +22,8 @@ minecraft { } dependencies { - compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' } processResources { @@ -51,4 +51,4 @@ publishing { url "file://" + System.getenv("local_maven") } } -} \ No newline at end of file +} diff --git a/Common/src/main/resources/campanion.mixins.json b/Common/src/main/resources/campanion.mixins.json index b95a1a3c..048bd8ab 100644 --- a/Common/src/main/resources/campanion.mixins.json +++ b/Common/src/main/resources/campanion.mixins.json @@ -33,5 +33,5 @@ "injectors": { "defaultRequire": 1 }, - "refmap": "campanion-refmap.json" + "refmap": "campanion.refmap.json" } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index b756635c..39e55204 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,11 +1,10 @@ - plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' + id 'maven-publish' + id 'idea' } - archivesBaseName = "${mod_name}-fabric-${minecraft_version}" -apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.5/fabric-mod.gradle' apply from: 'https://raw.githubusercontent.com/Wyn-Price/GradleScripts/2.5/multiproject-ferry/loader.gradle' dependencies { @@ -34,6 +33,10 @@ loom { } } +jar { + rename "${archivesBaseName}-refmap.json", 'campanion.refmap.json' +} + processResources { from project(":Common").sourceSets.main.resources inputs.property "version", project.version diff --git a/Forge/build.gradle b/Forge/build.gradle index 4c0893a3..24c46661 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -76,7 +76,7 @@ minecraft { } mixin { - add sourceSets.main, "modid.refmap.json" + add sourceSets.main, "campanion.refmap.json" config "campanion.mixins.json" } @@ -84,7 +84,8 @@ sourceSets.main.resources.srcDir 'src/generated/resources' dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly project(":Common") + annotationProcessor group:'org.spongepowered', name:'mixin', version:'0.8.5', classifier: 'processor' + compileOnly project(":Common") } tasks.withType(JavaCompile) { diff --git a/build.gradle b/build.gradle index 2167b6c0..1d169b6a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ subprojects { apply plugin: 'java' java.toolchain.languageVersion = JavaLanguageVersion.of(17) -// java.withSourcesJar() + java.withSourcesJar() java.withJavadocJar() jar {