up 修改主界面

Coloryr · Coloryr · commit 94d130451618 · 2026-02-22T21:11:31.000+08:00
diff --git a/src/ColorMC.Core/CoreMain.cs b/src/ColorMC.Core/CoreMain.cs
@@ -48,6 +48,10 @@ public static class ColorMCCore
     /// </summary>
     public static event Action<InstanceChangeEventArgs>? InstanceChange;
     /// <summary>
+    /// Java修改
+    /// </summary>
+    public static event Action<JavaChangeArg>? JavaChange;
+    /// <summary>
     /// 是否为新运行
     /// </summary>
     public static bool NewStart { get; internal set; }
@@ -246,6 +250,19 @@ internal static void OnInstanceIconChange(GameSettingObj obj)
         InstanceChange?.Invoke(new InstanceChangeEventArgs(InstanceChangeType.IconChange, obj));
     }
 
+    /// <summary>
+    /// Java修改
+    /// </summary>
+    internal static void OnJavaChange(JavaInfoObj? java, bool add, bool mut)
+    {
+        JavaChange?.Invoke(new JavaChangeArg
+        {
+            IsAdd = add,
+            IsMut = mut,
+            Java = java
+        });
+    }
+
     /// <summary>
     /// 获取下载窗口句柄
     /// </summary>
diff --git a/src/ColorMC.Core/LaunchPath/JvmPath.cs b/src/ColorMC.Core/LaunchPath/JvmPath.cs
@@ -205,6 +205,7 @@ public static StringRes AddItem(string name, string local)
         if (info != null)
         {
             Jvms.Add(name, info);
+            ColorMCCore.OnJavaChange(info, true, false);
             ConfigLoad.Config.JavaList?.Add(new JvmConfigObj
             {
                 Name = name,
@@ -223,7 +224,10 @@ public static StringRes AddItem(string name, string local)
     /// <param name="name">名字</param>
     public static void Remove(string name)
     {
-        Jvms.Remove(name);
+        if (Jvms.Remove(name, out var info))
+        {
+            ColorMCCore.OnJavaChange(info, false, false);
+        }
         var item = ConfigLoad.Config.JavaList?.FirstOrDefault(a => a.Name == name);
         if (item != null && ConfigLoad.Config.JavaList?.Remove(item) == true)
         {
@@ -272,6 +276,8 @@ private static void AddList(List<JvmConfigObj> list)
                     });
                 }
             });
+
+            ColorMCCore.OnJavaChange(null, true, true);
         });
     }
 
@@ -301,6 +307,7 @@ private static void AddList(List<JvmConfigObj> list)
     public static void RemoveAll()
     {
         Jvms.Clear();
+        ColorMCCore.OnJavaChange(null, false, true);
         ConfigLoad.Config.JavaList.Clear();
         ConfigLoad.Save();
     }
diff --git a/src/ColorMC.Core/Objs/Events.cs b/src/ColorMC.Core/Objs/Events.cs
@@ -673,7 +673,7 @@ public class InstanceChangeEventArgs(InstanceChangeType type, GameSettingObj? ga
 }
 
 /// <summary>
-/// 开始下载回调
+/// 开始下载事件
 /// </summary>
 public class DownloadEventArgs : EventArgs
 {
@@ -685,4 +685,23 @@ public class DownloadEventArgs : EventArgs
     /// 界面操作回调
     /// </summary>
     public IDownloadGui? GuiHandle { get; set; }
+}
+
+/// <summary>
+/// Java修改事件
+/// </summary>
+public class JavaChangeArg : EventArgs
+{ 
+    /// <summary>
+    /// 是否为添加操作
+    /// </summary>
+    public bool IsAdd { get; set; }
+    /// <summary>
+    /// 是否为批量操作
+    /// </summary>
+    public bool IsMut { get; set; }
+    /// <summary>
+    /// 修改的Java
+    /// </summary>
+    public JavaInfoObj? Java { get; set; }
 }
diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -358,6 +358,9 @@
     <ProjectReference Include="..\ColorMC.Core\ColorMC.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="UI\Controls\Main\MainSimpleControl.axaml.cs">
+      <DependentUpon>MainSimpleControl.axaml</DependentUpon>
+    </Compile>
     <Compile Update="UI\Controls\TitleControl.axaml.cs">
       <DependentUpon>TitleControl.axaml</DependentUpon>
     </Compile>
diff --git a/src/ColorMC.Gui/Resource/Language/zh-cn.json b/src/ColorMC.Gui/Resource/Language/zh-cn.json
@@ -86,6 +86,7 @@
 	"MainWindow.Text94": "服务器信息获取失败",
 	"MainWindow.Text95": "实例列表",
 	"MainWindow.Text96": "高级设定",
+	"MainWindow.Text97": "更多配置",
 	"UserWindow.Title": "账户管理",
 	"UserWindow.Text2": "密码",
 	"UserWindow.Text3": "账户类型",
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml
@@ -171,7 +171,7 @@
                         <DockPanel
                             Margin="30,20,0,0"
                             DockPanel.Dock="Top"
