Update 1.16.5

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
       - '**/src/**'
       - '.github/**'
     branches:
-      - 1605
+      - 1605-fabric
 
 jobs:
   build:
@@ -26,7 +26,7 @@ jobs:
       - name: Grant execute permission for gradle
         run: chmod +x gradlew
 
-      - name: Upload to CurseForge
+      - name: Upload to CurseForge & Modrinth
         run: ./gradlew publish modPublish --stacktrace
         if: |
           !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]')

build.gradle

@@ -1,78 +1,110 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id 'fabric-loom' version '1.0-SNAPSHOT'
     id "me.shedaniel.unified-publishing" version "0.1.+"
-
     id "com.github.breadmoirai.github-release" version "2.4.1"
 }
 
-architectury {
-    minecraft = rootProject.minecraft_version
-}
+def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv('GITHUB_RUN_NUMBER'))
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version + "." + runNumber
+group = project.maven_group
 
-subprojects {
-    apply plugin: "dev.architectury.loom"
 
-    loom {
-        silentMojangMappingsLicense()
+repositories {
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
+    maven {
+        url = "https://maven.parchmentmc.org"
+    }
+    maven {
+        url = "https://maven.kosmx.dev"
+    }
+    maven {
+        url = "https://maven.maxhenkel.de/repository/public"
+    }
+    maven {
+        url = "https://api.modrinth.com/maven"
     }
+}
 
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings loom.officialMojangMappings()
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.16.5+build.10:v2"
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.layered() {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-1.16.5:2022.03.06@zip")
     }
+
+    modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+    modImplementation "de.maxhenkel.voicechat:voicechat-api:${project.voicechat_api}"
+    modImplementation "maven.modrinth:simple-voice-chat:fabric-${project.voicechat}"
+
+    modImplementation "io.github.kosmx.emotes:emotesMain:${project.emotecraft}"
+    modImplementation "dev.kosmx.player-anim:player-animation-lib-fabric:${project.player_animation_lib}"
+    modImplementation "maven.modrinth:emotecraft:${project.emotecraft}+${project.minecraft_version}-fabric"
+
 }
 
-allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+processResources {
+    inputs.property "version", project.version
+    filteringCharset "UTF-8"
 
-    def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv('GITHUB_RUN_NUMBER'))
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
 
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version + "." + runNumber
-    group = rootProject.maven_group
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+    options.release = 17
+}
 
 
-    repositories {
-        // Add repositories to retrieve artifacts from in here.
-        // You should only use this when depending on other mods because
-        // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-        // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-        // for more information about repositories.
-        maven {
-            url = "https://maven.parchmentmc.org"
-        }
-        maven {
-            url = "https://maven.kosmx.dev"
-        }
-        maven {
-            url = "https://maven.maxhenkel.de/repository/public"
-        }
-        maven {
-            url = "https://api.modrinth.com/maven"
-        }
+jar {
+    from("LICENSE") {
+        rename { "${it}_${archivesBaseName}+${version}" }
     }
+}
+
+unifiedPublishing {
+    project {
+        displayName = "[Fabric $project.minecraft_version] v$project.version"
+        releaseType = "release"
+        gameVersions = ["1.16.5"]
+        gameLoaders = ["fabric"]
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
+        mainPublication remapJar
 
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            options.release = targetVersion
+        relations {
+            depends {
+                curseforge = modrinth = "emotecraft"
+            }
+            depends {
+                curseforge = modrinth = "simple-voice-chat"
+            }
         }
-    }
 
-    java {
-        withSourcesJar()
+        if (project.hasProperty("curse_api_key") || System.getenv("curse_api_key") != null) {
+            curseforge {
+                token = project.hasProperty("curse_api_key") ? project.property("curse_api_key") : System.getenv("curse_api_key")
+                id = project.curseforge_id
+                gameVersions.addAll "Java 8"
+            }
+        }
+
+        if (project.hasProperty("modrinth_key") || System.getenv("modrinth_key") != null) {
+            modrinth {
+                token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
+                id = project.modrinth_id
+                version = "$project.version+fabric"
+            }
+        }
     }
 }
 
-task modPublish
+task modPublish