From 2787d3f3ea3b210dc7e415c1c11c927e04d367a1 Mon Sep 17 00:00:00 2001
From: Pd233 <minecraftpd233@163.com>
Date: Tue, 26 Dec 2023 14:27:22 +0800
Subject: [PATCH] fix build

---
 src/LipUI.sln                                 |   5 +---
 src/LipUI/LipUI.csproj                        |  13 ++++++++++
 src/LipUI/LipUI_TemporaryKey.pfx              | Bin 0 -> 2520 bytes
 src/LipUI/MainWindow.xaml.cs                  |   4 +--
 src/LipUI/Package.appxmanifest                |   2 +-
 src/LipUI/Pages/HomePage.xaml                 |   3 ++-
 src/LipUI/Pages/HomePage.xaml.cs              |  24 +++++++++++++++++-
 src/LipUI/Pages/LocalPackagePage.xaml.cs      |   5 +---
 .../VIews/ServerInstanceEditView.xaml.cs      |  17 +++++++++++++
 9 files changed, 60 insertions(+), 13 deletions(-)
 create mode 100644 src/LipUI/LipUI_TemporaryKey.pfx

diff --git a/src/LipUI.sln b/src/LipUI.sln
index dbb8e29..67c36f3 100644
--- a/src/LipUI.sln
+++ b/src/LipUI.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LipNETWrapperTest", "LipNET
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LipWebApi", "LipWebApi\LipWebApi.csproj", "{17569CD2-D4D2-4E10-927C-BECEAECF7786}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LipUI", "LipUI\LipUI.csproj", "{ADF26F0A-8BCE-4F01-ACA8-042B9EC35064}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LipUI", "LipUI\LipUI.csproj", "{ADF26F0A-8BCE-4F01-ACA8-042B9EC35064}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -36,7 +36,6 @@ Global
 		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|ARM64.Build.0 = Release|Any CPU
 		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|x64.ActiveCfg = Release|Any CPU
-		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|x64.Build.0 = Release|Any CPU
 		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|x86.ActiveCfg = Release|Any CPU
 		{A274FAC9-3169-4EAB-A659-4090F8D6E568}.Release|x86.Build.0 = Release|Any CPU
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -52,7 +51,6 @@ Global
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|ARM64.Build.0 = Release|Any CPU
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|x64.ActiveCfg = Release|Any CPU
-		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|x64.Build.0 = Release|Any CPU
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|x86.ActiveCfg = Release|Any CPU
 		{2245E398-21FD-4F05-87A8-C6E8E29A4685}.Release|x86.Build.0 = Release|Any CPU
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -68,7 +66,6 @@ Global
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|ARM64.Build.0 = Release|Any CPU
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|x64.ActiveCfg = Release|Any CPU
-		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|x64.Build.0 = Release|Any CPU
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|x86.ActiveCfg = Release|Any CPU
 		{17569CD2-D4D2-4E10-927C-BECEAECF7786}.Release|x86.Build.0 = Release|Any CPU
 		{ADF26F0A-8BCE-4F01-ACA8-042B9EC35064}.Debug|Any CPU.ActiveCfg = Debug|x64
diff --git a/src/LipUI/LipUI.csproj b/src/LipUI/LipUI.csproj
index 5eb38f1..11f34b2 100644
--- a/src/LipUI/LipUI.csproj
+++ b/src/LipUI/LipUI.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+
+    <WindowsPackageType>None</WindowsPackageType>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
@@ -12,6 +16,15 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <PackageCertificateThumbprint>41F2155140B5369541BFDEEAC7B71FFB18F9E6DF</PackageCertificateThumbprint>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundle>Never</AppxBundle>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
   <ItemGroup>
     <Content Remove="Assets\applicationIcon-1024.png" />
diff --git a/src/LipUI/LipUI_TemporaryKey.pfx b/src/LipUI/LipUI_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..04c4dee8a091940a2b4daff5f1dac9bfc210c4c0
GIT binary patch
literal 2520
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

literal 0
HcmV?d00001

diff --git a/src/LipUI/MainWindow.xaml.cs b/src/LipUI/MainWindow.xaml.cs
index b93f558..8ab4df3 100644
--- a/src/LipUI/MainWindow.xaml.cs
+++ b/src/LipUI/MainWindow.xaml.cs
@@ -146,7 +146,7 @@ bool TrySetSystemBackdrop()
 
             // Create the policy object.
             m_configurationSource = new SystemBackdropConfiguration();
-            Activated += WindowActivated;
+            //Activated += WindowActivated;
             Closed += WindowClosed;
             ((FrameworkElement)Content).ActualThemeChanged += WindowThemeChanged;
 
