fix build

futrime · Dec 26, 2023 · 2787d3f · 2787d3f
1 parent 07c6aef
commit 2787d3f
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 13 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }
 }