Multi-platform support

Emerald.App/Emerald.App.Package/Package.WinUI.wapproj

@@ -55,42 +55,42 @@
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\Emerald.App\Emerald.App.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <PackageCertificateThumbprint>9CBDFA6FDB25BE48AA09759C40DFAB769CF9740A</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <AppInstallerUri>D:\Projects\Emerald\Emerald.App\Emerald.App.Package\AppPackages\</AppInstallerUri>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <PackageCertificateKeyFile>Package.WinUI_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>C36FEB2A573AF2E3DD0737A454F36CB17B8C121C</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SkipOld|x64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SkipOld|arm64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SkipOld|x86'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

Emerald.App/Emerald.App.Package/Package.appxmanifest

@@ -11,7 +11,7 @@
   <Identity
     Name="Riverside.Emerald"
     Publisher="CN=NoobNotFound"
-    Version="0.7.8.0" />
+    Version="0.7.9.0" />
 
   <Properties>
     <DisplayName>Emerald</DisplayName>

Emerald.App/Emerald.App/Emerald.App.csproj

@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-	  <TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
+	  <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>Emerald.WinUI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+	  <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+	  <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <Configurations>Debug;Release</Configurations>
     <Nullable>enable</Nullable>
@@ -17,6 +18,7 @@
   <ItemGroup>
     <None Remove="GithubClientID.txt" />
     <None Remove="Helpers\rlbl1cxv.0sq~" />
+    <None Remove="MsalClientID.txt" />
     <None Remove="Restart.bat" />
     <None Remove="Views\Store\InstallerPage.xaml" />
   </ItemGroup>

Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs

@@ -51,6 +51,7 @@ public ObservableCollection<MinecraftVersion> CreateVersions()
                         Collection.Add(LoadCustomVers());
                     }
 
+                    AddItem("1.21");
                     AddItem("1.20");
                     AddItem("1.19");
                     AddItem("1.18");

Emerald.App/Emerald.App/Helpers/Updater/Updater.cs

@@ -81,14 +81,18 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
             if (!rel.Assets.Any(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower())))
             {
                 TasksHelper.CompleteTask(id, false, "NoMsixUpdate");
-               goto Return;
+
+                if (!OnlyInformifHigherAvailable)
+                    MessageBox.Show("Error".Localize(), "NoMsixUpdate".Localize(), Enums.MessageBoxButtons.Ok);
+
+                goto Return;
             }
             var asset = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower()));
             if (ver > currentver)
             {
                 TasksHelper.CompleteTask(id, true, "UpdateAvailable");
 
-                var msg = await MessageBox.Show("UpdateAvailable".Localize(), "##ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize());
+                var msg = await MessageBox.Show("UpdateAvailable".Localize(), "## Version: " + ver.ToString() + "\n\n###ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize());
                 if(msg == Enums.MessageBoxResults.Cancel)
                    goto Return;
 
@@ -100,8 +104,7 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
                 if(OnlyInformifHigherAvailable)
                     goto Return;
 
-                var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.CustomWithCancel,"Downgrade".Localize());
-                if (msg == Enums.MessageBoxResults.Cancel)
+                var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.Ok);
                    goto Return;
 
 
@@ -117,6 +120,8 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
                 goto Return;
             }
             var a = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower()));
+            if(a == null)
+                goto Return ;
             DownloadQAndInstallUpdate(a.BrowserDownloadUrl,a.Name);
 
         Return:

Emerald.App/Emerald.App/MainWindow.xaml.cs

@@ -210,7 +210,7 @@ void TintColor()
             };
 
             if (SS.Settings.App.Updates.CheckAtStartup)
-                App.Current.Updater.CheckForUpdates();
+                App.Current.Updater.CheckForUpdates(true);
             (Content as FrameworkElement).Loaded -= Initialize;
         }
         private static void UpdateUI()

Emerald.App/Emerald.App/Strings/en-US/Resources.resw

@@ -271,7 +271,7 @@
     <value>Load Mod</value>
   </data>
   <data name="LoadSettingsFailed" xml:space="preserve">
-    <value>Failed to load the app settings accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings</value>
+    <value>Failed to load the app settings and accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings</value>
   </data>
   <data name="Login" xml:space="preserve">
     <value>Login</value>
@@ -710,7 +710,7 @@
     <value>Downgrade Available</value>
   </data>
   <data name="DowngradeDescription" xml:space="preserve">