@@ -184,7 +184,7 @@ private void WindowClosed(object sender, WindowEventArgs args)
             m_backdropController.Dispose();
             m_backdropController = null;
         }
-        Activated -= WindowActivated;
+        //Activated -= WindowActivated;
         m_configurationSource = null;
     }
 
diff --git a/src/LipUI/Package.appxmanifest b/src/LipUI/Package.appxmanifest
index 3b5caff..5e90c80 100644
--- a/src/LipUI/Package.appxmanifest
+++ b/src/LipUI/Package.appxmanifest
@@ -9,7 +9,7 @@
 
   <Identity
     Name="b34acd6e-13d6-4570-985a-e8e9c0461b27"
-    Publisher="CN=minec"
+    Publisher="CN=lippkg"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="b34acd6e-13d6-4570-985a-e8e9c0461b27" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
diff --git a/src/LipUI/Pages/HomePage.xaml b/src/LipUI/Pages/HomePage.xaml
index da5cddf..0e499f5 100644
--- a/src/LipUI/Pages/HomePage.xaml
+++ b/src/LipUI/Pages/HomePage.xaml
@@ -57,7 +57,8 @@
                     <Button
                         x:Name="StartServerButton"
                         Width="192"
-                        Height="40">
+                        Height="40"
+                        Click="StartServerButton_Click">
                         <TextBlock Text="i18n.startServer"/>
                     </Button>
 
diff --git a/src/LipUI/Pages/HomePage.xaml.cs b/src/LipUI/Pages/HomePage.xaml.cs
index 2970853..e0c2010 100644
--- a/src/LipUI/Pages/HomePage.xaml.cs
+++ b/src/LipUI/Pages/HomePage.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Diagnostics;
 using System.IO;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -37,7 +38,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 
     private void ShowLipInstallerPageIfNotExist()
     {
-        if (File.Exists(Main.Config.Settings.LipPath)) 
+        if (File.Exists(Main.Config.Settings.LipPath))
         {
             return;
         }
@@ -53,4 +54,25 @@ private void ShowLipInstallerPageIfNotExist()
             await dialog.ShowAsync();
         });
     }
+
+    private void StartServerButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (Main.Config.SelectedServer is null)
+            return;
+
+        var dir = Main.Config.SelectedServer.WorkingDirectory;
+        var path = Path.Combine(dir, "bedrock_server_mod.exe");
+
+        if (File.Exists(path)) 
+        {
+            Process.Start(path);
+            return;
+        }
+
+        path = Path.Combine(dir, "bedrock_server.exe");
+        if(File.Exists(path))
+        {
+            Process.Start(path);
+        }
+    }
 }
diff --git a/src/LipUI/Pages/LocalPackagePage.xaml.cs b/src/LipUI/Pages/LocalPackagePage.xaml.cs
index f1324bc..2265c13 100644
--- a/src/LipUI/Pages/LocalPackagePage.xaml.cs
+++ b/src/LipUI/Pages/LocalPackagePage.xaml.cs
@@ -1,4 +1,3 @@
-using LipUI.Language;
 using LipUI.Models;
 using LipUI.Models.Lip;
 using LipUI.Protocol;
@@ -7,9 +6,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -23,7 +20,7 @@ public sealed partial class LocalPackagePage : Page
 {
     public LocalPackagePage()
     {
-        this.InitializeComponent();
+        InitializeComponent();
     }
 
     private void ReloadPackage()
diff --git a/src/LipUI/VIews/ServerInstanceEditView.xaml.cs b/src/LipUI/VIews/ServerInstanceEditView.xaml.cs
index 24c7325..e9e0075 100644
--- a/src/LipUI/VIews/ServerInstanceEditView.xaml.cs
+++ b/src/LipUI/VIews/ServerInstanceEditView.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using Windows.Storage.Pickers;
 using WinRT.Interop;
@@ -70,6 +71,22 @@ public void CommitServerProperies()
         Server.Description = DescriptionInput.Text;
         Server.Version = VersionInput.Text;
         Server.WorkingDirectory = WorkingDirectoryInput.Text;
+
+        if (iconPath is not null)
+        {
+            var dir = Path.Combine(Server.WorkingDirectory, DefaultSettings.DataDirectory);
+
+            if (Directory.Exists(dir) is false)
+                Directory.CreateDirectory(dir);
+
+            var dest = Path.Combine(dir, $"icon{new FileInfo(iconPath).Extension}");
+
+            File.Copy(iconPath, dest);
+
+            Server.Icon = dest;
+            return;
+        }
+
         Server.Icon = iconPath;
     }
 }