-                            IsVisible="{Binding HaveGame}">
+                            IsVisible="{Binding !IsNotGame}">
                             <Border
                                 Padding="3"
                                 Background="{setting:Theme RadioGroupBG}"
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs
@@ -43,7 +43,7 @@ public partial class MainControl : BaseUserControl
     /// <summary>
     /// 简易主界面
     /// </summary>
-    private SimpleControl? _simple;
+    private MainSimpleControl? _simple;
 
     public MainControl() : base(WindowManager.GetUseName<MainControl>())
     {
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainSimpleControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainSimpleControl.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="ColorMC.Gui.UI.Controls.Main.SimpleControl"
+    x:Class="ColorMC.Gui.UI.Controls.Main.MainSimpleControl"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -103,6 +103,7 @@
                     OnContent="{setting:Localize SettingWindow.Tab4.Text12}" />
             </Grid>
             <Grid
+                Margin="0,0,0,10"
                 ColumnDefinitions="auto,*,auto,*"
                 IsEnabled="{Binding HaveGame}"
                 IsVisible="{Binding EnableArg}">
@@ -125,6 +126,28 @@
                     Minimum="1"
                     Value="{Binding MaxMem}" />
             </Grid>
+            <StackPanel
+                Margin="0,0,0,5"
+                HorizontalAlignment="Center"
+                IsVisible="{Binding EnableArg}"
+                Orientation="Horizontal">
+                <TextBlock Margin="0,0,5,0" Text="{setting:Localize GameEditWindow.Tab2.Text22}" />
+                <ComboBox
+                    Width="230"
+                    IsEditable="True"
+                    ItemsSource="{Binding JavaList}"
+                    Text="{Binding Java}" />
+            </StackPanel>
+            <Button
+                Width="200"
+                Height="35"
+                Margin="-3,0,-3,0"
+                HorizontalAlignment="Stretch"
+                Classes="top"
+                Command="{Binding OpenGameSetting}"
+                Content="{setting:Localize MainWindow.Text97}"
+                IsEnabled="{Binding HaveGame}"
+                IsVisible="{Binding EnableArg}" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainSimpleControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainSimpleControl.axaml.cs
@@ -2,9 +2,9 @@
 
 namespace ColorMC.Gui.UI.Controls.Main;
 
-public partial class SimpleControl : UserControl
+public partial class MainSimpleControl : UserControl
 {
-    public SimpleControl()
+    public MainSimpleControl()
     {
         InitializeComponent();
     }
diff --git a/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs b/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs
@@ -41,11 +41,6 @@ public partial class MainModel
     /// </summary>
     private readonly Dictionary<Guid, GameItemModel> Launchs = [];
 
-    /// <summary>
-    /// 用于
-    /// </summary>
-    private readonly Semaphore _semaphore = new(0, 2);
-
     /// <summary>
     /// 游戏实例
     /// </summary>
@@ -107,8 +102,6 @@ public partial class MainModel
     /// </summary>
     public bool IsMut { get; private set; }
 
-    private GameItemModel? _dragItem;
-
     partial void OnGridTypeChanged(ItemsGridType value)
     {
         OnPropertyChanged(SwitchView);
diff --git a/src/ColorMC.Gui/UI/Model/Main/MainModel.cs b/src/ColorMC.Gui/UI/Model/Main/MainModel.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using ColorMC.Core;
 using ColorMC.Gui.Manager;
 using ColorMC.Gui.Objs;
 using ColorMC.Gui.UI.Model.Dialog;
@@ -105,6 +106,7 @@ public MainModel(WindowModel model) : base(model)
     {
         EventManager.SkinChange += SkinChange;
         EventManager.LastUserChange += EventManager_UserChange;
+        ColorMCCore.JavaChange += ColorMCCore_JavaChange;
 
         MusicVolume = GuiConfigUtils.Config.ServerCustom.Volume;
     }
diff --git a/src/ColorMC.Gui/UI/Model/Main/SimpleModel.cs b/src/ColorMC.Gui/UI/Model/Main/SimpleModel.cs
@@ -1,7 +1,11 @@
+using System.Collections.ObjectModel;
 using Avalonia.Media.Imaging;
+using Avalonia.Threading;
 using ColorMC.Core.Config;
 using ColorMC.Core.LaunchPath;
+using ColorMC.Core.Objs;
 using ColorMC.Gui.Manager;
+using ColorMC.Gui.Objs;
 using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -14,6 +18,11 @@ namespace ColorMC.Gui.UI.Model.Main;
 /// </summary>
 public partial class MainModel
 {
+    /// <summary>
+    /// Java列表
+    /// </summary>
+    public ObservableCollection<string> JavaList { get; init; } = [];
+
     [ObservableProperty]
     private bool _maxWindow;
 
@@ -37,6 +46,9 @@ public partial class MainModel
     [ObservableProperty]
     private bool _enableArg;
 
+    [ObservableProperty]
+    private string _java;
+
     partial void OnGameChanged(GameItemModel? value)
     {
         if (value == null)
@@ -48,6 +60,8 @@ partial void OnGameChanged(GameItemModel? value)
             return;
         }
 
+        LoadJavaList();
+
         GameName = value.Name;
         GameIcon = ImageManager.GetGameIcon(value.Obj) ?? ImageManager.GameIcon;
 
@@ -57,6 +71,18 @@ partial void OnGameChanged(GameItemModel? value)
         MaxWindow = value.Obj.Window?.FullScreen ?? conf.Window.FullScreen ?? false;
         GameWidth = value.Obj.Window?.Width ?? conf.Window.Width;
         GameHeight = value.Obj.Window?.Height ?? conf.Window.Height;
+        Java = value.Obj.JvmLocal ?? "";
+    }
+
+    partial void OnJavaChanged(string value)
+    {
+        if (Game?.Obj is not { } obj)
+        {
+            return;
+        }
+
+        obj.JvmLocal = value;
+        obj.Save();
     }
 
     partial void OnMaxWindowChanged(bool value)
@@ -118,6 +144,17 @@ partial void OnMaxMemChanged(uint? value)
         obj.Save();
     }
 
+    [RelayCommand]
+    public void OpenGameSetting()
+    {
+        if (Game == null)
+        {
+            return;
+        }
+
+        WindowManager.ShowGameEdit(Game.Obj, GameEditWindowType.Arg);
+    }
+
     /// <summary>
     /// 启动选中的游戏实例
     /// </summary>
@@ -144,4 +181,23 @@ public void EditGame()
 
         WindowManager.ShowGameEdit(Game.Obj);
     }
+
+    private void LoadJavaList()
+    {
+        JavaList.Clear();
+
+        JavaList.Add("");
+
+        foreach (var item in JvmPath.Jvms)
+        {
+            JavaList.Add(item.Value.Path);
+        }
+
+        Java = Game?.Obj.JvmLocal ?? "";
+    }
+
+    private void ColorMCCore_JavaChange(JavaChangeArg obj)
+    {
+        Dispatcher.UIThread.Post(LoadJavaList);
+    }
 }
