Skip to content

Commit 7e7ea55

Browse files
committed
refactor(type): remove even more dynamic cast (x2)
1 parent 262a1c4 commit 7e7ea55

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

Plain Craft Launcher 2/Modules/Base/ModBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,7 @@ public static double Val(object Str)
21692169
{
21702170
try
21712171
{
2172-
return Str is string && Conversions.ToBoolean(Operators.ConditionalCompareObjectEqual(Str, "&", false))
2172+
return Str is string && Str == "&"
21732173
? 0d
21742174
: Conversion.Val(Str);
21752175
}

Plain Craft Launcher 2/Pages/PageLaunch/PageLoginProfile.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public ProfileItem(ModProfile.McProfile profile)
8686
private void SelectProfile(object sender, MouseButtonEventArgs e)
8787
{
8888
ModProfile.SelectedProfile = (ModProfile.McProfile)((MyListItem)sender).Tag;
89-
ModBase.Log($"[Profile] 选定档案: {((dynamic)sender).Tag.Username}, 以 {((dynamic)sender).Tag.Type} 方式验证");
89+
ModBase.Log($"[Profile] 选定档案: {((ModProfile.McProfile)((MyListItem)sender).Tag).Username}, 以 {((dynamic)sender).Tag.Type} 方式验证");
9090
ModProfile.LastUsedProfile =
9191
ModProfile.ProfileList.IndexOf((ModProfile.McProfile)((dynamic)sender).Tag); // 获取当前档案的序号
9292
ModProfile.SaveProfile(); // 保存档案配置,确保切换后的档案被正确保存

Plain Craft Launcher 2/Pages/PageSelectLeft.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ void AddMenuItem(string name, string header, string icon = null, Thickness? padd
289289
private void MoveUp_Click(object sender, RoutedEventArgs e)
290290
{
291291
var folder =
292-
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((dynamic)sender).Parent).Parent).PlacementTarget)
292+
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((MyMenuItem)sender).Parent).Parent).PlacementTarget)
293293
.Tag;
294294
var index = ModMinecraft.McFolderList.IndexOf(folder);
295295
if (index > 0)
@@ -303,7 +303,7 @@ private void MoveUp_Click(object sender, RoutedEventArgs e)
303303
private void MoveDown_Click(object sender, RoutedEventArgs e)
304304
{
305305
var folder =
306-
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((dynamic)sender).Parent).Parent).PlacementTarget)
306+
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((MyMenuItem)sender).Parent).Parent).PlacementTarget)
307307
.Tag;
308308
var index = ModMinecraft.McFolderList.IndexOf(folder);
309309
if (index < ModMinecraft.McFolderList.Count - 1)
@@ -326,7 +326,7 @@ private void UpdateFolderOrder()
326326
private void Restore_Click(object sender, RoutedEventArgs e)
327327
{
328328
var folder =
329-
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((dynamic)sender).Parent).Parent).PlacementTarget)
329+
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((MyListItem)sender).Parent).Parent).PlacementTarget)
330330
.Tag;
331331
var index = ModMinecraft.McFolderList.IndexOf(folder);
332332
ModMinecraft.McFolderList[index].Type = ModMinecraft.McFolder.Types.Original;
@@ -502,7 +502,7 @@ public void Remove_Click(object sender, RoutedEventArgs e)
502502
try
503503
{
504504
var Folder =
505-
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((dynamic)sender).Parent).Parent)
505+
(ModMinecraft.McFolder)((MyListItem)((Popup)((ContextMenu)((MyMenuItem)sender).Parent).Parent)
506506
.PlacementTarget).Tag;
507507
switch (ModMain.MyMsgBox(
508508
"是否需要清理 PCL 在该文件夹中的配置文件?" + "\r\n" + "这包括各个实例的独立设置(如自定义图标、第三方登录配置)等,对游戏本身没有影响。",

Plain Craft Launcher 2/Pages/PageSelectRight.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ private static void McVersionListContent(MyListItem sender, EventArgs e)
416416
{
417417
var Version = (ModMinecraft.McInstance)sender.Tag;
418418
// 注册点击事件
419-
sender.Click += (a, b) => Item_Click((dynamic)a, b);
419+
sender.Click += (a, b) => Item_Click((MyListItem)a, b);
420420
// 图标按钮
421421
var BtnStar = new MyIconButton();
422422
if (Version.IsStar)

Plain Craft Launcher 2/Pages/PageSetup/PageSetupGameLink.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private void LinkProtocolPerferenceChange(object sender, SelectionChangedEventAr
116116
if (ModAnimation.AniControlEnabled == 0)
117117
try
118118
{
119-
var selection = (LinkProtocolPreference)((dynamic)sender).SelectedIndex;
119+
var selection = (LinkProtocolPreference)((MyComboBox)sender).SelectedIndex;
120120
Config.Link.ProtocolPreference = selection;
121121
}
122122
catch (Exception ex)

Plain Craft Launcher 2/Pages/PageSetup/PageSetupLeft.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void PageOtherLeft_Unloaded(object sender, RoutedEventArgs e)
6767

6868
public void Reset(object sender, EventArgs e)
6969
{
70-
switch (ModBase.Val(((dynamic)sender).Tag))
70+
switch (ModBase.Val(((MyIconButton)sender).Tag))
7171
{
7272
case (double)FormMain.PageSubType.SetupLaunch:
7373
{
@@ -158,7 +158,7 @@ public static void TryFeedback() // Handles ItemFeedback.Click
158158

159159
public void Refresh(object sender, EventArgs e) // 由边栏按钮匿名调用
160160
{
161-
switch (ModBase.Val(((dynamic)sender).Tag))
161+
switch (ModBase.Val(((MyIconButton)sender).Tag))
162162
{
163163
case (double)FormMain.PageSubType.SetupFeedback:
164164
{

Plain Craft Launcher 2/Pages/PageSetup/PageSetupUpdate.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private async Task<UpdateStatus> IsLatestAsync()
4040
if (await ModSecret.RemoteServer.IsLatestAsync(
4141
Conversions.ToBoolean(ModSecret.IsCurrentVersionBeta) ? UpdateChannel.beta : UpdateChannel.stable,
4242
ModBase.IsArm64System ? UpdateArch.arm64 : UpdateArch.x64,
43-
(dynamic)SemVer.Parse(ModBase.VersionBaseName),
43+
SemVer.Parse(ModBase.VersionBaseName),
4444
ModBase.VersionCode))
4545
{
4646
ModBase.Log("[Update] 已是最新版本");

Plain Craft Launcher 2/Pages/PageSpeedLeft.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void TaskRefresh(ModLoader.LoaderBase Loader)
146146
Tb.Text = Loader.Error.ToString();
147147
Tb.MouseLeftButtonDown += (sender, _) =>
148148
{
149-
ModBase.ClipboardSet(((dynamic)sender).Text, false);
149+
ModBase.ClipboardSet(((TextBlock)sender).Text, false);
150150
ModMain.Hint("已复制错误详情!", ModMain.HintType.Finish);
151151
};
152152
Card.Children.Add(Tb);

0 commit comments

Comments
 (0)