一些修复和清理 (#1)

* 项目整理 GitHub工作流构建 中文翻译 gradle仿VMTU优化并消除警告 提取gradle依赖版本 排序import

* 修复fabric错误依赖无法启动 修复语言条目丢失

* 升级gradle

Author: Wulian233

.github/workflows/build.yml

@@ -0,0 +1,42 @@
+name: Build
+
+on: [ pull_request, push, workflow_dispatch ]
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            .gradle
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
+
+      - name: Build with Gradle
+        run: |
+          chmod +x gradlew
+          ./gradlew build
+
+      - name: Upload fabric artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fabric-artifacts
+          path: ${{ github.workspace }}/fabric/build/libs
+
+      - name: Upload neoforge artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: neoforge-artifacts
+          path: ${{ github.workspace }}/neoforge/build/libs

build.gradle

@@ -1,36 +1,33 @@
 plugins {
     id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
     id 'architectury-plugin' version '3.4-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.gradleup.shadow' version '9.+' apply false
 }
 
 architectury {
     minecraft = project.minecraft_version
 }
 
 allprojects {
+    apply plugin: 'architectury-plugin'
+
     group = rootProject.maven_group
     version = rootProject.mod_version
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = "UTF-8"
+        options.release = 21
+    }
 }
 
 subprojects {
     apply plugin: 'dev.architectury.loom'
-    apply plugin: 'architectury-plugin'
-    apply plugin: 'maven-publish'
+    apply plugin: "com.gradleup.shadow"
 
     base {
-        // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
         archivesName = "$rootProject.archives_name-$project.name"
     }
 
-    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.
-    }
-
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
         mappings loom.layered {
@@ -40,34 +37,9 @@ subprojects {
     }
 
     java {
-        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-        // if it is present.
-        // If you remove this line, sources will not be generated.
         withSourcesJar()
 
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-
-    tasks.withType(JavaCompile).configureEach {
-        it.options.release = 21
-    }
-
-    // Configure Maven publishing.
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                artifactId = base.archivesName.get()
-                from components.java
-            }
-        }
-
-        // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-        repositories {
-            // Add repositories to publish to here.
-            // Notice: This block does NOT have the same function as the block in the top level.
-            // The repositories here will be used for publishing your artifact, not for
-            // retrieving dependencies.
-        }
-    }
 }

common/build.gradle

@@ -8,5 +8,5 @@ dependencies {
     // Do NOT use other classes from Fabric Loader.
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
-    modImplementation "me.shedaniel.cloth:cloth-config:17.0.144"
+    modImplementation "me.shedaniel.cloth:cloth-config:${rootProject.clothconfig_version}"
 }

common/src/main/java/org/localizedmc/sublangview/helper/TranslationHelper.java

@@ -6,7 +6,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
-import net.minecraft.util.Formatting;
 
 public class TranslationHelper {
     public static TranslationStorage subTranslationStorage;

common/src/main/resources/assets/sublangview/lang/en_us.json

@@ -4,6 +4,7 @@
   "gui.sublangview.namespace": "Namespace: %s",
   "text.autoconfig.sublangview.title": "SubLangView Config",
   "text.autoconfig.sublangview.option.subLanguageCode": "Sub-language Code",
+  "text.autoconfig.sublangview.option.textColor": "Text Color",
   "text.autoconfig.sublangview.option.itemTooltipDisplayMode": "Tooltip Display Mode",
   "config.sublangview.option.original": "Original Text",
   "config.sublangview.option.translation_key": "Translation Key",

common/src/main/resources/assets/sublangview/lang/zh_cn.json

@@ -0,0 +1,29 @@
+{
+  "gui.sublangview.original": "原文(%s)：%s",
+  "gui.sublangview.translation_key": "翻译键：%s",
+  "gui.sublangview.namespace": "命名空间：%s",
+  "text.autoconfig.sublangview.title": "副语言视图配置",
+  "text.autoconfig.sublangview.option.subLanguageCode": "副语言语言代码",
+  "text.autoconfig.sublangview.option.textColor": "文本颜色",
+  "text.autoconfig.sublangview.option.itemTooltipDisplayMode": "工具提示显示模式",
+  "config.sublangview.option.original": "原文",
+  "config.sublangview.option.translation_key": "翻译键",
+  "config.sublangview.option.all": "全部",
+  "config.sublangview.option.off": "关闭",
+  "config.sublangview.option.color_white": "白色",
+  "config.sublangview.option.color_black": "黑色",
+  "config.sublangview.option.color_yellow": "黄色",
+  "config.sublangview.option.color_gold": "金色",
+  "config.sublangview.option.color_gray": "灰色",
+  "config.sublangview.option.color_dark_gray": "深灰色",
+  "config.sublangview.option.color_blue": "蓝色",
+  "config.sublangview.option.color_dark_blue": "深蓝色",
+  "config.sublangview.option.color_green": "绿色",
+  "config.sublangview.option.color_dark_green": "深绿色",
+  "config.sublangview.option.color_aqua": "水色",
+  "config.sublangview.option.color_dark_aqua": "深水色",
+  "config.sublangview.option.color_red": "红色",
+  "config.sublangview.option.color_dark_red": "深红色",
+  "config.sublangview.option.color_light_purple": "淡紫色",
+  "config.sublangview.option.color_dark_purple": "深紫色"
+}

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 architectury {
@@ -37,10 +37,8 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
-    modImplementation "com.terraformersmc:modmenu:13.0.3"
-    modImplementation "me.shedaniel.cloth:cloth-config-fabric:17.0.144"
-
-    modImplementation("maven.modrinth:sublanguage:1.2-SNAPSHOT")
+    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { transitive false }
+    modImplementation "me.shedaniel.cloth:cloth-config-fabric:${rootProject.clothconfig_version}"
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
@@ -60,5 +58,7 @@ shadowJar {
 }
 
 remapJar {
-    input.set shadowJar.archiveFile
+    inputFile.set shadowJar.archiveFile
+    dependsOn shadowJar
+    archiveClassifier.set(null)
 }

fabric/src/main/resources/fabric.mod.json

@@ -5,7 +5,7 @@
   "name": "SubLangView",
   "description": "",
   "authors": [
-    "LocalizedMC, TexTrue"
+    "TexTrue, Wulian233"
   ],
   "contact": {
     "sources": "https://github.com/LocalizedMC/SubLangView"
@@ -25,9 +25,7 @@
     "sublangview.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.12",
-    "minecraft": "~1.21.4",
-    "java": ">=21",
+    "minecraft": ">=1.21.4",
     "fabric-api": "*"
   }
 }

gradle.properties

@@ -1,16 +1,22 @@
 # Done to increase the memory available to Gradle.
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
+
 # Mod properties
-mod_version=1.0-SNAPSHOT
+mod_version=1.0
 maven_group=org.localizedmc.sublangview
 archives_name=sublangview
 enabled_platforms=fabric,neoforge
+
 # Minecraft properties
 minecraft_version=1.21.4
 yarn_mappings = 1.21.4+build.8
+yarn_mappings_patch_neoforge_version=1.21+build.4
+
 # Dependencies
-fabric_loader_version=0.16.12
-fabric_api_version=0.119.2+1.21.4
-neoforge_version=21.4.124
-yarn_mappings_patch_neoforge_version = 1.21+build.4
+fabric_loader_version=0.17.2
+fabric_api_version=0.119.4+1.21.4
+neoforge_version=21.4.151
+
+clothconfig_version=17.0.144
+modmenu_version=13.0.3