Mirror/EpinelPS
1
0
Fork 0
mirror of https://github.com/EpinelPS/EpinelPS.git synced 2025-12-14 07:55:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few bugs in server selector, do not hardcode paths

Browse Source
This commit is contained in:
Mikhail Tyukin
2025-12-10 15:14:49 -05:00
parent 5f27e2ea44
commit 8b8d58854f
5 changed files with 323 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ServerSelector/Views/MainView.axaml
View File

@@ -116,7 +116,7 @@
<TextBlock VerticalAlignment="Center" Margin="5" Grid.Row="0" Grid.Column="0" ToolTip.Tip="The folder with the game and launcher folders.">Game root path: </TextBlock>
<TextBox x:Name="txtGamePath" Grid.Row="0" Grid.Column="1" TextChanged="GamePath_TextChanged" ToolTip.Tip="The folder with the game and launcher folders.">C:\NIKKE\</TextBox>
<Button x:Name="btnSelectGamePath" Grid.Row="0" Grid.Column="2" Classes="utility" Click="BtnSelectGamePath_Click">...</Button>
<Button x:Name="btnSelectGamePath" Grid.Row="0" Grid.Column="2" Classes="utility" Click="BtnSelectGamePath_Click" Margin="5,0,0,0">...</Button>
<TextBlock VerticalAlignment="Center" Margin="5" Grid.Row="4" Grid.Column="0">Server: </TextBlock>
@@ -144,7 +144,7 @@
</Button>
</Grid>
</TabItem>
<TabItem Header="Android">
<TabItem Header="Android" IsVisible="False">
<Grid Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition>

37
ServerSelector/Views/MainView.axaml.cs
View File

@@ -14,9 +14,9 @@ public partial class MainView : UserControl
public MainView()
{
InitializeComponent();
CmbServerSelection.SelectedIndex = ServerSwitcher.IsUsingOfficalServer() ? 0 : 1;
CmbServerSelection.SelectedIndex = ServerSwitcher.IsUsingLocalServer() ? 1 : 0;
TxtIpAddress.IsEnabled = !ServerSwitcher.IsUsingOfficalServer();
TxtIpAddress.IsEnabled = !ServerSwitcher.IsUsingLocalServer();
ChkOffline.IsChecked = ServerSwitcher.IsOffline();
if (OperatingSystem.IsWindows() && !new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator))
@@ -57,25 +57,17 @@ public partial class MainView : UserControl
}
}
private string? GamePath
private string? BasePath
{
get
{
if (txtGamePath.Text == null) return null;
return Path.Combine(txtGamePath.Text, "NIKKE", "game");
}
}
private string? LauncherPath
{
get
{
if (txtGamePath.Text == null) return null;
return Path.Combine(txtGamePath.Text, "Launcher");
return txtGamePath.Text;
}
}
private bool ValidatePaths(bool showMessage)
{
if (string.IsNullOrEmpty(txtGamePath.Text) || LauncherPath == null)
if (string.IsNullOrEmpty(BasePath))
{
SetGamePathValid(false);
if (showMessage)
@@ -83,20 +75,21 @@ public partial class MainView : UserControl
return false;
}
if (!Directory.Exists(GamePath))
if (!Directory.Exists(BasePath))
{
SetGamePathValid(false);
if (showMessage)
ShowWarningMsg("game folder does not exist in the game root folder", "Error");
ShowWarningMsg("Game path does not exist", "Error");
return false;
}
if (!File.Exists(Path.Combine(LauncherPath, "nikke_launcher.exe")))
var result = ServerSwitcher.SetBasePath(BasePath);
if (!result.Item1)
{
SetGamePathValid(false);
if (showMessage)
ShowWarningMsg("Game path is invalid. Make sure that nikke_launcher.exe exists in the <Game Path>/launcher folder", "Error");
ShowWarningMsg(result.Item2, "Error");
return false;
}
@@ -107,11 +100,11 @@ public partial class MainView : UserControl
private async void UpdateIntegrityLabel()
{
if (!ValidatePaths(false) || txtGamePath.Text == null || GamePath == null || LauncherPath == null)
if (!ValidatePaths(false) || txtGamePath.Text == null || BasePath == null)
return;
SetLoadingScreenVisible(true);
LblStatus.Text = "Status: " + await ServerSwitcher.CheckIntegrity(GamePath, LauncherPath);
LblStatus.Text = "Status: " + await ServerSwitcher.CheckIntegrity();
SetLoadingScreenVisible(false);
}
@@ -131,7 +124,7 @@ public partial class MainView : UserControl
private async void Save_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
{
if (!ValidatePaths(true) || txtGamePath.Text == null || GamePath == null || LauncherPath == null)
if (!ValidatePaths(true) || txtGamePath.Text == null || BasePath == null)
return;
if (CmbServerSelection.SelectedIndex == 1 && !IPAddress.TryParse(TxtIpAddress.Text, out _))
@@ -150,7 +143,7 @@ public partial class MainView : UserControl
SetLoadingScreenVisible(true);
try
{
ServerSwitchResult res = await ServerSwitcher.SaveCfg(CmbServerSelection.SelectedIndex == 0, GamePath, LauncherPath, TxtIpAddress.Text, ChkOffline.IsChecked ?? false);
ServerSwitchResult res = await ServerSwitcher.SaveCfg(CmbServerSelection.SelectedIndex == 0, TxtIpAddress.Text, ChkOffline.IsChecked ?? false);
if (!res.IsSupported)
{