Skip to content

refactor: 移除 VisualBasic.CompilerServices 调用 #2876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LuLu-ling wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

refactor: 移除 VisualBasic.CompilerServices 调用 #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31aa2e5
refactor: 移除 VisualBasic.CompilerServices 调用
LuLu-ling May 22, 2026
ec2f47e
fix
LuLu-ling May 22, 2026
d872046
fk u dynamic
LuLu-ling May 22, 2026
a1a4469
refactor: 优化 LoaderStateChangedHintOnly 和 McInstallState 方法中的代码结构
LuLu-ling May 22, 2026
a7e3824
using DotNet.Globbing
LuLu-ling May 23, 2026
d1cec4a
fix: update pattern handling in LikeString to support numeric wildcard
LuLu-ling May 23, 2026
013c4b1
Merge branch 'dev' into refactor/VisualBasic-CompilerServices
LuLu-ling May 24, 2026
eec32fa
refactor: remove unused Newtonsoft.Json references across multiple files
LuLu-ling May 24, 2026
3fdb1ad
Merge branch 'dev' into refactor/VisualBasic-CompilerServices
LuLu-ling May 24, 2026
9e7c834
chore: remove ：
LuLu-ling May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions Plain Craft Launcher 2/Modules/Base/ModBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
using System.Xaml;
using System.Xml.Linq;
using Microsoft.VisualBasic;
using Microsoft.VisualBasic.CompilerServices;
using Microsoft.Win32;
using System.Text.Json.Nodes;
using PCL.Core.App;
Expand Down Expand Up @@ -250,10 +249,10 @@ public MyColor(object obj)
}
else
{
A = Conversions.ToDouble(((dynamic)obj).A);
R = Conversions.ToDouble(((dynamic)obj).R);
G = Conversions.ToDouble(((dynamic)obj).G);
B = Conversions.ToDouble(((dynamic)obj).B);
A = Convert.ToDouble(((dynamic)obj).A);
R = Convert.ToDouble(((dynamic)obj).R);
G = Convert.ToDouble(((dynamic)obj).G);
B = Convert.ToDouble(((dynamic)obj).B);
}
}

Expand Down Expand Up @@ -429,7 +428,7 @@ public override string ToString()

public override bool Equals(object obj)
{
return Operators.ConditionalCompareObjectEqual(this, obj, false);
return obj is MyColor other && A == other.A && R == other.R && G == other.G && B == other.B;
}
}

