From f811c60d0dd22754dab9fbf7f4b8ffa1982acef3 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Tue, 18 Jun 2024 00:49:30 +0530 Subject: [PATCH 01/15] Add support for 1.21 and bump version to 0.7.9 --- .../Emerald.App.Package/Package.WinUI.wapproj | 21 +++++++++---------- .../Emerald.App.Package/Package.appxmanifest | 2 +- .../Emerald.App/Helpers/MCVersionsCreator.cs | 1 + .../Emerald.App/Helpers/Updater/Updater.cs | 13 ++++++++---- Emerald.App/Emerald.App/MainWindow.xaml.cs | 2 +- .../Emerald.App/Strings/en-US/Resources.resw | 8 +++---- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index acbf8918..1bd0d770 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -55,9 +55,8 @@ True ..\Emerald.App\Emerald.App.csproj False - 9CBDFA6FDB25BE48AA09759C40DFAB769CF9740A SHA256 - True + False True x86|x64|arm64 D:\Projects\Emerald\Emerald.App\Emerald.App.Package\AppPackages\ @@ -66,31 +65,31 @@ Package.WinUI_TemporaryKey.pfx - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always diff --git a/Emerald.App/Emerald.App.Package/Package.appxmanifest b/Emerald.App/Emerald.App.Package/Package.appxmanifest index 6fcfd00a..0297724c 100644 --- a/Emerald.App/Emerald.App.Package/Package.appxmanifest +++ b/Emerald.App/Emerald.App.Package/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="0.7.9.0" /> Emerald diff --git a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs index 593bc3e4..dcb5ebae 100644 --- a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs +++ b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs @@ -51,6 +51,7 @@ public ObservableCollection CreateVersions() Collection.Add(LoadCustomVers()); } + AddItem("1.21"); AddItem("1.20"); AddItem("1.19"); AddItem("1.18"); diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index e62f920c..246642bb 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/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: diff --git a/Emerald.App/Emerald.App/MainWindow.xaml.cs b/Emerald.App/Emerald.App/MainWindow.xaml.cs index 7d2efe89..7147aef9 100644 --- a/Emerald.App/Emerald.App/MainWindow.xaml.cs +++ b/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() diff --git a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw index 2c910bf2..54116319 100644 --- a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw +++ b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw @@ -271,7 +271,7 @@ Load Mod - 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 + 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 Login @@ -710,7 +710,7 @@ Downgrade Available - The current version is higher than the latest version in the servers. You must be using a private beta. Do you want to downgrade? + 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 Download Update @@ -719,7 +719,7 @@ Install Update - Failed to find the installer package in the release + Failed to find the installer package in the release for this architecture You are on the latest version @@ -752,6 +752,6 @@ Updates - Automatically update, include prerelease etc.. + Auto update, include prerelease etc.. \ No newline at end of file From 08e570a19db52df189ac113eaf22bf31f48e9866 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Mon, 8 Jul 2024 18:45:30 +0530 Subject: [PATCH 02/15] Change package certificate --- Emerald.App/Emerald.App.Package/Package.WinUI.wapproj | 1 + Emerald.App/Emerald.App/Emerald.App.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index 1bd0d770..c76b14af 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -63,6 +63,7 @@ 0 False Package.WinUI_TemporaryKey.pfx + C36FEB2A573AF2E3DD0737A454F36CB17B8C121C Always diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index c7a83d17..b80e8e74 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -17,6 +17,7 @@ + From 45afa063198ccf2c806d6f0c5290028f9ec0c25b Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sat, 13 Jul 2024 08:33:21 +0100 Subject: [PATCH 03/15] Update license year Signed-off-by: Lamparter --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9faa88e..2095061e 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,6 @@ git clone https://github.com/RiversideValley/Emerald ## ⚖️ License -Copyright (c) 2022-2023 Riverside Valley Corporation +Copyright (c) 2022-2024 Riverside Valley Corporation -Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). \ No newline at end of file +Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). From a61f19f39f57e306c60460cf33d4ae10c6a0433c Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:38:01 +0100 Subject: [PATCH 04/15] Update `README.md` Signed-off-by: Lamparter --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2095061e..48ada146 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,12 @@ Release - + Release + + Platform +


From c52a03727d9386195829d464a64e70db5f51fbb6 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:40:17 +0100 Subject: [PATCH 05/15] Update `README.md` Signed-off-by: Lamparter --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 48ada146..33d42427 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,9 @@ Platform + + Platform +