-    <value>The current version is higher than the latest version in the servers. You must be using a private beta. Do you want to downgrade?</value>
+    <value>The current version is higher than the latest version in the servers. You must be using a private beta. Please wait until a higher stable version be available</value>
   </data>
   <data name="DownloadingUpdate" xml:space="preserve">
     <value>Download Update</value>
@@ -719,7 +719,7 @@
     <value>Install Update</value>
   </data>
   <data name="NoMsixUpdate" xml:space="preserve">
-    <value>Failed to find the installer package in the release</value>
+    <value>Failed to find the installer package in the release for this architecture</value>
   </data>
   <data name="NoUpdates" xml:space="preserve">
     <value>You are on the latest version</value>
@@ -752,6 +752,6 @@
     <value>Updates</value>
   </data>
   <data name="UpdatesDescription" xml:space="preserve">
-    <value>Automatically update, include prerelease etc..</value>
+    <value>Auto update, include prerelease etc..</value>
   </data>
 </root>

Emerald.Core/Emerald.Core.csproj

@@ -1,20 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-	  <TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <RootNamespace>Emerald.Core</RootNamespace>
-      <Configurations>Debug;Release</Configurations>
-      <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
-      <RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CmlLib.Core" Version="3.3.10" />
-    <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
-    <PackageReference Include="ProjBobcat" Version="1.16.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="CmlLib.Core" Version="3.3.10" />
+		<PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" />
+		<PackageReference Include="ProjBobcat" Version="1.16.0" />
+	</ItemGroup>
 
 </Project>

Emerald.Core/Launcher.cs

@@ -12,7 +12,6 @@
 using Emerald.Core.Tasks;
 using ProjBobcat.Class.Model.Optifine;
 using System.ComponentModel;
-using Windows.System;
 using ProgressChangedEventArgs = Emerald.Core.Args.ProgressChangedEventArgs;
 
 namespace Emerald.Core

Emerald.CoreX/Core.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Logging;
+using CmlLib.Core;
+using CmlLib.Core.VersionMetadata;
+namespace Emerald.CoreX;
+
+public class Core(ILogger logger)
+{
+    public MinecraftLauncher Launcher { get; set; }
+    public void InitializeLauncher()
+    {
+        Launcher = new MinecraftLauncher();
+    }
+}

Emerald.CoreX/Emerald.CoreX.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="CmlLib.Core" Version="4.0.0" />
+		<PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+		<PackageReference Include="ProjBobcat" Version="1.16.0" />
+	</ItemGroup>
+</Project>

Emerald.CoreX/Enums/MCVersionType.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Enums
+{
+    public enum MCVersionType
+    {
+        Vanilla,
+        Fabric,
+        Lite,
+        Forge,
+        Optifine,
+        Undefined
+    }
+}

Emerald.CoreX/Installers/Fabric.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Installers
+{
+    internal class Fabric : IModLoaderInstaller
+    {
+    }
+}

Emerald.CoreX/Installers/Forge.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Installers
+{
+    internal class Forge : IModLoaderInstaller
+    {
+    }
+}

Emerald.CoreX/Installers/IModLoaderInstaller.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Installers
+{
+    internal interface IModLoaderInstaller
+    {
+
+    }
+}

Emerald.CoreX/Installers/LiteLoader.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Installers
+{
+    internal class LiteLoader: IModLoaderInstaller
+    {
+    }
+}

Emerald.CoreX/Installers/Optifine.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Installers
+{
+    internal class Optifine : IModLoaderInstaller
+    {
+    }
+}

Emerald.CoreX/Models/MCVersion.cs

@@ -0,0 +1,30 @@
+using CmlLib.Core.Version;
+using CmlLib.Core.VersionMetadata;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Emerald.CoreX.Enums;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX.Models
+{
+    public partial class MCVersion
+    {
+        public MCVersionType Type { get; private set; }
+        public MVersionType ReleaseType { get; private set; }
+
+        public string Name { get; private set; }
+
+        public string DisplayName { get; set; }
+
+        public IVersionMetadata Metadata { get; private set; }
+
+        public bool Local { get; private set; }
+
+        public MCVersion[] Subversions { get; private set; }
+
+    }
+}

Emerald.CoreX/Modrinth.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Emerald.CoreX
+{
+    internal class Modrinth
+    {
+    }
+}