Port to MC 1.20.3

Author: Darkhax

.gitignore

@@ -21,4 +21,3 @@ build
 eclipse
 run
 runs
-.DS_Store

Jenkinsfile

@@ -10,18 +10,28 @@ pipeline {
 
     stages {
 
+        stage('Setup') {
+        
+            steps {
+            
+                echo 'Setup Project'
+                sh 'chmod +x gradlew'
+                sh './gradlew clean'
+            }
+        }
+        
         stage('Build') {
 
             steps {
 
                 withCredentials([
-                    file(credentialsId: 'mod_build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile'),
-                    file(credentialsId: 'java_keystore', variable: 'ORG_GRADLE_PROJECT_keyStore')
+                    file(credentialsId: 'build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile'),
+                    file(credentialsId: 'java_keystore', variable: 'ORG_GRADLE_PROJECT_keyStore'),
+                    file(credentialsId: 'gpg_key', variable: 'ORG_GRADLE_PROJECT_pgpKeyRing')
                 ]) {
 
                     echo 'Building project.'
-                    sh 'chmod +x gradlew'
-                    sh './gradlew clean build publish curseforge updateVersionTracker --stacktrace --warn'
+                    sh './gradlew build publish publishCurseForge modrinth updateVersionTracker postDiscord --stacktrace --warn'
                 }
             }
         }

build.gradle

@@ -1,253 +1,111 @@
+// TODO remove buildscript block
 buildscript {
+
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url 'https://plugins.gradle.org/m2/' }
-        jcenter()
+
         mavenCentral()
     }
+
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
-        classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
-        classpath group: 'com.diluv.schoomp', name: 'Schoomp', version: '1.1.0'
+
+        classpath group: 'com.diluv.schoomp', name: 'Schoomp', version: '1.2.5'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'com.matthewprenger.cursegradle'
-apply plugin: 'maven-publish' 
-apply plugin: 'eclipse'
-
-apply from: './gradle/secrets.gradle'
-apply from: './gradle/markdown-git-changelog.gradle'
-apply from: './gradle/artifacts.gradle'
-apply from: './gradle/patreon.gradle'
-
-import groovy.json.JsonSlurper
-import groovy.json.JsonOutput
-import com.diluv.schoomp.Webhook
-import com.diluv.schoomp.message.Message
-import com.diluv.schoomp.message.embed.Embed
-import com.diluv.schoomp.message.embed.Footer
-
-if (project.hasProperty('secretFile')) {
-    loadSecrets(new File((String) findProperty('secretFile')))
+plugins {
+    id 'net.darkhax.curseforgegradle' version '1.1.17' apply(false)
+    id 'com.modrinth.minotaur' version '2.8.5' apply(false)
+    id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
 }
 
-version = "${mod_version}." + getBuildNumber()
-archivesBaseName = "${mod_name}-${minecraft_version}"
+apply from: 'gradle/property_loader.gradle'
+apply from: 'gradle/build_number.gradle'
+apply from: 'gradle/git_changelog.gradle'
+apply from: 'gradle/version_checker.gradle'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+subprojects {
 
-minecraft {
+    apply plugin: 'maven-publish'
 
-    mappings channel: 'official', version: "${minecraft_version}".toString()
-    
-    if (project.hasProperty('mod_at')) {
-    
-        accessTransformer = file(findProperty('mod_at'))
-    }
-    
-    runs {
-        client {
-        
-            workingDirectory project.file('run')
-            taskName "${mod_name}Client"
-
-            mods {
-                badmobs {
-                    source sourceSets.main
-                }
-            }
-        }
+    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'
 
-        server {
-            workingDirectory project.file('run')
-            taskName "${mod_name}Server"
-            
-            mods {
-                badmobs {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
+    // 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) {
 
-dependencies {
-
-    minecraft "net.minecraftforge:forge:${forge_version}"
-}
-
-jar {
-    manifest {
-        attributes([
-            'Timestamp': System.currentTimeMillis(),
-            'Specification-Title': "${mod_name}",
-            'Specification-Vendor': "${mod_vendor}",
-            'Specification-Version': "${version}",
-            'Implementation-Title': project.archivesBaseName,
-            'Implementation-Version': project.version,
-            'Implementation-Vendor' :"${mod_vendor}",
-            'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-            'Built-On-Java': "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
-            'Built-On': "${forge_version}"
-        ])
+        enabled = false
     }
-}
-
-String getBuildNumber() {
 
-    return System.getenv('BUILD_NUMBER') ? System.getenv('BUILD_NUMBER') : System.getenv('TRAVIS_BUILD_NUMBER') ? System.getenv('TRAVIS_BUILD_NUMBER') : '0';
-}
-
-processResources {
+    // 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}.")
 
-    def buildProps = project.properties.clone()
-
-    // Replaces FML's magic file.jarVersion string with the correct version at
-    // build time.
-    buildProps.put('file', [jarVersion: project.version])
+    repositories {
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        mavenCentral()
 
-        expand buildProps
+        maven {
+            name = 'Sponge / Mixin'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        }
     }
 }
 
-curseforge {
 
-    apiKey = findProperty('curse_auth') ?: 0 
-    def versions = "${curse_versions}".split(', ')
-    project {
-
-        id = "${curse_project}"
-        releaseType = 'alpha'
-        changelog = getGitChangelog() + "\n\nLike the mod? Consider following me on [Twitter](https://twitter.com/darkhaxdev) and joining the [Discord](https://discord.darkhax.net)\n\nHuge thanks to my supporters on [Patreon](https://www.patreon.com/Darkhax?MCChangelog?${mod_name})\n\n" + getPledgeLog()
-        changelogType = 'markdown'
-
-        versions.each {
-
-            addGameVersion "${it}"
-        }
+import com.diluv.schoomp.Webhook
+import com.diluv.schoomp.message.Message
+import com.diluv.schoomp.message.embed.Embed
 
-        if (project.hasProperty('curse_requirements') || project.hasProperty('curse_optionals')) {
+task postDiscord() {
 
-            mainArtifact(jar) {
+    doLast {
+        try {
 
-                relations {
+            // Create a new webhook instance for Discord
+            def webhook = new Webhook(findProperty('curse_discord_webhook'), "${project.ext.mod_name} CurseForge Gradle Upload")
 
-                    if (project.hasProperty('curse_requirements')) {
-                        def requirements = "${curse_requirements}".split(', ')
-                        requirements.each {
+            // Craft a message to send to Discord using the webhook.
+            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!")
 
-                            requiredLibrary "${it}"
-                        }
-                    }
+            def embed = new Embed();
+            def downloadSources = new StringJoiner('\n')
 
-                    if (project.hasProperty('curse_optionals')) {
-                        def optionals = "${curse_optionals}".split(', ')
-                        optionals.each {
+            if (project(':forge').hasProperty('curse_file_url')) {
 
-                            optionalLibrary "${it}"
-                        }
-                    }
-                }
+                downloadSources.add("<:forge:916233930091401266> [Forge](${project(':forge').findProperty('curse_file_url')})")
             }
-        }
-
-        addArtifact(sourcesJar)
-        addArtifact(javadocJar)
-        addArtifact(deobfJar)
-    }
-}
-
-tasks.getByName("curseforge").doLast {
-    
-    try {
-    
-        // Reads the file ID given to us by CurseForge
-        def newFileId = tasks.getByName("curseforge${curse_project}").property('mainArtifact').fileID
-    
-        def webhook = new Webhook(findProperty('discordCFWebhook'), "${project.findProperty('mod_name')} Gradle Upload");
-        
-        def message = new Message();        
-        message.setUsername(findProperty('mod_name'));
-        message.setContent("${project.findProperty('mod_name')} ${version} for Minecraft ${findProperty('minecraft_version')} has been released! The download will be public soon.");
-        
-        def embed = new Embed();
-        embed.addField('Download', "${project.findProperty('curse_page')}/files/$newFileId", false);
-        embed.addField('Change Log', "${getGitChangelog() ?: 'Unavailable :('}", false);
-        embed.setColor(0xFF8000);           
-        message.addEmbed(embed);
-
-        webhook.sendMessage(message);
-    }
-    
-    catch (IOException e) {
-        println 'Failed to push to the Discord webhook.'
-    }
-}
 
-task updateVersionTracker {
-
-    onlyIf {
-    
-        project.hasProperty('versionTrackerAPI')
-    }
-    
-    doLast {
-        def body = [
-            'author': "${project.findProperty('mod_vendor')}",
-            'projectName': "${project.findProperty('mod_name').toLowerCase()}",
-            'gameVersion': "${project.findProperty('minecraft_version')}",
-            'projectVersion': "${version}",
-            'homepage': "${project.findProperty('mod_download')}",
-            'uid': "${project.findProperty('versionTrackerKey')}"
-        ]
-    
-        // Opens a connection to the version tracker API and writes the payload JSON.
-        def req = new URL(project.findProperty('versionTrackerAPI')).openConnection()
-        req.setRequestMethod('POST')
-        req.setRequestProperty('Content-Type', 'application/json; charset=UTF-8')
-        req.setRequestProperty('User-Agent', "${project.findProperty('mod_name')} Tracker Gradle")
-        req.setDoOutput(true)
-        req.getOutputStream().write(JsonOutput.toJson(body).getBytes("UTF-8"))
-
-        // We need to attempt a read in order to actually send the message.
-        println "VersionCheck Status code: ${req.getResponseCode()}"
-        println "VersionCheck Response: ${req.getInputStream().getText()}"
-    }
-}
+            // Add Curseforge DL link if available.
+            def downloadString = downloadSources.toString()
 
-publishing {
+            if (downloadString && !downloadString.isEmpty()) {
 
-    tasks.publish.dependsOn 'build'
-    
-    publications {
+                embed.addField('Download', downloadString, false)
+            }
 
-        mavenJava(MavenPublication) {
-        
-            artifactId project.archivesBaseName
+            // Add a changelog field if a changelog exists.
+            if (project.ext.mod_changelog && !project.ext.mod_changelog.isEmpty()) {
 
-            // Base mod archive.
-            artifact jar
-            
-            // Adds the sources as an artifact.
-            artifact sourcesJar {
-                classifier 'sources'
+                embed.addField('Changelog', getChangelog(1500), false)
             }
 
-            // Adds the javadocs as an artifact.
-            artifact javadocJar {
-                classifier 'javadoc'
-            }
+            embed.setColor(0xFF8000)
+            message.addEmbed(embed)
+
+            webhook.sendMessage(message)
         }
-    }
 
-    repositories {
-        maven {
-            // Sets the maven URL
-            url findProperty('localMaven')
+        catch (IOException e) {
+
+            project.logger.error('Failed to push CF Discord webhook.')
         }
     }
 }