Expand Down Expand Up @@ -562,7 +561,7 @@ public static string RadixConvert(string Input, int FromRadix, int ToRadix)
// 转换为十进制
var RealNum = 0L;
var Scale = 1L;
foreach (var Digit in Input.Reverse().Select(l => Digits.IndexOfF(Conversions.ToString(l))))
foreach (var Digit in Input.Reverse().Select(l => Digits.IndexOfF(l.ToString())))
{
RealNum += Digit * Scale;
Scale *= FromRadix;
Expand Down Expand Up @@ -1093,7 +1092,7 @@ public static string GetFileMD5(string FilePath)
// 获取 MD5
using (var fs = new FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
return Conversions.ToString(GetHexString(MD5Provider.Instance.ComputeHash(fs)));
return (string)GetHexString(MD5Provider.Instance.ComputeHash(fs));
}
}
catch (Exception ex)
Expand Down Expand Up @@ -1126,7 +1125,7 @@ public static string GetFileSHA512(string FilePath)
// 获取 SHA512
using (var fs = new FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
return Conversions.ToString(GetHexString(SHA512Provider.Instance.ComputeHash(fs)));
return (string)GetHexString(SHA512Provider.Instance.ComputeHash(fs));
}
}
catch (Exception ex)
Expand Down Expand Up @@ -1159,7 +1158,7 @@ public static string GetFileSHA256(string FilePath)
// 获取 SHA256
using (var fs = new FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
return Conversions.ToString(GetHexString(SHA256Provider.Instance.ComputeHash(fs)));
return (string)GetHexString(SHA256Provider.Instance.ComputeHash(fs));
}
}
catch (Exception ex)
Expand Down Expand Up @@ -1190,7 +1189,7 @@ public static string GetFileSHA1(string FilePath)
// 获取 SHA1
using (var fs = new FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
return Conversions.ToString(GetHexString(SHA1Provider.Instance.ComputeHash(fs)));
return (string)GetHexString(SHA1Provider.Instance.ComputeHash(fs));
}
}
catch (Exception ex)
Expand All @@ -1215,7 +1214,7 @@ public static string GetAuthSHA1(Stream inputStream)
{
try
{
return Conversions.ToString(GetHexString(SHA1Provider.Instance.ComputeHash(inputStream)));
return (string)GetHexString(SHA1Provider.Instance.ComputeHash(inputStream));
}
catch (Exception ex)
{
Expand Down Expand Up @@ -1355,7 +1354,7 @@ public static void ExtractFile(string CompressFilePath, string DestDirectory, En
Directory.CreateDirectory(DestDirectory);
DestDirectory = Path.GetFullPath(DestDirectory);
if (!DestDirectory.EndsWith(Path.DirectorySeparatorChar.ToString()))
DestDirectory += Conversions.ToString(Path.DirectorySeparatorChar);
DestDirectory += Path.DirectorySeparatorChar.ToString();
if (CompressFilePath.EndsWithF(".gz", true))
// 以 gz 方式解压
using (var compressedFile = new FileStream(CompressFilePath, FileMode.Open, FileAccess.Read))
Expand Down Expand Up @@ -1614,7 +1613,7 @@ public static string StrFill(string Str, string Code, byte Length)
{
if (Str.Length > Length)
return Strings.Mid(Str, 1, Length);
return Strings.Mid(Str.PadRight(Length, Conversions.ToChar(Code)), Str.Length + 1) + Str;
return Strings.Mid(Str.PadRight(Length, Code[0]), Str.Length + 1) + Str;
}

/// <summary>
Expand All @@ -1633,8 +1632,8 @@ public static object StrTrim(string Str, bool RemoveQuote = true)
{
if (RemoveQuote)
Str = Str.Split("（")[0].Split("：")[0].Split("(")[0].Split(":")[0];
return Str.Trim('.', '。', '！', ' ', '!', '?', '？', Conversions.ToChar("\r"),
Conversions.ToChar("\n"));
return Str.Trim('.', '。', '！', ' ', '!', '?', '？', '\r',
'\n');
}

/// <summary>
Expand Down Expand Up @@ -1684,7 +1683,7 @@ public static ulong GetHash(string Str)
/// </summary>
public static string GetStringMD5(string Str)
{
return Conversions.ToString(GetHexString(MD5Provider.Instance.ComputeHash(Str)));
return (string)GetHexString(MD5Provider.Instance.ComputeHash(Str));
}

/// <summary>
Expand Down Expand Up @@ -2427,7 +2426,7 @@ public static List<T> GetFullList<T>(IList data)
if (data[i] is ICollection)
GetFullListRet.AddRange((IEnumerable<T>)data[i]);
else
GetFullListRet.Add(Conversions.ToGenericParameter<T>(data[i]));
GetFullListRet.Add((T)data[i]);

return GetFullListRet;
}
Expand Down Expand Up @@ -3202,8 +3201,7 @@ public static object GetObjectFromXML(string Str)
{
if (Reader.Type is not null && BlackListType.IsAssignableFrom(Reader.Type.UnderlyingType))
throw new UnauthorizedAccessException($"不允许使用 {BlackListType.Name} 类型。");
if (Reader.Value is not null && Conversions.ToBoolean(
Operators.ConditionalCompareObjectEqual(Reader.Value, BlackListType.Name, false)))
if (Reader.Value is not null && Equals(Reader.Value, BlackListType.Name))
throw new UnauthorizedAccessException($"不允许使用 {BlackListType.Name} 值。");
}

Expand Down Expand Up @@ -3681,7 +3679,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
if (value is null)
return false;
return value is Visibility
? Operators.ConditionalCompareObjectNotEqual(value, Visibility.Visible, false)
? (Visibility)value != Visibility.Visible
: false;
}
}
Expand Down
4 changes: 1 addition & 3 deletions Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Text.Json.Nodes;
using System.Windows;
using Microsoft.VisualBasic;
using Microsoft.VisualBasic.CompilerServices;
using PCL.Core.App;
using PCL.Core.App.Localization;
using PCL.Core.Minecraft;
Expand All @@ -19,7 +18,6 @@
using PCL.Core.Utils.Secret;
using PCL.Network;
using PCL.Core.IO.Net.Http;
using PCL;
using PCL.Core.Minecraft.IdentityModel.Yggdrasil;
using System.Globalization;

