Mucked around with stuff such that the syncfu code is now in another jar

Doing it all in one jar was making forge refuse to load it :(
jediminer543 · Oct 3, 2020 · 25ff968 · 25ff968
1 parent 175307b
commit 25ff968
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,14 @@ apply plugin: 'maven-publish'
 
 version = "${mcmt_ver}"
 group = 'org.jmt.mcmt' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "jmt_mcmt-${mc_ver}"
+archivesBaseName = "jmt_mcmt"
+
+sourceSets {
+	syncfu {
+		compileClasspath += sourceSets.main.runtimeClasspath
+		compileClasspath += sourceSets.main.compileClasspath
+	}
+}
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -39,26 +46,13 @@ minecraft {
 
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
+
+            //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
             mods {
                 jmt_mcmt {
                     source sourceSets.main
-                }
-            }
-        }
-
-        clientDebug {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                jmt_mcmt {
-                    source sourceSets.main
+                    source sourceSets.syncfu
                 }
             }
         }
@@ -68,26 +62,13 @@ minecraft {
 
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
+
+            //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
             mods {
                 jmt_mcmt {
                     source sourceSets.main
-                }
-            }
-        }
-
-        serverDebug {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                jmt_mcmt {
-                    source sourceSets.main
+                    source sourceSets.syncfu
                 }
             }
         }
@@ -106,6 +87,7 @@ minecraft {
             mods {
                 jmt_mcmt {
                     source sourceSets.main
+                    source sourceSets.syncfu
                 }
             }
         }
@@ -140,6 +122,8 @@ dependencies {
 
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
+	from sourceSets.main.output
+	classifier "${mc_ver}"
     manifest {
         attributes([
             "Specification-Title": "jmt_mcmt",
@@ -153,6 +137,19 @@ jar {
     }
 }
 
+
+task syncFuJar(type: Jar) {
+	from sourceSets.syncfu.output
+	classifier 'syncfu'
+} 
+
+configure(syncFuJar) {   
+	group = 'Build'
+	description = 'Create the syncfu jar'
+}
+
+build.dependsOn syncFuJar
+
 task cleanModToml(type: Delete) {
   delete 'src/main/resources/META-INF/mods.toml'
   followSymlinks = true

diff --git a/etc/update.json b/etc/update.json
@@ -1,19 +1,19 @@
 {
   "homepage": "https://github.com/jediminer543/JMT-MCMT",
   "1.16.3": {
-    "0.17.53": "Added update checking",
+    "0.17.54": "Added update checking and made mod actually load again",
     "0.17.52": "Added FU patching"
   },
   "1.16.2": {
-    "0.17.53": "Added update checking",
+    "0.17.54": "Added update checking and made mod actually load again",
     "0.17.52": "Added FU patching"
   },
   "1.16.1": {
-    "0.17.53": "Added update checking",
+    "0.17.54": "Added update checking and made mod actually load again",
     "0.17.52": "Added FU patching"
   },
   "1.15.2": {
-    "0.17.53": "Added update checking",
+    "0.17.54": "Added update checking and made mod actually load again",
     "0.17.52": "Added FU patching"
   },
   "promos": {

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mcmt_ver=0.17.52
+mcmt_ver=0.17.54
 
 mappings_ver =20200723-1.16.1
 mappings_chan=snapshot

diff --git a/src/main/resources/META-INF/template/mods.toml b/src/main/resources/META-INF/template/mods.toml
@@ -11,8 +11,8 @@ issueTrackerURL="https://github.com/jediminer543/JMT-MCMT/issues"
 modId="jmt_mcmt" #mandatory
 version="${file.jarVersion}" #mandatory
 displayName="JMT MCMT"
-# updateJSONURL="http://myurl.me/" #optional
 displayURL="https://github.com/jediminer543/JMT-MCMT"
+updateJSONURL="https://gitcdn.link/repo/jediminer543/JMT-MCMT/master/etc/update.json"
 # logoFile="examplemod.png" #optional
 credits="The glorious power of Coremods" #optional
 authors="jediminer543"

diff --git a/...dlauncher/FastUtilTransformerService.java → ...dlauncher/FastUtilTransformerService.java b/...dlauncher/FastUtilTransformerService.java → ...dlauncher/FastUtilTransformerService.java
diff --git a/...ds.modlauncher.api.ITransformationService → ...ds.modlauncher.api.ITransformationService b/...ds.modlauncher.api.ITransformationService → ...ds.modlauncher.api.ITransformationService