Skip to content

Commit

Permalink
clean
Browse files Browse the repository at this point in the history
  • Loading branch information
Coloryr committed Jul 18, 2024
1 parent 236a8a3 commit f1f9f6e
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/ColorMC.Core/CoreMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace ColorMC.Core;
public static class ColorMCCore
{
public const string TopVersion = "A27";
public const string DateVersion = "20240717";
public const string DateVersion = "20240718";

/// <summary>
/// 版本号
Expand Down
8 changes: 4 additions & 4 deletions src/ColorMC.CustomGui/UIModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public async Task Launch()

public override void Close()
{

}

/// <summary>
Expand All @@ -86,16 +86,16 @@ public void Load()

public void Launch(GameItemModel obj)
{

}

public void Select(GameItemModel? model)
{

}

public void EditGroup(GameItemModel model)
{

}
}
2 changes: 1 addition & 1 deletion src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private void Drop(object? sender, DragEventArgs e)
}
if (str.StartsWith("authlib-injector:yggdrasil-server:"))
{
WindowManager.ShowUser(false, url:str);
WindowManager.ShowUser(false, url: str);
}
else if (str.StartsWith("cloudkey:") || str.StartsWith("cloudKey:"))
{
Expand Down
1 change: 0 additions & 1 deletion src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using ColorMC.Gui.UI.Model.Main;

namespace ColorMC.Gui.UI.Controls.Main;
Expand Down
2 changes: 1 addition & 1 deletion src/ColorMC.Gui/UI/Controls/MenuControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void MenuControl_SizeChanged(object? sender, SizeChangedEventArgs e)
model.TopSide = true;
_control.SidePanel1.Child = null;
_control.SidePanel2.Child = _sideControl;
_control.TopPanel.Margin = new Thickness(10,0,0,0);
_control.TopPanel.Margin = new Thickness(10, 0, 0, 0);
}
}

Expand Down
1 change: 0 additions & 1 deletion src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using Avalonia.Input;
using Avalonia.Media.Imaging;
using ColorMC.Gui.Manager;
Expand Down
2 changes: 1 addition & 1 deletion src/ColorMC.Gui/UI/Model/Main/GameGroupModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void IconChange(string uuid)
{
continue;
}
else if(item.UUID == uuid)
else if (item.UUID == uuid)
{
item.LoadIcon();
}
Expand Down
3 changes: 1 addition & 2 deletions src/ColorMC.Gui/UI/Model/Main/MinecraftNewsModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using Avalonia.Media.Imaging;
using ColorMC.Gui.UI.Model.Items;
Expand Down
2 changes: 1 addition & 1 deletion src/ColorMC.Gui/UI/Model/NetFrp/NetFrpModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public NetFrpModel(BaseModel model) : base(model)
SubMenu =
[
new SubMenuItemModel()
{
{
Func = GetCloud,
Name = App.Lang("NetFrpWindow.Tab4.Text2")
}
Expand Down
4 changes: 2 additions & 2 deletions src/ColorMC.Gui/UI/Model/ServerPack/ServerPackModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ public ServerPackModel(BaseModel model, ServerPackObj obj) : base(model)
{
Icon = "/Resource/Icon/GameExport/item1.svg",
Text = App.Lang("ServerPackWindow.Tabs.Text1"),
SubMenu =
SubMenu =
[
new SubMenuItemModel()
{
{
Func = Gen,
Name = App.Lang("ServerPackWindow.Tab1.Text10")
}
Expand Down
1 change: 0 additions & 1 deletion src/ColorMC.Gui/UI/Windows/ABaseWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using ColorMC.Core.Utils;
using ColorMC.Gui.Manager;
using ColorMC.Gui.Objs;
using ColorMC.Gui.UI.Controls;

namespace ColorMC.Gui.UI.Windows;

Expand Down
6 changes: 1 addition & 5 deletions src/ColorMC.Gui/UI/Windows/ITop.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Avalonia.Controls;
using Avalonia.Input;

Expand Down
32 changes: 16 additions & 16 deletions src/ColorMC.Gui/UI/Windows/LinuxControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,36 @@ private void SizeC(object? sender, PointerPressedEventArgs e)
&& sender is Rectangle rectangle)
{
if (rectangle.Name == "NorthWest")
{
window.BeginResizeDrag(WindowEdge.NorthWest, e);
{
window.BeginResizeDrag(WindowEdge.NorthWest, e);
}
else if (rectangle.Name == "North")
{
window.BeginResizeDrag(WindowEdge.North, e);
{
window.BeginResizeDrag(WindowEdge.North, e);
}
else if (rectangle.Name == "NorthEast")
{
window.BeginResizeDrag(WindowEdge.NorthEast, e);
{
window.BeginResizeDrag(WindowEdge.NorthEast, e);
}
else if (rectangle.Name == "West")
{
window.BeginResizeDrag(WindowEdge.West, e);
{
window.BeginResizeDrag(WindowEdge.West, e);
}
else if (rectangle.Name == "East")
{
window.BeginResizeDrag(WindowEdge.East, e);
{
window.BeginResizeDrag(WindowEdge.East, e);
}
else if (rectangle.Name == "SouthWest")
{
window.BeginResizeDrag(WindowEdge.SouthWest, e);
{
window.BeginResizeDrag(WindowEdge.SouthWest, e);
}
else if (rectangle.Name == "South")
{
window.BeginResizeDrag(WindowEdge.South, e);
{
window.BeginResizeDrag(WindowEdge.South, e);
}
else if (rectangle.Name == "SouthEast")
{
window.BeginResizeDrag(WindowEdge.SouthEast, e);
{
window.BeginResizeDrag(WindowEdge.SouthEast, e);
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/ColorMC.Gui/UI/Windows/MultiLinuxWindow.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using ColorMC.Core.Objs;
using ColorMC.Core.Utils;
using ColorMC.Gui.UI.Controls;

namespace ColorMC.Gui.UI.Windows;
Expand Down
2 changes: 1 addition & 1 deletion src/ColorMC.Gui/UI/Windows/MultiWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public partial class MultiWindow : AMultiWindow
{
public override HeadControl Head => HeadControl;

public MultiWindow()
public MultiWindow()
{
InitializeComponent();
}
Expand Down
3 changes: 0 additions & 3 deletions src/ColorMC.Gui/UI/Windows/SingleControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
using Avalonia.Controls.Notifications;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
using ColorMC.Core.Objs;
using ColorMC.Core.Utils;
using ColorMC.Gui.Manager;
using ColorMC.Gui.UI.Controls;
using ColorMC.Gui.UI.Controls.Main;
Expand Down
8 changes: 4 additions & 4 deletions src/ColorMC.Launcher/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ public static class Program

public static readonly string[] BaseSha1 =
[
"df69f281248c0693bf439f8aa5921c2578356d92",
"d2a9b8cd583c53d391599d68805904d59983d8e2",
"7052b850ebafa457dfb810effbbb4b6814ae563c",
"7b8ded05a4486beb774054af9be8b8e4c7b713f2"
"192b08dd31c3837662568549e3fd301a63362f1d",
"b4a7efd53c5a601692fb2a29621a750f9f46d5d7",
"f855be5f6727ffb5e5fb5897e9d704ad5bb6fa96",
"753b191da92fc4772fc129f59bb4d3549e721b62"
];

public delegate void IN(string[] args);
Expand Down

0 comments on commit f1f9f6e

Please sign in to comment.