Port to MC 1.20

Author: Darkhax

.gitignore

@@ -20,3 +20,4 @@ build
 # other
 eclipse
 run
+*.DS_Store

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
                 ]) {
 
                     echo 'Building project.'
-                    sh './gradlew build publish publishCurseForge updateVersionTracker postDiscord --stacktrace --warn'
+                    sh './gradlew build publish publishCurseForge modrinth updateVersionTracker postDiscord --stacktrace --warn'
                 }
             }
         }

build.gradle

@@ -2,16 +2,25 @@
 buildscript {
 
     repositories {
-    
+
         mavenCentral()
     }
-    
+
     dependencies {
-    
+
         classpath group: 'com.diluv.schoomp', name: 'Schoomp', version: '1.2.5'
     }
 }
 
+plugins {
+    id 'fabric-loom' version '1.2-SNAPSHOT' apply(false)
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false)
+    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false)
+    id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' apply(false)
+    id 'net.darkhax.curseforgegradle' version '1.1.15' apply(false)
+    id 'com.modrinth.minotaur' version '2.8.0' apply(false)
+}
+
 apply from: 'gradle/property_loader.gradle'
 apply from: 'gradle/build_number.gradle'
 apply from: 'gradle/git_changelog.gradle'
@@ -20,28 +29,29 @@ apply from: 'gradle/version_checker.gradle'
 subprojects {
 
     apply plugin: 'maven-publish'
-    
+
     apply from: '../gradle/property_loader.gradle'
     apply from: '../gradle/java.gradle'
     apply from: '../gradle/build_number.gradle'
     apply from: '../gradle/git_changelog.gradle'
     apply from: '../gradle/minify_jsons.gradle'
     apply from: '../gradle/signing.gradle'
-    
+
     // Disables Gradle's custom module metadata from being published to maven. The 
     // metadata includes mapped dependencies which are not reasonably consumable by
     // other mod developers.
     tasks.withType(GenerateModuleMetadata) {
 
         enabled = false
     }
-    
+
     // Enable Mixins
     project.ext.mixin_enabled = project.file("src/main/resources/${mod_id}.mixins.json").exists()
     project.logger.lifecycle("Mixin ${project.ext.mixin_enabled ? 'enabled' : 'disabled'} for project ${project.name}.")
-    
+
     repositories {
 
+        mavenLocal()
         mavenCentral()
 
         maven {
@@ -53,11 +63,16 @@ subprojects {
             name = 'BlameJared Maven (CrT / Bookshelf)'
             url = 'https://maven.blamejared.com'
         }
-        
+
         maven {
             name = 'Mod Menu'
             url = 'https://maven.terraformersmc.com/releases/'
         }
+
+        maven {
+            name = 'JitPack'
+            url = 'https://jitpack.io'
+        }
     }
 }
 
@@ -73,47 +88,47 @@ task postDiscord() {
 
             // Create a new webhook instance for Discord
             def webhook = new Webhook(findProperty('curse_discord_webhook'), "${project.ext.mod_name} CurseForge Gradle Upload")
-        
+
             // Craft a message to send to Discord using the webhook.
-            def message = new Message()      
+            def message = new Message()
             message.setUsername("Mod Update: ${project.ext.mod_name}")
             message.setContent("${project.ext.mod_name} ${project.version} for Minecraft ${project.ext.minecraft_version} has been published!")
-            
+
             def embed = new Embed();
             def downloadSources = new StringJoiner('\n')
-            
-            if (project(':Forge').hasProperty('curse_file_url')) {
-            
-                downloadSources.add("<:forge:916233930091401266> [Forge](${project(':Forge').findProperty('curse_file_url')})")
+
+            if (project(':forge').hasProperty('curse_file_url')) {
+
+                downloadSources.add("<:forge:916233930091401266> [Forge](${project(':forge').findProperty('curse_file_url')})")
             }
-            
-            if (project(':Fabric').hasProperty('curse_file_url')) {
-            
-                downloadSources.add("<:fabric:916233929722314763> [Fabric](${project(':Fabric').findProperty('curse_file_url')})")
+
+            if (project(':fabric').hasProperty('curse_file_url')) {
+
+                downloadSources.add("<:fabric:916233929722314763> [Fabric](${project(':fabric').findProperty('curse_file_url')})")
             }
-            
+
             // Add Curseforge DL link if available.
             def downloadString = downloadSources.toString()
-            
+
             if (downloadString && !downloadString.isEmpty()) {
-            
+
                 embed.addField('Download', downloadString, false)
             }
-            
+
             // Add a changelog field if a changelog exists.
             if (project.ext.mod_changelog && !project.ext.mod_changelog.isEmpty()) {
-                
+
                 embed.addField('Changelog', getChangelog(1500), false)
             }
-            
+
             embed.setColor(0xFF8000)
             message.addEmbed(embed)
 
             webhook.sendMessage(message)
         }
 
         catch (IOException e) {
-        
+
             project.logger.error('Failed to push CF Discord webhook.')
         }
     }

Common/build.gradle renamed to common/build.gradle

@@ -1,17 +1,19 @@
 plugins {
-    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
+    id 'org.spongepowered.gradle.vanilla'
 }
-
 apply from: '../gradle/property_helper.gradle'
 
-archivesBaseName = "${mod_name}-Common-${minecraft_version}"
+base {
+    archivesName = "${mod_name}-Common-${minecraft_version}"
+}
 
 minecraft {
     version(minecraft_version)
 }
 
 dependencies {
-     compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
+    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
 }
 
 processResources {
@@ -26,38 +28,26 @@ processResources {
 
 // -- MAVEN PUBLISHING --
 project.publishing {
-    
+
     publications {
 
         mavenJava(MavenPublication) {
-        
-            artifactId project.archivesBaseName
-
-            // Base mod archive.
-            artifact jar
-            
-            // Adds the sources as an artifact.
-            artifact project.sourcesJar {
-                classifier 'sources'
-            }
 
-            // Adds the javadocs as an artifact.
-            artifact project.javadocJar {
-                classifier 'javadoc'
-            }
+            artifactId = base.archivesName.get()
+            from components.java
         }
     }
 
     repositories {
-    
+
         maven {
-        
+
             // Sets maven credentials if they are provided. This is generally
             // only used for external/remote uploads.
             if (project.hasProperty('mavenUsername') && project.hasProperty('mavenPassword')) {
-            
+
                 credentials {
-                
+
                     username findProperty('mavenUsername')
                     password findProperty('mavenPassword')
                 }