fix maven publishing, mixins and 1.18.1. Close #105

Common/build.gradle

@@ -15,6 +15,7 @@ buildscript {
 plugins {
     id('java')
     id('org.spongepowered.gradle.vanilla') version '0.2.1-SNAPSHOT'
+    id 'maven-publish'
 }
 
 apply plugin: 'com.blamejared.modtemplate'
@@ -41,4 +42,21 @@ minecraft {
 
 dependencies {
      compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.4'
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId project.group
+            artifactId project.archivesBaseName
+            version project.version
+            from components.java
+        }
+    }
+
+    repositories {
+        maven {
+            url "file://" + System.getenv("local_maven")
+        }
+    }
 }

Forge/src/main/resources/controlling.mixins.json → Common/src/main/resources/controlling.mixins.json

@@ -1,16 +1,21 @@
 {
   "required": true,
+  "minVersion": "0.8",
   "package": "com.blamejared.controlling.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+  ],
+  "client": [
     "AccessInputConstantsKey",
     "AccessKeyBindsScreen",
     "AccessKeyMapping",
     "AccessOptionsSubScreen",
     "AccessScreen"
   ],
+  "server": [
+  ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "controlling.refmap.json"
+  "refmap": "${refmap_target}refmap.json"
 }

Fabric/build.gradle

@@ -77,6 +77,10 @@ processResources {
     filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
+
+    filesMatching('*.mixins.json') {
+        expand "refmap_target": "${archivesBaseName}-"
+    }
 }
 
 tasks.withType(JavaCompile) {
@@ -92,20 +96,20 @@ jar {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
+            groupId project.group
+            artifactId project.archivesBaseName
+            version project.version
+            from components.java
         }
     }
 
     repositories {
+        maven {
+            url "file://" + System.getenv("local_maven")
+        }
     }
 }
 
-
 curseforge {
 
     apiKey = findProperty('curseforge_api_token') ?: 0

Fabric/src/main/resources/controlling.mixins.json → Fabric/src/main/resources/controlling.fabric.mixins.json

@@ -1,15 +1,15 @@
 {
   "required": true,
+  "minVersion": "0.8",
   "package": "com.blamejared.controlling.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "AccessInputConstantsKey",
-    "AccessKeyBindsScreen",
-    "AccessKeyMapping",
-    "AccessOptionsSubScreen",
-    "AccessScreen",
+  ],
+  "client": [
     "OpenGuiMixin"
   ],
+  "server": [
+  ],
   "injectors": {
     "defaultRequire": 1
   }

Fabric/src/main/resources/fabric.mod.json

@@ -28,6 +28,10 @@
     {
       "config": "controlling.mixins.json",
       "environment": "client"
+    },
+    {
+      "config": "controlling.fabric.mixins.json",
+      "environment": "client"
     }
   ]
 }

Forge/build.gradle

@@ -26,7 +26,10 @@ archivesBaseName = "${mod_name}-forge-${minecraft_version}"
 version = Utils.updatingVersion(mod_version)
 
 mixin {
-    add sourceSets.main, "controlling.refmap.json"
+    add sourceSets.main, "${mod_id}.refmap.json"
+
+    config "${mod_id}.mixins.json"
+    config "${mod_id}.forge.mixins.json"
 }
 
 minecraft {
@@ -44,7 +47,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
-            arg "--mixin=controlling.mixins.json"
+            args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json"
             mods {
                 modClientRun {
                     source sourceSets.main
@@ -57,7 +60,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
-            arg "--mixin=controlling.mixins.json"
+            args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json"
             mods {
                 modServerRun {
                     source sourceSets.main
@@ -71,7 +74,7 @@ minecraft {
             ideaModule "${rootProject.name}.${project.name}.main"
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
             taskName 'Data'
-            arg "--mixin=controlling.mixins.json"
+            args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json"
             mods {
                 modDataRun {
                     source sourceSets.main
@@ -119,6 +122,10 @@ tasks.withType(JavaCompile) {
 
 processResources {
     from project(":Common").sourceSets.main.resources
+
+    filesMatching('*.mixins.json') {
+        expand "refmap_target": "${mod_id}."
+    }
 }
 
 jar {
@@ -141,17 +148,21 @@ jar.finalizedBy('reobfJar')
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            groupId project.group
+            artifactId project.archivesBaseName
+            version project.version
             artifact jar
         }
     }
     repositories {
         maven {
-            url "file://${project.projectDir}/mcmodsrepo"
+            url "file://" + System.getenv("local_maven")
         }
     }
 }
 
 
+
 curseforge {
 
     apiKey = findProperty('curseforge_api_token') ?: 0

Forge/src/main/resources/controlling.forge.mixins.json

@@ -0,0 +1,16 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "com.blamejared.controlling.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+  ],
+  "server": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "refmap": "${refmap_target}refmap.json"
+}

gradle.properties

@@ -3,7 +3,7 @@ mod_version=9.0
 group=com.blamejared.controlling
 
 # Common
-minecraft_version=1..1
+minecraft_version=1.18.1
 common_runs_enabled=true
 common_client_run_name=Common Client
 common_server_run_name=Common Server