.github/workflows/gradle-prs.yml

@@ -11,5 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - { uses: actions/checkout@v2 }
-      - { name: 'Set up JDK 16', uses: actions/setup-java@v2, with: { distribution: 'adopt', java-version: '16' } }
+      - { name: 'Set up JDK 17', uses: actions/setup-java@v2, with: { distribution: 'adopt', java-version: '17' } }
       - { name: Build with Gradle, id: build, env: { USE_ALPHAS: false }, run: 'chmod +x gradlew && ./gradlew build' }

.github/workflows/gradle-releases.yml

@@ -1,39 +1,60 @@
-name: 'Build Release'
+name: "Build Release"
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+-[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+-[0-9]+.[0-9]+.[0-9]+'
+      - "[0-9]+.[0-9]+.[0-9]+-[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+-[0-9]+.[0-9]+.[0-9]+"
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - { uses: actions/checkout@v2, with: { fetch-depth: 0 } }
-      - { name: 'Set up JDK 16', uses: actions/setup-java@v2, with: { distribution: 'adopt', java-version: '16' } }
-      - { name: 'Build with Gradle', id: build, env: {
-        MAVEN_PASSWORD: "${{secrets.MAVEN_PASSWORD}}",
-        MAVEN_URL: "${{secrets.MAVEN_URL}}",
-        MAVEN_USER: "${{secrets.MAVEN_USER}}",
-        USE_ALPHAS: false
-      },  run: 'chmod +x gradlew && ./gradlew setupGithubActions build publish' }
+      - {
+          name: "Set up JDK 17",
+          uses: actions/setup-java@v2,
+          with: { distribution: "adopt", java-version: "17" },
+        }
+      - {
+          name: "Build with Gradle",
+          id: build,
+          env:
+            {
+              MAVEN_PASSWORD: "${{secrets.MAVEN_PASSWORD}}",
+              MAVEN_URL: "${{secrets.MAVEN_URL}}",
+              MAVEN_USER: "${{secrets.MAVEN_USER}}",
+              USE_ALPHAS: false,
+            },
+          run: "chmod +x gradlew && ./gradlew setupGithubActions build publish",
+        }
       - name: "Create a Release"
         id: create_release
-        uses: meeDamian/github-release@v1.0.1
+        uses: meeDamian/github-release@2.0
         with:
-          draft: false
-          files: "build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}.jar"
+          files: "fabric/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-fabric.jar forge/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-forge.jar"
           gzip: false
           name: "${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}"
-          prerelease: false
           token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: "CF upload"
+      - name: "Upload Fabric to CurseForge"
         uses: itsmeow/curseforge-upload@master
         with:
           changelog: "Changelog not added yet..."
-          display_name: "${{ steps.build.outputs.curse_title }}"
-          file_path: "build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}.jar"
+          display_name: "${{ steps.build.outputs.curse_title }} ${{ steps.build.outputs.version }} [Fabric]"
+          file_path: "fabric/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-fabric.jar"
           game_endpoint: minecraft
-          game_versions: "${{ steps.build.outputs.curse_versions }}"
+          relations: "${{ steps.build.outputs.curse_relations_fabric }}"
+          game_versions: "${{ steps.build.outputs.curse_versions_fabric }}"
+          project_id: "${{ steps.build.outputs.project_id }}"
+          release_type: release
+          token: "${{ secrets.CF_API_TOKEN }}"
+      - name: "Upload Forge to CurseForge"
+        uses: itsmeow/curseforge-upload@master
+        with:
+          changelog: "Changelog not added yet..."
+          display_name: "${{ steps.build.outputs.curse_title }} ${{ steps.build.outputs.version }} [Forge]"
+          file_path: "forge/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-forge.jar"
+          game_endpoint: minecraft
+          relations: "${{ steps.build.outputs.curse_relations_forge }}"
+          game_versions: "${{ steps.build.outputs.curse_versions_forge }}"
           project_id: "${{ steps.build.outputs.project_id }}"
           release_type: release
           token: "${{ secrets.CF_API_TOKEN }}"

.github/workflows/gradle.yml

@@ -16,7 +16,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - { uses: actions/checkout@v2, with: { fetch-depth: 0 } }
-      - { name: 'Set up JDK 16', uses: actions/setup-java@v2, with: { distribution: 'adopt', java-version: '16' } }
-      - { name: 'Build with Gradle', id: build, run: 'chmod +x gradlew && ./gradlew exportAlphaVersions build' }
+      - { name: 'Set up JDK 17', uses: actions/setup-java@v2, with: { distribution: 'adopt', java-version: '17' } }
+      - uses: burrunan/gradle-cache-action@v1
+        name: Build with Gradle
+        id: build
+        env:
+          USE_ALPHAS: true
+        with:
+          arguments: "setupGithubActions build"
+          gradle-version: "wrapper"
       - { name: 'Create a Release', id: create_release, uses: meeDamian/github-release@2.0, with: { token: '${{ secrets.GITHUB_TOKEN }}', tag: 'alpha-${{ steps.build.outputs.version }}', name: '${{ steps.build.outputs.modid }}-alpha-${{ steps.build.outputs.version }}', draft: false, prerelease: true, commitish: '${{ github.sha }}', files: 'fabric/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-fabric.jar forge/build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-forge.jar', gzip: false } }
       - { name: 'Push Changelog to Discord', id: changelog-webhook, uses: itsmeow/webhook-action@master, env: { WEBHOOK_URL: '${{ secrets.DISCORD_WEBHOOK_URL }}', data: '${{ steps.build.outputs.commitlog }}' } }

README.md

@@ -12,12 +12,6 @@ For planned features and development, join our [Discord](https://discord.bettera
 
 These are legally required statements regarding software used by the mod.
 
-### Cardinal Components API
-
-Better Animals Plus depends on and includes [Cardinal Components API](https://github.com/OnyxStudios/Cardinal-Components-API), a modular data component API, which is licensed under the [MIT License](https://github.com/OnyxStudios/Cardinal-Components-API/blob/master/LICENSE.md).
-
-Cardinal Components API is Copyright OnyxStudios.
-
 ### IMDLib
 
 Better Animals Plus depends on and includes [IMDLib](https://github.com/itsmeow/IMDLib), an entity management and configuration library, which is licensed under the [MIT License](https://github.com/itsmeow/IMDLib/blob/1.16/LICENSE).

build.gradle

@@ -1,125 +1,16 @@
-// BEFORE SYNCING, YOU MUST GO TO Settings -> Build, Execution, Deployment -> Build Tools -> Gradle and change "Gradle JVM" to Java 11 or higher
 plugins {
     id "architectury-plugin" version "$architectury_plugin_version"
     id "dev.architectury.loom" version "$loom_version" apply false
-    id "org.ajoberstar.grgit" version "3.1.1"
 }
-
-architectury {
-    minecraft = rootProject.mc_version
-}
-
 subprojects {
     apply plugin: "dev.architectury.loom"
-    loom {
-        silentMojangMappingsLicense()
-    }
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.mc_version}"
-        mappings loom.officialMojangMappings()
-    }
 }
-
 allprojects {
-    apply plugin: "java"
     apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
-    archivesBaseName = rootProject.mod_id
-    version = rootProject.mc_version+ "-" + rootProject.mod_version
-    group = rootProject.maven_group
     tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            options.release = targetVersion
-        }
-    }
-    repositories {
-        maven {
-            name = "itsmeowdev Maven"
-            url = "https://maven.itsmeow.dev/"
-        }
-    }
-    java {
-        withSourcesJar()
-    }
-    processResources {
-        doLast {
-            def jsonMinifyStart = System.currentTimeMillis()
-            def jsonMinified = 0
-            def jsonBytesSaved = 0
-            fileTree(dir: outputs.files.asPath, include: '**/*.json').each {
-                File file = it
-                jsonMinified++
-                def oldLength = file.length()
-                file.text = groovy.json.JsonOutput.toJson(new groovy.json.JsonSlurper().parse(file))
-                jsonBytesSaved += oldLength - file.length()
-            }
-            println('Minified ' + jsonMinified + ' json files. Saved ' + jsonBytesSaved + ' bytes. Took ' + (System.currentTimeMillis() - jsonMinifyStart) + 'ms.')
-        }
-    }
-    publishing {
-        repositories {
-            maven {
-                if ((System.getenv("MAVEN_USER") != '') && (System.getenv("MAVEN_PASSWORD") != '')) {
-                    credentials {
-                        username System.getenv("MAVEN_USER")
-                        password System.getenv("MAVEN_PASSWORD")
-                    }
-                }
-                if (System.getenv("MAVEN_URL") != '') {
-                    url System.getenv("MAVEN_URL")
-                } else {
-                    url "file:///${project.buildDir}/repo"
-                }
-            }
-        }
+        options.release = 8
+        options.compilerArgs << "-Xmaxerrs" << "2000"
     }
 }