From e8a45fb7075c84843229a068997a68a67cb3cc05 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:44:26 +0100 Subject: [PATCH 06/15] Fix screenshot in `README.md` Finally! Signed-off-by: Lamparter --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 33d42427..a36c1442 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,7 @@ See [this section](#-building-the-code) ### 📸 Screenshots - - Release - +[![Emerald screenshot](https://user-images.githubusercontent.com/71598437/212673147-54e79843-76aa-44ff-9db3-60b025334f07.png)](https://github.com/RiversideValley/Emerald) ## 🦜 Contributing & Feedback From 162bab62b6325ff0f41a88337a3c54e97bdf4e2d Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:48:57 +0100 Subject: [PATCH 07/15] Revise license Signed-off-by: Lamparter --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 16dd4827..f28a54a9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,8 +1,8 @@ **Nightshade Vexillum License** ``` -Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help other cultures read the text at their convenience, if some words may be unclear to them. -The Emoji contained within these documents are may not wholly represent the associated meaning, and the First Party does not warrant the misunderstanding of such. +Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help others understand the text at their convenience, if some words may be unclear to them. +The Emoji contained within these documents may not wholly convey the associated meaning, and the First Party does not warrant the misunderstanding of such. ``` ## 📖 Definitions From e28d758904c8be97f68ca694f4e2c3e3b92bc17f Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:53:05 +0100 Subject: [PATCH 08/15] Remove spelling mistakes in files that reference 'Extensions.cs' (#38) --- Emerald.App/Emerald.App/DirectResources.cs | 2 +- .../Emerald.App/Helpers/{Extentions.cs => Extensions.cs} | 2 +- Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml | 2 +- Emerald.Core/{Extentions.cs => Extensions.cs} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename Emerald.App/Emerald.App/Helpers/{Extentions.cs => Extensions.cs} (99%) rename Emerald.Core/{Extentions.cs => Extensions.cs} (86%) diff --git a/Emerald.App/Emerald.App/DirectResources.cs b/Emerald.App/Emerald.App/DirectResources.cs index 6c4bb36d..aad5c3dd 100644 --- a/Emerald.App/Emerald.App/DirectResources.cs +++ b/Emerald.App/Emerald.App/DirectResources.cs @@ -8,7 +8,7 @@ namespace Emerald.WinUI; public static class DirectResoucres { public static int MaxRAM - => Extentions.GetMemoryGB() * 1024; + => Extensions.GetMemoryGB() * 1024; public static int MinRAM => 512; diff --git a/Emerald.App/Emerald.App/Helpers/Extentions.cs b/Emerald.App/Emerald.App/Helpers/Extensions.cs similarity index 99% rename from Emerald.App/Emerald.App/Helpers/Extentions.cs rename to Emerald.App/Emerald.App/Helpers/Extensions.cs index 42278a2d..2d61c177 100644 --- a/Emerald.App/Emerald.App/Helpers/Extentions.cs +++ b/Emerald.App/Emerald.App/Helpers/Extensions.cs @@ -12,7 +12,7 @@ namespace Emerald.WinUI.Helpers { - public static class Extentions + public static class Extensions { private static readonly ConcurrentDictionary cachedResources = new(); diff --git a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml index 587318ed..062991dc 100644 --- a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml +++ b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml @@ -34,7 +34,7 @@ | - Downloads + Downloads diff --git a/Emerald.Core/Extentions.cs b/Emerald.Core/Extensions.cs similarity index 86% rename from Emerald.Core/Extentions.cs rename to Emerald.Core/Extensions.cs index ebcfec9a..429795d7 100644 --- a/Emerald.Core/Extentions.cs +++ b/Emerald.Core/Extensions.cs @@ -1,6 +1,6 @@ namespace Emerald.Core { - public static class Extentions + public static class Extensions { public static string ToFullVersion(this ProjBobcat.Class.Model.Optifine.OptifineDownloadVersionModel x) => $"{x.McVersion}-Optifine_{x.Type}_{x.Patch}"; From f9152245ac5751f0bd40bbccc078ddf4a62e2e15 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 19:09:13 +0100 Subject: [PATCH 09/15] Update `README.md` Signed-off-by: Lamparter --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a36c1442..e3e19bd1 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Release - + Release - + Platform - + Platform

From 5b2775d41f9aa58846e9a7804b28509f6fd98f16 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 21:16:27 +0100 Subject: [PATCH 10/15] Update CODEOWNERS Signed-off-by: Lamparter --- CODEOWNERS | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index cd5f9dec..e1fcfd32 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,10 +7,9 @@ * @RiversideValley/Emerald @NoobNotFound /Emerald.*/ @RiversideValley/Emerald Emerald.* @RiversideValley/Emerald -.editorconfig @RiversideValley/Emerald -*.md @Lamparter git@theriversi.de lamparter@theriversi.de -/.github/ @RiversideValley/Emerald -.gitattributes @RiversideValley/Emerald +*.md @Lamparter +/.github/ @Lamparter +.gitattributes @Lamparter .gitignore @RiversideValley/Emerald -.gitmodules @RiversideValley/Emerald -LICENSE.md @Lamparter git@theriversi.de lamparter@theriversi.de +.gitmodules @NoobNotFound +LICENSE.md @Lamparter From 61e988df0cd00e03863c4014c8ad1b5041f6cff0 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 25 Aug 2024 09:46:26 +0100 Subject: [PATCH 11/15] Implement MIT licence (#44) --- LICENSE.md | 53 +++++++++-------------------------------------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f28a54a9..b5afa333 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,56 +1,21 @@ -**Nightshade Vexillum License** +MIT License -``` -Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help others understand the text at their convenience, if some words may be unclear to them. -The Emoji contained within these documents may not wholly convey the associated meaning, and the First Party does not warrant the misunderstanding of such. -``` +Copyright (c) 2021-2024 Riverside Valley Corporation -## 📖 Definitions - -#### **SOFTWARE** - -The Software is the source-code, executable files, documentation and all associated documents, usually found within this repository. - -#### **FIRST PARTY** - -The First Party are the Copyright Holders of the Software, as defined in **1️⃣ Section I: Parties**. - -#### **THIRD PARTY** - -The Third Party is any party that is **not** the First Party - see the **📖 Oxford English Dictionary** for details. - -#### **Eligible Party** - -An Eligible Party is a party that has been accepted by the First Party. By default manner, the First Party automatically accepts any party that wishes to use the software with no medium of communication other than this license required. The First Party may restrict this license for a Third Party, under any period of time, per their discretion. - - ---- - -### 1️⃣ Section I: Parties - -Copyright (c) 2021-2024 Riverside Valley (the "First Party") - -Licensed to any Eligible Party. - - -### 2️⃣ Section II: Licensing - - - -Permission is hereby granted, free of charge, to any Eligible Party obtaining a substantial portion -of this Software, to deal in the Software without restriction, including without limitation the rights +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -THE FIRST PARTY ASSERTS THE MORAL RIGHT TO BE IDENTIFIED AS THE DEVELOPER OR PRODUCER OF THIS SOFTWARE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.** - -**IF A THIRD PARTY CONTRADICTS THIS LICENSE, WITHOUT PERMISSION BY MEDIUM OF OFFICIAL COMMUNICATION, THE FIRST PARTY RESERVES THE RIGHT, IN THE NAME OF THE LAW TO CLAIM OR SEIZE THE CONTRADICTING SOFTWARE RIGHTFULLY AND SHOULD NOT BE HINDERED TO DO SO, PER THE FIRST PARTY'S DISCRETION.** +SOFTWARE. From f28a86ca3765465b88a1d8266699b1c6f3908910 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 25 Aug 2024 09:53:54 +0100 Subject: [PATCH 12/15] Remove contributor section from `README.md` Signed-off-by: Lamparter --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index e3e19bd1..5f12a41c 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,6 @@ There are multiple ways to participate in the community: └──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft ``` -### 🗃️ Contributors - - - - - ## 🔨 Building the Code ### 1️⃣ Prerequisites From feb904d14a916c7da77644b01ca9f9cd12dac6ac Mon Sep 17 00:00:00 2001 From: Lamparter Date: Wed, 28 Aug 2024 17:24:31 +0100 Subject: [PATCH 13/15] Add new screenshot Signed-off-by: Lamparter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f12a41c..05d16b5b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ See [this section](#-building-the-code) ### 📸 Screenshots -[![Emerald screenshot](https://user-images.githubusercontent.com/71598437/212673147-54e79843-76aa-44ff-9db3-60b025334f07.png)](https://github.com/RiversideValley/Emerald) +[![emerald-screenshot](https://github.com/user-attachments/assets/eb65ec6e-3dce-46a9-8f0a-1ffaf9dc43c3)](https://github.com/RiversideValley/Emerald) ## 🦜 Contributing & Feedback From 9592ac2f245f6b694e61cf78d346ee0f03198f49 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sat, 31 Aug 2024 22:48:04 +0100 Subject: [PATCH 14/15] Fix grammar mistake in README Signed-off-by: Lamparter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05d16b5b..7b206fed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 💎 Emerald -#### A swift Minecraft launcher made using WinUI technologies in the fast C# language really pushes the boundary of the platform. +#### A swift Minecraft launcher made using WinUI technologies in the fast C# language that really pushes the boundary of the platform.

From 9c000531f754a4562f6ae1dd0d9560bdfed5077a Mon Sep 17 00:00:00 2001 From: Lamparter Date: Mon, 2 Sep 2024 11:28:34 +0100 Subject: [PATCH 15/15] Add hero image to `README.md` (#51) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b206fed..f7139fd5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 💎 Emerald +![Emerald Banner](https://github.com/user-attachments/assets/dbe4839c-eddf-49fa-97cc-edbd70b3d81f) #### A swift Minecraft launcher made using WinUI technologies in the fast C# language that really pushes the boundary of the platform.