GPU加速分支合入：围棋MCTS性能优化、棋类引擎修复与全项目无头压测回归

.github/workflows/build.yml

@@ -0,0 +1,53 @@
+name: Build & Verify
+
+on:
+  push:
+    branches: [ main, gpu-accel ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - name: Setup Gradle cache
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Check whitespace
+        run: |
+          if git rev-parse HEAD^ >/dev/null 2>&1; then
+            git diff --check HEAD^..HEAD
+          else
+            git show --check --oneline HEAD
+          fi
+
+      - name: Compile and test
+        run: bash ./gradlew compileJava test --no-daemon --stacktrace
+
+      - name: Package jar
+        run: bash ./gradlew jar --no-daemon
+
+      - name: Verify jar contents
+        shell: bash
+        run: |
+          test -n "$(find build/libs -maxdepth 1 -type f -name '*.jar' -print -quit)"
+          ! jar tf build/libs/*.jar | grep -E '(^|/)(jna|jna-platform)-[^/]+\.jar$|^com/sun/jna/'
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: GameConsole-jar
+          path: build/libs/*.jar
+          retention-days: 14

.gitignore

@@ -1,40 +1,10 @@
-# MacOS DS_Store files
-.DS_Store
-
-# Gradle cache folder
-.gradle
-
-# Gradle build folder
-build
-
-# IntelliJ
-out/
-.idea
-*.iml
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# VS Code
+/.zcode/
+.gradle/
+.idea/
 .vscode/
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Common working directory
-run
-
-# Decompiled sources
-decompiled/
-
-# Build logs
-build_*.txt
-
-# Tools
-cfr.jar
-*.ps1
-
-# Root data folder (duplicate)
-/data/
-
-# 但保留 src/main/resources 下的真实资源（如合成配方），避免被上述规则误忽略
-!src/main/resources/data/
+build/
+run/
+logs/
+data/
+cuda/
+/.bench/

README.md

@@ -73,7 +73,7 @@
 ## 🚀 使用方法
 
 1. 确保已安装 [NeoForge](https://neoforged.net/) 1.21.1
-2. 将 `game_console-1.0.0.jar` 放入 `.minecraft/mods` 文件夹
+2. 将 `Game Console-1.0.0-NeoForge-1.21.1-beta5.jar` 放入 `.minecraft/mods` 文件夹
 3. 启动游戏，在创造模式物品栏「游戏机」分类中获取游戏机
 4. 右键使用游戏机即可打开游戏选择界面
 
@@ -95,7 +95,7 @@ cd game_console
 # 构建
 ./gradlew build
 
-# 产物位于 build/libs/game_console-1.0.0.jar
+# 产物位于 build/libs/Game Console-1.0.0-NeoForge-1.21.1-beta5.jar
 ```
 
 ## 📄 许可证

build.gradle

@@ -10,17 +10,18 @@ group = mod_group_id
 
 repositories {
     mavenLocal()
-    mavenCentral() // 供测试依赖（如 JUnit）下载
+    mavenCentral() // 供测试依赖（如 JUnit）与 JNA 下载
+    // 注：JogAmp 仓库已移除——项目从未使用 JOCL 绑定（OpenCL 走 JNA 直调，见 OpenCLBackend）
 }
 
 base {
     archivesName = mod_id
 }
 
-// 构建产物命名：Game Console-<version>-<Loader>-<MC版本>-beta2.jar
+// 构建产物命名：Game Console-<version>-<Loader>-<MC版本>-beta6.jar
 var loaderName = "NeoForge"
 tasks.named('jar') {
-    archiveBaseName = "${mod_name}-${mod_version}-${loaderName}-${minecraft_version}-beta2"
+    archiveBaseName = "${mod_name}-${mod_version}-${loaderName}-${minecraft_version}-beta6"
     archiveVersion = ''
     archiveClassifier = ''
 }
@@ -36,6 +37,8 @@ tasks.withType(Javadoc).configureEach {
 }
 tasks.withType(ProcessResources).configureEach {
     filteringCharset = 'UTF-8'
+    // ★ 优化：排除任何残留的空目录(如 data/game_console/recipes/)和占位文件
+    exclude '**/recipes/**', '**/.gitignore', '**/.gitkeep'
 }
 
 neoForge {
@@ -135,12 +138,55 @@ dependencies {
     // ─── 单元测试：JUnit 5 ───
     testImplementation platform('org.junit:junit-bom:5.10.2')
     testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.slf4j:slf4j-api:2.0.9'
+
+    // ─── OpenCL GPU 加速 ───
+    // JNA 通过 compileOnly 引入（编译期可见），运行时由玩家环境的 classloader 解析
+    // —— 不再 jarJar 嵌入。原因：Java 22 模块系统下，自嵌入的 jna jar 会形成
+    //   "com.sun.jna" 自动模块，与其他 mod（如 Iris/Sodium 或 NeoForge 间接带）
+    //   提供的 jna 形成两个同名模块冲突，触发 ResolutionException。
+    // 缺 JNA 时由 OpenCLBackend.canExecute() 检测并 catch(Throwable) 回退到 CPU。
+    compileOnly 'net.java.dev.jna:jna:5.14.0'
 }
 
 test {
     useJUnitPlatform()
 }
 
+// Pure-Java self-play training entry point. Pass arguments with -PtrainArgs="--weights path ...".
+tasks.register('trainGoAI', JavaExec) {
+    group = 'training'
+    description = 'Train the Go MCTS neural evaluator with self-play'
+    mainClass = 'com.wzz.game_console.client.screens.games.gogame.GoTrainingMain'
+    args((project.findProperty('trainArgs') ?: '').toString().trim().split("\\s+").findAll { !it.isEmpty() })
+    classpath = sourceSets.main.runtimeClasspath
+    maxHeapSize = '4g'
+}
+
+tasks.register('runChessSim', JavaExec) {
+    group = 'training'
+    description = '自对弈模拟：内置中国象棋引擎自我对弈，统计胜率/步数/耗时'
+    mainClass = 'com.wzz.game_console.client.screens.games.chess.ChessSimulationMain'
+    args((project.findProperty('chessSimArgs') ?: '').toString().trim().split("\\s+").findAll { !it.isEmpty() })
+    classpath = sourceSets.main.runtimeClasspath
+}
+
+tasks.register('adversarialTrain', JavaExec) {
+    group = 'training'
+    description = '对抗训练：己方 MCTS AI vs 外部 KataGo 引擎'
+    mainClass = 'com.wzz.game_console.client.screens.games.gogame.GoAdversarialMain'
+    args((project.findProperty('advArgs') ?: '').toString().trim().split("\\s+").findAll { !it.isEmpty() })
+    classpath = sourceSets.main.runtimeClasspath
+    maxHeapSize = '4g'
+}
+
+tasks.register('gpuProbe', JavaExec) {
+    group = 'training'
+    description = '探测 OpenCL GPU 设备是否可用'
+    mainClass = 'com.wzz.game_console.client.screens.games.gogame.GoGpuProbe'
+    classpath = sourceSets.main.runtimeClasspath
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/wzz/game_console/ModMain.java

@@ -3,11 +3,13 @@
 import com.wzz.game_console.init.ModItems;
 import com.wzz.game_console.init.ModNetworks;
 import com.wzz.game_console.init.ModTabs;
+import com.wzz.game_console.network.ServerDisconnectWatcher;
 import com.wzz.game_console.util.ExternalFileManager;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.neoforged.fml.ModContainer;
+import net.neoforged.neoforge.common.NeoForge;
 
 @Mod(ModMain.MODID)
 public class ModMain {
@@ -19,6 +21,8 @@ public ModMain(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(ModNetworks::register);
         ModItems.REGISTRY.register(modEventBus);
         ModTabs.REGISTRY.register(modEventBus);
+        // 服务端断线看门狗：玩家退出服务器时广播 PLAYER_QUIT（客户端据此关闭死等的对局界面）
+        NeoForge.EVENT_BUS.addListener(ServerDisconnectWatcher::onPlayerLoggedOut);
     }
 
     private void commonSetup(final FMLCommonSetupEvent event) {

src/main/java/com/wzz/game_console/client/screens/GameSelectorScreen.java

@@ -266,30 +266,56 @@ private int getCategoryColor(String category) {
 
     /** 打开文件对话框导入外部游戏设置 JSON */
     private void importSettingsFromFile() {
-        try {
-            Frame frame = new Frame();
-            frame.setAlwaysOnTop(true);
-            FileDialog dialog = new FileDialog(frame, "选择游戏设置文件 (.json)", FileDialog.LOAD);
-            dialog.setFile("*.json");
-            dialog.setVisible(true);
-            String filePath = dialog.getFile();
-            String dirPath = dialog.getDirectory();
-            frame.dispose();
-
-            if (filePath == null || dirPath == null) return;
-
-            File srcFile = new File(dirPath, filePath);
-            if (!srcFile.exists() || !srcFile.getName().endsWith(".json")) return;
-
-            Path srcPath = srcFile.toPath();
-            boolean success = GameSettings.importFromFile(srcPath);
-
-            importMessage = success ? "设置导入成功！" : "导入失败：文件格式不正确";
-            importMessageTime = System.currentTimeMillis();
-        } catch (Exception e) {
-            importMessage = "导入失败：" + e.getMessage();
-            importMessageTime = System.currentTimeMillis();
-        }
+        // ★ Bug修复：FileDialog.setVisible(true) 是模态阻塞调用，在 MC 主线程直接打开
+        //   会冻结整个游戏（停帧、无响应）。改为在后台 daemon 线程弹窗，
+        //   用户选完后 mc.execute 回主线程执行实际导入与提示（importMessage 由 render 读取）
+        Thread picker = new Thread(() -> {
+            Frame frame = null;
+            try {
+                frame = new Frame();
+                frame.setAlwaysOnTop(true);
+                // ★ Bug修复：原版不设位置,Windows 多显示器/扩展屏(主屏 x<0 或 y<0)
+                //   时 FileDialog 会落在不可见区域,玩家看不见但模态阻塞,只能 Alt+F4。
+                //   setLocationRelativeTo(null) 强制居中到主屏可视区
+                frame.setLocationRelativeTo(null);
+                FileDialog dialog = new FileDialog(frame, "选择游戏设置文件 (.json)", FileDialog.LOAD);
+                dialog.setFile("*.json");
+                dialog.setLocationRelativeTo(frame);
+                dialog.setVisible(true); // 只阻塞本后台线程，不再冻结游戏
+                String filePath = dialog.getFile();
+                String dirPath = dialog.getDirectory();
+
+                if (filePath == null || dirPath == null) return; // 用户取消
+
+                File srcFile = new File(dirPath, filePath);
+                if (!srcFile.isFile() || !srcFile.getName().toLowerCase(java.util.Locale.ROOT).endsWith(".json")) {
+                    Minecraft.getInstance().execute(() -> {
+                        importMessage = "导入失败：请选择 JSON 文件";
+                        importMessageTime = System.currentTimeMillis();
+                    });
+                    return;
+                }
+
+                Path srcPath = srcFile.toPath();
+                // 回到 MC 主线程执行导入与界面提示
+                Minecraft.getInstance().execute(() -> {
+                    boolean success = GameSettings.importFromFile(srcPath);
+                    importMessage = success ? "设置导入成功！" : "导入失败：文件格式不正确";
+                    importMessageTime = System.currentTimeMillis();
+                });
+            } catch (Exception e) {
+                String msg = "导入失败：" + e.getMessage();
+                Minecraft.getInstance().execute(() -> {
+                    importMessage = msg;
+                    importMessageTime = System.currentTimeMillis();
+                });
+            } finally {
+                // ★ 修复 AWT Frame 泄漏：dispose 移入 finally，异常/用户取消路径也会释放
+                if (frame != null) frame.dispose();
+            }
+        }, "GameConsole-SettingsImport");
+        picker.setDaemon(true);
+        picker.start();
     }
 
     @Override