Merge 1.5.7 1.19.4 (#250)

Author: SiongSng

.github/workflows/release.yml

@@ -101,4 +101,4 @@ jobs:
           dependencies: |
             kotlin-for-forge
             cloth-config
-            architectury-api
+            architectury-api

.gitignore

@@ -5,8 +5,8 @@ common/build
 /*/build/
 build/
 
-/fabric/src/main/resources/rpmtw_platform_mod.accesswidener
-/quilt/src/main/resources/rpmtw_platform_mod.accesswidener
+fabric/src/generated/resources/rpmtw_platform_mod.accesswidener
+quilt/src/generated/resources/rpmtw_platform_mod.accesswidener
 
 .architectury-transformer/
 .idea

README.md

@@ -3,17 +3,17 @@
 # RPMTW Platform Mod
 
 [![](https://img.shields.io/github/license/RPMTW/RPMTW-Platform-Mod.svg)](LICENSE)
-[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](https://github.com/RPMTW/RPMTW-Platform-Mod/releases)
-![](http://cf.way2muchnoise.eu/versions/minecraft_rpmtw-update-mod_all.svg)
-[![](http://cf.way2muchnoise.eu/rpmtw-update-mod.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-update-mod)
+[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](../../releases)
+![](https://cf.way2muchnoise.eu/versions/rpmtw-platform.svg)
+[![](https://cf.way2muchnoise.eu/rpmtw-platform.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-platform)
 [![](https://img.shields.io/modrinth/dt/ZukQzaRP?label=Modrinth%20Downloads)](https://modrinth.com/mod/ZukQzaRP)
 <p>&nbsp;</p> 
 
 #### 🌐 README Languages
 
 - English (Current Language)
-- [繁體中文](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README/zh_tw.md)
-- [简体中文](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README/zh_cn.md)
+- [繁體中文](README/zh_tw.md)
+- [简体中文](README/zh_cn.md)
 
 ## 📚 Introduction
 

README/zh_cn.md

@@ -2,23 +2,23 @@
 
 # RPMTW 平台
 
-[![](https://img.shields.io/github/license/RPMTW/RPMTW-Platform-Mod.svg)](LICENSE)
-[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](https://github.com/RPMTW/RPMTW-Platform-Mod/releases)
-![](http://cf.way2muchnoise.eu/versions/minecraft_rpmtw-update-mod_all.svg)
-[![](http://cf.way2muchnoise.eu/rpmtw-update-mod.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-update-mod)
+[![](https://img.shields.io/github/license/RPMTW/RPMTW-Platform-Mod.svg)](../LICENSE)
+[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](../../../releases)
+![](https://cf.way2muchnoise.eu/versions/rpmtw-platform.svg)
+[![](https://cf.way2muchnoise.eu/rpmtw-platform.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-update-mod)
 [![](https://img.shields.io/modrinth/dt/ZukQzaRP?label=Modrinth%20Downloads)](https://modrinth.com/mod/ZukQzaRP)
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 
 #### 🌐 自叙文件语言
 
-- [English](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README.md)
-- [繁體中文](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README/zh_tw.md)
-- 简体中文 (当前语言)
+- [English](../../README.md)
+- [繁體中文](zh_tw.md)
+- 简体中文（当前语言）
 
 ## 📚 介绍
 
-整合了RPMTW各项服务的MOD，涵盖翻译、百科、宇宙通信、中文输入优化等功能，让 Minecraft 中文玩家获得更好的游戏体验。
+整合了 RPMTW 各项服务的 MOD，涵盖翻译、百科、宇宙通信、中文输入优化等功能，让 Minecraft 中文玩家获得更好的游戏体验。
 
 ## 🎨 特色功能
 
@@ -41,7 +41,7 @@
 
 - ### 机器翻译
 
-遇到没人工翻译的内容吗？全部交给 AI 吧！不再被语言隔阂导致无法游玩MOD。
+遇到没人工翻译的内容吗？全部交给 AI 吧！不再被语言隔阂导致无法游玩 MOD。
 
 - ### 开启 Crowdin 页面
 
@@ -73,4 +73,4 @@
 
 ## 🎓 许可证
 
-[GNU 通用公共许可证 3.0 版 (GPL3)](https://www.gnu.org/licenses/gpl-3.0.html)
+[GNU 通用公共许可证 3.0 版（GPL3）](https://www.gnu.org/licenses/gpl-3.0.html)

README/zh_tw.md

@@ -2,23 +2,23 @@
 
 # RPMTW 平台
 
-[![](https://img.shields.io/github/license/RPMTW/RPMTW-Platform-Mod.svg)](LICENSE)
-[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](https://github.com/RPMTW/RPMTW-Platform-Mod/releases)
-![](http://cf.way2muchnoise.eu/versions/minecraft_rpmtw-update-mod_all.svg)
-[![](http://cf.way2muchnoise.eu/rpmtw-update-mod.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-update-mod)
+[![](https://img.shields.io/github/license/RPMTW/RPMTW-Platform-Mod.svg)](../LICENSE)
+[![](https://img.shields.io/github/release/RPMTW/RPMTW-Platform-Mod.svg)](../../../releases)
+![](https://cf.way2muchnoise.eu/versions/rpmtw-platform.svg)
+[![](https://cf.way2muchnoise.eu/rpmtw-platform.svg)](https://www.curseforge.com/minecraft/mc-mods/rpmtw-update-mod)
 [![](https://img.shields.io/modrinth/dt/ZukQzaRP?label=Modrinth%20Downloads)](https://modrinth.com/mod/ZukQzaRP)
 <p></p>
 <p>&nbsp;</p>
 
 #### 🌐 說明檔案語言
 
-- [English](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README.md)
-- 繁體中文 (目前語言)
-- [简体中文](https://github.com/RPMTW/RPMTW-Platform-Mod/blob/main/README/zh_cn.md)
+- [English](../README.md)
+- 繁體中文（目前語言）
+- [简体中文](zh_cn.md)
 
 ## 📚 介紹
 
-整合了RPMTW各項服務的模組，涵蓋翻譯、百科、宇宙通訊、中文輸入優化等功能，讓 Minecraft 中文玩家獲得更好的遊戲體驗。
+整合了 RPMTW 各項服務的模組，涵蓋翻譯、百科、宇宙通訊、中文輸入優化等功能，讓 Minecraft 中文玩家獲得更好的遊戲體驗。
 
 ## 🎨 特色功能
 
@@ -64,7 +64,7 @@
 
 ### ️ 使用的技術
 
-- [Kotlin](https://kotlinlang.org/)
+- [Kotlin](https://kotlinlang.org)
 - Java
 - JVM
 - [Architectury](https://github.com/architectury)
@@ -73,4 +73,4 @@
 
 ## 🎓 授權條款
 
-[GNU 通用公眾授權條款 3.0 版 (GPL3)](https://www.gnu.org/licenses/gpl-3.0.html)
+[GNU 通用公眾授權條款 3.0 版（GPL3）](https://www.gnu.org/licenses/gpl-3.0.html)

build.gradle.kts

@@ -6,8 +6,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     base
     id("org.jetbrains.kotlin.jvm") version "1.8.21"
-    id("architectury-plugin") version "3.4.143"
-    id("dev.architectury.loom") version "1.0.+" apply false
+    id("architectury-plugin") version "3.4.146"
+    id("dev.architectury.loom") version "1.2.+" apply false
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 

common/build.gradle.kts

@@ -5,11 +5,14 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi("dev.architectury:architectury:${project.property("architectury_version").toString()}")
     modApi("me.shedaniel.cloth:cloth-config:${project.property("cloth_config_version").toString()}")
-    modApi(
+    implementation(
         group = "com.github.RPMTW",
         name = "RPMTW-API-Client-Kotlin",
         version = project.property("rpmtw_api_client_version").toString()
     )
+    implementation("com.github.kittinunf.fuel:fuel:2.3.1")
+    implementation("com.github.kittinunf.fuel:fuel-gson:2.3.1")
+    implementation("com.github.kittinunf.fuel:fuel-coroutines:2.3.1")
     modApi(group = "io.sentry", name = "sentry", version = project.property("sentry_version").toString())
 }
 

common/src/main/kotlin/com/rpmtw/rpmtw_platform_mod/gui/widgets/RPMTWCheckbox.kt

@@ -2,7 +2,9 @@ package com.rpmtw.rpmtw_platform_mod.gui.widgets
 
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.ComponentPath
 import net.minecraft.client.gui.components.Checkbox
+import net.minecraft.client.gui.navigation.FocusNavigationEvent
 import net.minecraft.network.chat.Component
 
 class RPMTWCheckbox(
@@ -40,4 +42,13 @@ class RPMTWCheckbox(
             client.screen?.renderTooltip(matrices, Component.literal(tooltip), mouseX, mouseY)
         }
     }
+
+    override fun nextFocusPath(focusNavigationEvent: FocusNavigationEvent): ComponentPath? {
+        // To prevent the user from being unable to execute the previous commands, disable arrow navigation for this button.
+        if (focusNavigationEvent is FocusNavigationEvent.ArrowNavigation) {
+            return null
+        }
+
+        return super.nextFocusPath(focusNavigationEvent)
+    }
 }

common/src/main/kotlin/com/rpmtw/rpmtw_platform_mod/gui/widgets/TranslucentButton.kt

@@ -2,7 +2,9 @@ package com.rpmtw.rpmtw_platform_mod.gui.widgets
 
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.ComponentPath
 import net.minecraft.client.gui.components.Button
+import net.minecraft.client.gui.navigation.FocusNavigationEvent
 import net.minecraft.network.chat.Component
 
 class TranslucentButton(
@@ -27,4 +29,13 @@ class TranslucentButton(
             )
         }
     }
+
+    override fun nextFocusPath(focusNavigationEvent: FocusNavigationEvent): ComponentPath? {
+        // To prevent the user from being unable to execute the previous commands, disable arrow navigation for this button.
+        if (focusNavigationEvent is FocusNavigationEvent.ArrowNavigation) {
+            return null
+        }
+
+        return super.nextFocusPath(focusNavigationEvent)
+    }
 }

fabric-like/build.gradle.kts

@@ -2,17 +2,6 @@ architectury {
     common(project.property("enabled_platforms").toString().split(","))
 }
 
-val common by configurations.registering
-configurations {
-    compileClasspath {
-        extendsFrom(common.get())
-    }
-
-    runtimeClasspath {
-        extendsFrom(common.get())
-    }
-}
-
 repositories {
     mavenCentral()
     maven {
@@ -34,11 +23,10 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi("dev.architectury:architectury-fabric:${project.property("architectury_version")}")
 
-// Patchouli currently doesn't support Minecraft 1.19.4
-//    modImplementation("vazkii.patchouli:Patchouli:${project.property("patchouli_version")}-FABRIC")
+    modImplementation("vazkii.patchouli:Patchouli:${project.property("patchouli_version")}-FABRIC")
     modImplementation("com.terraformersmc:modmenu:${project.property("modmenu_version")}")
 
-    "compileClasspath"(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
 }
 
 val accessWidenerFile = project(":common").file("src/main/resources/rpmtw_platform_mod.accesswidener")