feat: support fabric 1.20.4

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   java
-  id("dev.architectury.loom") version "1.0-SNAPSHOT" apply false
+  id("dev.architectury.loom") version "1.3-SNAPSHOT" apply false
   id("architectury-plugin") version "3.4-SNAPSHOT"
 
   id("org.jetbrains.kotlin.jvm") version ("1.6.0")

build.sh

@@ -1,16 +1,18 @@
 build-fabric(){
   ./gradlew clean :fabric-1_16:remapJar
-  mv fabric-1_16/build/libs/*.jar packages/fabric-1_16.jar
+  mv fabric-1_16/build/libs/*.jar packages/mesagisto-fabric-1_16.jar
   ./gradlew clean :fabric-1_17:remapJar
-  mv fabric-1_17/build/libs/*.jar packages/fabric-1_17.jar
+  mv fabric-1_17/build/libs/*.jar packages/mesagisto-fabric-1_17.jar
   ./gradlew clean :fabric-1_18:remapJar
-  mv fabric-1_18/build/libs/*.jar packages/fabric-1_18.jar
+  mv fabric-1_18/build/libs/*.jar packages/mesagisto-fabric-1_18.jar
   ./gradlew clean :fabric-1_19:remapJar
-  mv fabric-1_19/build/libs/*.jar packages/fabric-1_19.jar
+  mv fabric-1_19/build/libs/*.jar packages/mesagisto-fabric-1_19.jar
+  ./gradlew clean :fabric-1_20:remapJar
+  mv fabric-1_20/build/libs/*.jar packages/mesagisto-fabric-1_20.jar
 }
 build-forge(){
   ./gradlew clean :forge-1_18:remapJar
-  mv forge-1_18/build/libs/*.jar packages/forge-1_18.jar
+  mv forge-1_18/build/libs/*.jar packages/mesagisto-forge-1_18.jar
 }
 build(){
   rm -rf packages

fabric-1_20/build.gradle.kts

@@ -0,0 +1,69 @@
+import io.itsusinn.pkg.pkgIn
+import net.fabricmc.loom.api.LoomGradleExtensionAPI
+
+repositories {
+  mavenCentral()
+  mavenLocal()
+  maven("https://maven.fabricmc.net/")
+}
+
+plugins {
+  java
+  id("dev.architectury.loom")
+  id("architectury-plugin")
+
+  id("org.jetbrains.kotlin.jvm")
+  id("com.github.johnrengelman.shadow")
+  id("io.itsusinn.pkg")
+}
+architectury {
+  minecraft = "1.20.4"
+  platformSetupLoomIde()
+  fabric()
+}
+loom {
+  fabricApi { }
+}
+pkg {
+  excludePath("mappings/*")
+  excludePath("META-INF/*.kotlin_module")
+  excludePath("META-INF/versions/*")
+  excludePath("META-INF/proguard/*")
+  excludePath("META-INF/maven/*")
+  excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
+  excludePath("org/slf4j/*")
+  excludePath("org/jetbrains/annotations/*")
+  excludePath("org/intellij/lang/annotations/*")
+  excludePath("kotlin/*")
+  excludePath("kotlinx/*")
+  listOf("asn1", "jcajce", "jce", "pqc", "x509", "math", "i18n", "iana", "internal").forEach {
+    excludePath("org/bouncycastle/$it/*")
+  }
+
+  val task = tasks.remapJar.get()
+  task.dependsOn("pkg")
+  shadowJar {
+    task.inputFile.set(this.archiveFile)
+  }
+}
+
+tasks {
+  processResources {
+    inputs.property("version", project.version)
+    filesMatching("fabric.mod.json") {
+      expand(mutableMapOf("version" to project.version))
+    }
+  }
+}
+
+dependencies {
+  modImplementation("net.fabricmc:fabric-loader:0.15.3")
+  modImplementation("net.fabricmc.fabric-api:fabric-api:0.93.1+1.20.4")
+
+  minecraft("com.mojang:minecraft:1.20.4")
+  mappings("net.fabricmc:yarn:1.20.4+build.3:v2")
+
+  pkgIn(project(":common"))
+  pkgIn("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
+}

fabric-1_20/gradle.properties

@@ -0,0 +1 @@
+loom.platform=fabric

fabric-1_20/src/main/java/org/mesagisto/fabric/ModAdapter.kt

@@ -0,0 +1,36 @@
+package org.mesagisto.fabric
+
+import net.fabricmc.api.ModInitializer
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
+import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.Text
+import org.apache.logging.log4j.LogManager
+import org.apache.logging.log4j.Logger
+import org.mesagisto.fabric.impl.ChatImpl
+import org.mesagisto.mcmod.ModEntry
+import java.util.concurrent.CompletableFuture
+
+val logger: Logger = LogManager.getLogger("mesagisto")
+
+class ModAdapter : ModInitializer {
+  private lateinit var server: MinecraftServer
+  override fun onInitialize() {
+    ServerLifecycleEvents.SERVER_STARTED.register {
+      server = it
+      ChatImpl.server = it
+      ModEntry.onEnable()
+    }
+    ServerMessageDecoratorEvent.EVENT.register(
+      ServerMessageDecoratorEvent.CONTENT_PHASE
+    ) { player: ServerPlayerEntity?, component: Text ->
+      if (player == null) return@register component
+      ChatImpl.deliverChatEvent(player, component)
+      component
+    }
+    ServerLifecycleEvents.SERVER_STOPPING.register {
+      ModEntry.onDisable()
+    }
+  }
+}

fabric-1_20/src/main/java/org/mesagisto/fabric/impl/ChatImpl.kt

@@ -0,0 +1,26 @@
+package org.mesagisto.fabric.impl
+
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.Text
+import org.mesagisto.mcmod.api.ChatHandler
+import org.mesagisto.mcmod.api.IChat
+
+class IChatImpl : IChat by ChatImpl
+
+object ChatImpl : IChat {
+  lateinit var server: MinecraftServer
+  private val handlers: MutableList<ChatHandler> = arrayListOf()
+
+  fun deliverChatEvent(player: ServerPlayerEntity, content: Text) {
+    handlers.forEach {
+      it.handle(player.name.string, content.string)
+    }
+  }
+  override fun broadcastMessage(message: String) {
+    server.playerManager.broadcast(Text.literal(message), false)
+  }
+  override fun registerChatHandler(callback: ChatHandler) {
+    handlers.add(callback)
+  }
+}

fabric-1_20/src/main/java/org/mesagisto/fabric/impl/CompatImpl.kt

@@ -0,0 +1,11 @@
+package org.mesagisto.fabric.impl
+
+import org.mesagisto.fabric.logger
+import org.mesagisto.mcmod.api.ICompat
+import org.mesagisto.mcmod.api.Log4jLogger
+
+class ICompatImpl : ICompat by CompatImpl
+
+object CompatImpl : ICompat {
+  override fun getLogger(): Log4jLogger = logger
+}

fabric-1_20/src/main/resources/META-INF/services/org.mesagisto.mcmod.api.IChat

@@ -0,0 +1 @@
+org.mesagisto.fabric.impl.IChatImpl

fabric-1_20/src/main/resources/META-INF/services/org.mesagisto.mcmod.api.ICompat

@@ -0,0 +1 @@
+org.mesagisto.fabric.impl.ICompatImpl

fabric-1_20/src/main/resources/fabric.mod.json

@@ -0,0 +1,27 @@
+{
+  "schemaVersion": 1,
+  "id": "mesagisto",
+  "version": "${version}",
+
+  "name": "Mesagisto Mod",
+  "description": "Mesagisto: A message forwarding program connecting different instant-message platforms. 信使: 一款连接不同即时通讯平台的消息转发程序.",
+  "authors": [
+    "Itsusinn"
+  ],
+  "contact": {
+    "homepage": "https://github.com/MeowCat-Studio/mesagisto",
+    "sources": "https://github.com/MeowCat-Studio/fabric-message-source"
+  },
+  "environment": "*",
+  "license": "LGPLv3",
+  "entrypoints": {
+    "main": [
+      "org.mesagisto.fabric.ModAdapter"
+    ]
+  },
+  "depends": {
+    "fabricloader": ">=0.12.2",
+    "fabric": "*",
+    "minecraft": "1.20.*"
+  }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,10 +1,9 @@
 rootProject.name = "mcmod-message-source"
 pluginManagement {
   repositories {
-    maven("https://maven.fabricmc.net/") {
-      name = "Fabric"
-    }
+    maven("https://maven.fabricmc.net/")
     maven("https://maven.architectury.dev/")
+    maven("https://maven.minecraftforge.net/")
     maven("https://files.minecraftforge.net/maven/")
     gradlePluginPortal()
     mavenLocal()
@@ -14,4 +13,5 @@ pluginManagement {
 include("common")
 include("fabric-1_16", "fabric-1_17")
 include("fabric-1_18", "fabric-1_19")
-include("forge-1_18")
+include("fabric-1_20")
+//include("forge-1_18")