-
-task exportAlphaVersions() {
-    def getVersion = {
-        //TAG-offset-hash
-        def raw = grgit.describe(longDescr: true, tags: true, match: ["${rootProject.mc_version}-[0-9].[0-9].[0-9]", "${rootProject.mc_version}-[0-9][0-9].[0-9][0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9][0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9][0-9].[0-9]", "${rootProject.mc_version}-[0-9][0-9].[0-9].[0-9]"])
-        def desc = (raw == null ? '0.0-0-unknown' : grgit.describe(longDescr: true, tags: true, match: ["${rootProject.mc_version}-[0-9].[0-9].[0-9]", "${rootProject.mc_version}-[0-9][0-9].[0-9][0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9][0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9].[0-9][0-9]", "${rootProject.mc_version}-[0-9].[0-9][0-9].[0-9]", "${rootProject.mc_version}-[0-9][0-9].[0-9].[0-9]"])).split('-') as List
-        def hash = desc.remove(desc.size() - 1)
-        def offset = desc.remove(desc.size() - 1)
-        def tag = desc.join('-')
-        return "${tag}.${offset}".toString().replace("${rootProject.mc_version}-", "") //Bake the response instead of making it dynamic
-    }
-    rootProject.mod_version = getVersion();
-    allprojects {
-        version = rootProject.mc_version + '-' + getVersion();
-    }
-    def getLastTag = {
-        def raw = grgit.describe(longDescr: true, tags: true)
-        if(raw == null) {
-            return "HEAD"
-        } else {
-            List desc = raw.split('-') as List
-            if(desc.size() > 1) {
-                desc.remove(desc.size() - 1)
-            }
-            if(desc.size() > 1) {
-                desc.remove(desc.size() - 1)
-            }
-            return desc.join('-');
-        }
-    }
-    def rawLog = grgit.log(includes: ['HEAD'], excludes: [getLastTag()]);
-    def log = "";
-    for (org.ajoberstar.grgit.Commit commit: rawLog) {
-        log = log + "[`" + commit.abbreviatedId + "`](https://github.com/${rootProject.github}/commit/" + commit.id + ") " + commit.shortMessage + " - " + commit.author.name + "\\n";
-    }
-    doLast {
-        exec {
-            commandLine "echo", "##[set-output name=modid;]${rootProject.mod_id}";
-        }
-        exec {
-            commandLine "echo", "##[set-output name=version;]${rootProject.version}";
-        }
-        exec {
-            commandLine "echo", "##[set-output name=commitlog;]" + "{\"content\":\"" + (project.hasProperty('hook_content') ? project.hook_content : "") + "\",\"embeds\":[{\"author\":{\"name\":\"itsmeow\",\"url\":\"https://itsmeow.dev/\",\"icon_url\":\"https://itsmeow.dev/icon.png\"},\"title\":\"${project.mod_id}-alpha-${project.version}\",\"url\":\"https://github.com/${project.github}/releases/tag/alpha-${project.version}\",\"color\":14700288,\"description\":\"" + log + "\"}]}";
-        }
-    }
-}
+apply from: 'https://maven.itsmeow.dev/scripts/architectury-base.gradle'
+apply from: 'https://maven.itsmeow.dev/scripts/architectury-alphas.gradle'