Fix source jar not building and refmap

+ Fix mixin crash, mainly on forge
TerraformersMC · Nov 15, 2022 · f0d8747 · f0d8747
1 parent c4388c1
commit f0d8747
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git 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")
         }
     }
-}
+}
diff --git 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
@@ -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
@@ -76,15 +76,16 @@ minecraft {
 }
 
 mixin {
-	add sourceSets.main, "modid.refmap.json"
+	add sourceSets.main, "campanion.refmap.json"
 	config "campanion.mixins.json"
 }
 
 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
@@ -5,7 +5,7 @@ subprojects {
 	apply plugin: 'java'
 
 	java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-//    java.withSourcesJar()
+    java.withSourcesJar()
 	java.withJavadocJar()
 
 	jar {