From 4a804cf96698373598f12479f453d6a8ca1cb8e8 Mon Sep 17 00:00:00 2001
From: SALTWOOD <105980161+SALTWOOD@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:27:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=20Java=20=E6=97=B6=E7=9A=84=E5=85=B3=E9=94=AE?=
=?UTF-8?q?=E8=AF=8D=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Modules/Minecraft/ModJava.vb | 37 +++++++------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
index 7767f6b..2bc5f59 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
@@ -1,6 +1,18 @@
Public Module ModJava
Public JavaListCacheVersion As Integer = 6
+ '''
+ ''' 用于在搜索 Java 时进行关键词检测。
+ '''
+ Public ReadOnly SearchEntryWords As List(Of String) =
+ New List(Of String) From {"java", "jdk", "env", "环境", "run", "软件", "jre", "bin", "mc",
+ "soft", "cache", "temp", "corretto", "roaming", "users", "craft", "program", "世界", "net",
+ "游戏", "oracle", "game", "file", "data", "jvm", "服务", "server", "客户", "client", "整合",
+ "应用", "运行", "前置", "mojang", "官启", "新建文件夹", "eclipse", "microsoft", "hotspot",
+ "runtime", "x86", "x64", "forge", "原版", "optifine", "官方", "启动", "hmcl", "mod", "高清",
+ "download", "launch", "程序", "path", "version", "baka", "pcl", "zulu", "local", "packages",
+ "4297127d64ec6", "国服", "网易", "ext", "netease", "1.", "启动"}
+
'''
''' 目前所有可用的 Java。
'''
@@ -670,29 +682,8 @@ Wait:
Dim SearchEntry = GetFolderNameFromPath(FolderInfo.Name).ToLower '用于搜索的字符串
If IsFullSearch OrElse
FolderInfo.Parent.Name.ToLower = "users" OrElse
- SearchEntry.Contains("java") OrElse SearchEntry.Contains("jdk") OrElse SearchEntry.Contains("env") OrElse
- SearchEntry.Contains("环境") OrElse SearchEntry.Contains("run") OrElse SearchEntry.Contains("软件") OrElse
- SearchEntry.Contains("jre") OrElse SearchEntry = "bin" OrElse SearchEntry.Contains("mc") OrElse
- SearchEntry.Contains("soft") OrElse SearchEntry.Contains("cache") OrElse SearchEntry.Contains("temp") OrElse
- SearchEntry.Contains("corretto") OrElse SearchEntry.Contains("roaming") OrElse SearchEntry.Contains("users") OrElse
- SearchEntry.Contains("craft") OrElse SearchEntry.Contains("program") OrElse SearchEntry.Contains("世界") OrElse
- SearchEntry.Contains("net") OrElse SearchEntry.Contains("游戏") OrElse SearchEntry.Contains("oracle") OrElse
- SearchEntry.Contains("game") OrElse SearchEntry.Contains("file") OrElse SearchEntry.Contains("data") OrElse
- SearchEntry.Contains("jvm") OrElse SearchEntry.Contains("服务") OrElse SearchEntry.Contains("server") OrElse
- SearchEntry.Contains("客户") OrElse SearchEntry.Contains("client") OrElse SearchEntry.Contains("整合") OrElse
- SearchEntry.Contains("应用") OrElse SearchEntry.Contains("运行") OrElse SearchEntry.Contains("前置") OrElse
- SearchEntry.Contains("mojang") OrElse SearchEntry.Contains("官启") OrElse SearchEntry.Contains("新建文件夹") OrElse
- SearchEntry.Contains("eclipse") OrElse SearchEntry.Contains("microsoft") OrElse SearchEntry.Contains("hotspot") OrElse
- SearchEntry.Contains("runtime") OrElse SearchEntry.Contains("x86") OrElse SearchEntry.Contains("x64") OrElse
- SearchEntry.Contains("forge") OrElse SearchEntry.Contains("原版") OrElse SearchEntry.Contains("optifine") OrElse
- SearchEntry.Contains("官方") OrElse SearchEntry.Contains("启动") OrElse SearchEntry.Contains("hmcl") OrElse
- SearchEntry.Contains("mod") OrElse SearchEntry.Contains("高清") OrElse SearchEntry.Contains("download") OrElse
- SearchEntry.Contains("launch") OrElse SearchEntry.Contains("程序") OrElse SearchEntry.Contains("path") OrElse
- SearchEntry.Contains("version") OrElse SearchEntry.Contains("baka") OrElse SearchEntry.Contains("pcl") OrElse
- SearchEntry.Contains("zulu") OrElse
- SearchEntry.Contains("local") OrElse SearchEntry.Contains("packages") OrElse SearchEntry.Contains("4297127d64ec6") OrElse '官启文件夹
- SearchEntry.Contains("国服") OrElse SearchEntry.Contains("网易") OrElse SearchEntry.Contains("ext") OrElse '网易 Java 文件夹名
- SearchEntry.Contains("netease") OrElse SearchEntry.Contains("1.") OrElse SearchEntry.Contains("启动") Then
+ SearchEntryWords.Any(Function(word) SearchEntry.Contains(word)) OrElse '进行关键词检测
+ SearchEntry = "bin" Then
JavaSearchFolder(FolderInfo, Results, Source)
End If
Next
From 6674533cfb7394d4cee5903d155c6b8508479dbb Mon Sep 17 00:00:00 2001
From: SALTWOOD <105980161+SALTWOOD@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:20:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?modify:=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
=?UTF-8?q?=E4=BD=99=E7=9A=84=E5=85=B3=E9=94=AE=E8=AF=8D=EF=BC=8C=E5=9B=A0?=
=?UTF-8?q?=E4=B8=BA=E4=B8=8B=E6=96=87=E5=B7=B2=E9=92=88=E5=AF=B9=E5=85=B6?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=85=A8=E5=AD=97=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
index 2bc5f59..8091129 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
@@ -5,7 +5,7 @@
''' 用于在搜索 Java 时进行关键词检测。
'''
Public ReadOnly SearchEntryWords As List(Of String) =
- New List(Of String) From {"java", "jdk", "env", "环境", "run", "软件", "jre", "bin", "mc",
+ New List(Of String) From {"java", "jdk", "env", "环境", "run", "软件", "jre", "mc",
"soft", "cache", "temp", "corretto", "roaming", "users", "craft", "program", "世界", "net",
"游戏", "oracle", "game", "file", "data", "jvm", "服务", "server", "客户", "client", "整合",
"应用", "运行", "前置", "mojang", "官启", "新建文件夹", "eclipse", "microsoft", "hotspot",