Expand Down Expand Up @@ -2545,7 +2543,7 @@ private static string McLaunchArgumentsJvmNew(ModMinecraft.McInstance instance)
var Server = McLoginAuthLoader.Input.BaseUrl.Replace("/authserver", "");
try
{
var Response = Conversions.ToString(ModNet.NetGetCodeByRequestRetry(Server, Encoding.UTF8));
var Response = ModNet.NetGetCodeByRequestRetry(Server, Encoding.UTF8)?.ToString();
DataList.Insert(0,
"-javaagent:\"" + Path.Combine(ModBase.PathPure, "authlib-injector.jar") + "\"=" + Server +
" -Dauthlibinjector.side=client" + " -Dauthlibinjector.yggdrasil.prefetched=" +
Expand Down
27 changes: 13 additions & 14 deletions Plain Craft Launcher 2/Modules/Minecraft/ModModpack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.IO.Compression;
using System.Text;
using System.Text.RegularExpressions;
using Microsoft.VisualBasic.CompilerServices;
using PCL.Core.App;
using PCL.Core.App.Localization;
using PCL.Core.UI;
Expand Down Expand Up @@ -324,13 +323,13 @@ private static void CopyOverrideDirectory(string OverridesFolder, string Version
if (File.Exists(OverridesIni))
{
ModBase.WriteIni(OverridesIni, "VersionArgumentIndie", 1.ToString()); // 开启版本隔离
ModBase.WriteIni(OverridesIni, "VersionArgumentIndieV2", Conversions.ToString(true));
ModBase.WriteIni(OverridesIni, "VersionArgumentIndieV2", true.ToString());
ModBase.CopyFile(OverridesIni, VersionIni); // 覆写已有的 ini
}
else
{
ModBase.WriteIni(VersionIni, "VersionArgumentIndie", 1.ToString()); // 开启版本隔离
ModBase.WriteIni(VersionIni, "VersionArgumentIndieV2", Conversions.ToString(true));
ModBase.WriteIni(VersionIni, "VersionArgumentIndieV2", true.ToString());
}

ModBase.IniClearCache(VersionIni); // 重置缓存，避免被安装过程中写入的 ini 覆盖
Expand Down Expand Up @@ -1580,8 +1579,8 @@ private static LoaderCombo<string> InstallPackMMC(string FileAddress, ZipArchive

ModBase.WriteFile(MMCSetupFile, Lines.Join("\r\n"));
// 读取文件
if (Conversions.ToBoolean(ModBase.ReadIni(MMCSetupFile, "OverrideCommands",
Conversions.ToString(false))))
if (Convert.ToBoolean(ModBase.ReadIni(MMCSetupFile, "OverrideCommands",
false.ToString())))
{
var PreLaunchCommand = ModBase.ReadIni(MMCSetupFile, "PreLaunchCommand");
if (!string.IsNullOrEmpty(PreLaunchCommand))
Expand All @@ -1596,17 +1595,17 @@ private static LoaderCombo<string> InstallPackMMC(string FileAddress, ZipArchive
}
}

if (Conversions.ToBoolean(ModBase.ReadIni(MMCSetupFile, "JoinServerOnLaunch",
Conversions.ToString(false))))
if (Convert.ToBoolean(ModBase.ReadIni(MMCSetupFile, "JoinServerOnLaunch",
false.ToString())))
{
var ServerAddress = ModBase.ReadIni(MMCSetupFile, "JoinServerOnLaunchAddress")
.Replace(@"\""", "\"");
Config.Instance.ServerToEnter[VersionFolder] = ServerAddress;
ModBase.Log("[ModPack] 迁移 MultiMC 实例独立设置：自动进入服务器：" + ServerAddress);
}

if (Conversions.ToBoolean(ModBase.ReadIni(MMCSetupFile, "IgnoreJavaCompatibility",
Conversions.ToString(false))))
if (Convert.ToBoolean(ModBase.ReadIni(MMCSetupFile, "IgnoreJavaCompatibility",
false.ToString())))
{
Config.Instance.IgnoreJavaCompatibility[VersionFolder] = true;
ModBase.Log("[ModPack] 迁移 MultiMC 实例独立设置：忽略 Java 兼容性警告");
Expand All @@ -1626,17 +1625,17 @@ private static LoaderCombo<string> InstallPackMMC(string FileAddress, ZipArchive
var JvmArgs = ModBase.ReadIni(MMCSetupFile, "JvmArgs");
if (!string.IsNullOrEmpty(JvmArgs))
{
if (Conversions.ToBoolean(ModBase.ReadIni(MMCSetupFile, "OverrideJavaArgs",
Conversions.ToString(false))))
if (Convert.ToBoolean(ModBase.ReadIni(MMCSetupFile, "OverrideJavaArgs",
false.ToString())))
{
Config.Instance.JvmArgs[VersionFolder] = JvmArgs;
ModBase.Log("[ModPack] 迁移 MultiMC 实例独立设置：JVM 参数（覆盖）：" + JvmArgs);
}
else
{
JvmArgs = Conversions.ToString(JvmArgs +
Operators.ConcatenateObject(" ",
Config.Launch.JvmArgs));
JvmArgs = JvmArgs +
" " +
Config.Launch.JvmArgs;
Config.Instance.JvmArgs[VersionFolder] = JvmArgs;
ModBase.Log("[ModPack] 迁移 MultiMC 实例独立设置：JVM 参数（追加）：" + JvmArgs);
}
Expand Down
Loading
Loading