diff --git a/src/ColorMC.Gui/UI/Model/Setting/SettingTab5Model.cs b/src/ColorMC.Gui/UI/Model/Setting/SettingTab5Model.cs
@@ -152,9 +152,6 @@ private async void AddJavaZip()
     /// </summary>
     public async void FindJavaDir()
     {
-#if Phone
-        return;
-#endif
         var top = Window.GetTopLevel();
         if (top == null)
         {

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ public static StringRes AddItem(string name, string local)`
`205`	`205`	`if (info != null)`
`206`	`206`	`{`
`207`	`207`	`Jvms.Add(name, info);`
	`208`	`+ ColorMCCore.OnJavaChange(info, true, false);`
`208`	`209`	`ConfigLoad.Config.JavaList?.Add(new JvmConfigObj`
`209`	`210`	`{`
`210`	`211`	`Name = name,`
`@@ -223,7 +224,10 @@ public static StringRes AddItem(string name, string local)`
`223`	`224`	`/// <param name="name">名字</param>`
`224`	`225`	`public static void Remove(string name)`
`225`	`226`	`{`
`226`		`- Jvms.Remove(name);`
	`227`	`+ if (Jvms.Remove(name, out var info))`
	`228`	`+ {`
	`229`	`+ ColorMCCore.OnJavaChange(info, false, false);`
	`230`	`+ }`
`227`	`231`	`var item = ConfigLoad.Config.JavaList?.FirstOrDefault(a => a.Name == name);`
`228`	`232`	`if (item != null && ConfigLoad.Config.JavaList?.Remove(item) == true)`
`229`	`233`	`{`
`@@ -272,6 +276,8 @@ private static void AddList(List<JvmConfigObj> list)`
`272`	`276`	`});`
`273`	`277`	`}`
`274`	`278`	`});`
	`279`	`+`
	`280`	`+ ColorMCCore.OnJavaChange(null, true, true);`
`275`	`281`	`});`
`276`	`282`	`}`
`277`	`283`
`@@ -301,6 +307,7 @@ private static void AddList(List<JvmConfigObj> list)`
`301`	`307`	`public static void RemoveAll()`
`302`	`308`	`{`
`303`	`309`	`Jvms.Clear();`
	`310`	`+ ColorMCCore.OnJavaChange(null, false, true);`
`304`	`311`	`ConfigLoad.Config.JavaList.Clear();`
`305`	`312`	`ConfigLoad.Save();`
`306`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public partial class MainControl : BaseUserControl`
`43`	`43`	`/// <summary>`
`44`	`44`	`/// 简易主界面`
`45`	`45`	`/// </summary>`
`46`		`- private SimpleControl? _simple;`
	`46`	`+ private MainSimpleControl? _simple;`
`47`	`47`
`48`	`48`	`public MainControl() : base(WindowManager.GetUseName<MainControl>())`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace ColorMC.Gui.UI.Controls.Main;`
`4`	`4`
`5`		`-public partial class SimpleControl : UserControl`
	`5`	`+public partial class MainSimpleControl : UserControl`
`6`	`6`	`{`
`7`		`- public SimpleControl()`
	`7`	`+ public MainSimpleControl()`
`8`	`8`	`{`
`9`	`9`	`InitializeComponent();`
`10`	`10`	`}`