diff --git a/ModpackUpdater.Manager/ModpackInstaller.cs b/ModpackUpdater.Manager/ModpackInstaller.cs index a7f0a52..fdab3b4 100644 --- a/ModpackUpdater.Manager/ModpackInstaller.cs +++ b/ModpackUpdater.Manager/ModpackInstaller.cs @@ -42,10 +42,7 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf InstallInfos installInfos = null; UpdateInfos updateInfos = null; var hasConfig = modpackInfo.Exists; - var result = new UpdateCheckResult - { - HasExtras = options.IncludeExtraActions - }; + var result = new UpdateCheckResult(); if (updateConfig.Maintenance && !options.IgnoreMaintenance) { @@ -177,7 +174,6 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf // Save new modpack info modpackInfo.Version = checkResult.LatestVersion; modpackInfo.ConfigUrl = updateConfig.ConfigUrl; - modpackInfo.IncludeExtras = checkResult.HasExtras; modpackInfo.Save(); // Delete cached zip files diff --git a/ModpackUpdater.Manager/UpdateCheckResult.cs b/ModpackUpdater.Manager/UpdateCheckResult.cs index 49f1b62..658f208 100644 --- a/ModpackUpdater.Manager/UpdateCheckResult.cs +++ b/ModpackUpdater.Manager/UpdateCheckResult.cs @@ -11,5 +11,4 @@ public class UpdateCheckResult public bool HasError { get; set; } public bool IsInMaintenance { get; set; } public bool HasUpdates => !IsInstalled || CurrentVersion < LatestVersion; - public bool HasExtras { get; set; } } \ No newline at end of file diff --git a/ModpackUpdater.Model/ModpackInfo.cs b/ModpackUpdater.Model/ModpackInfo.cs index eb09a51..5ca74b1 100644 --- a/ModpackUpdater.Model/ModpackInfo.cs +++ b/ModpackUpdater.Model/ModpackInfo.cs @@ -11,7 +11,6 @@ public class ModpackInfo [JsonConverter(typeof(VersionConverter))] public Version Version { get; set; } public string ConfigUrl { get; set; } - public bool IncludeExtras { get; set; } [JsonIgnore] public string LocaLPath { get; private set; } [JsonIgnore] diff --git a/ModpackUpdater/Form1.Designer.cs b/ModpackUpdater/Form1.Designer.cs index 552dea5..0f3eddc 100644 --- a/ModpackUpdater/Form1.Designer.cs +++ b/ModpackUpdater/Form1.Designer.cs @@ -48,7 +48,6 @@ namespace ModpackUpdater RadButton_SearchMinecraftProfileFolder = new Telerik.WinControls.UI.RadButton(); tableLayoutPanel1 = new TableLayoutPanel(); radButton_RefreshConfig = new Telerik.WinControls.UI.RadButton(); - radCheckBox_IncludeExtras = new Telerik.WinControls.UI.RadCheckBox(); ((System.ComponentModel.ISupportInitialize)RadLabel1).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel2).BeginInit(); ((System.ComponentModel.ISupportInitialize)RadLabel3).BeginInit(); @@ -62,7 +61,6 @@ namespace ModpackUpdater ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).BeginInit(); tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).BeginInit(); - ((System.ComponentModel.ISupportInitialize)radCheckBox_IncludeExtras).BeginInit(); ((System.ComponentModel.ISupportInitialize)this).BeginInit(); SuspendLayout(); // @@ -222,7 +220,6 @@ namespace ModpackUpdater tableLayoutPanel1.Controls.Add(RadButton_PasteModpackConfig, 3, 3); tableLayoutPanel1.Controls.Add(RadButton_Install, 5, 5); tableLayoutPanel1.Controls.Add(radButton_RefreshConfig, 2, 3); - tableLayoutPanel1.Controls.Add(radCheckBox_IncludeExtras, 0, 5); tableLayoutPanel1.Dock = DockStyle.Fill; tableLayoutPanel1.Location = new Point(0, 0); tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -248,17 +245,6 @@ namespace ModpackUpdater radButton_RefreshConfig.Text = "Reload"; radButton_RefreshConfig.Click += RadButton_RefreshConfig_Click; // - // radCheckBox_IncludeExtras - // - radCheckBox_IncludeExtras.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - radCheckBox_IncludeExtras.AutoSize = false; - radCheckBox_IncludeExtras.Location = new Point(3, 147); - radCheckBox_IncludeExtras.Name = "radCheckBox_IncludeExtras"; - radCheckBox_IncludeExtras.Size = new Size(144, 24); - radCheckBox_IncludeExtras.TabIndex = 12; - radCheckBox_IncludeExtras.Text = "Include extra files"; - radCheckBox_IncludeExtras.ToggleStateChanged += RadCheckBox_IncludeExtras_ToggleStateChanged; - // // Form1 // AutoScaleBaseSize = new Size(7, 15); @@ -287,7 +273,6 @@ namespace ModpackUpdater ((System.ComponentModel.ISupportInitialize)RadButton_SearchMinecraftProfileFolder).EndInit(); tableLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)radButton_RefreshConfig).EndInit(); - ((System.ComponentModel.ISupportInitialize)radCheckBox_IncludeExtras).EndInit(); ((System.ComponentModel.ISupportInitialize)this).EndInit(); ResumeLayout(false); } @@ -305,6 +290,5 @@ namespace ModpackUpdater internal Telerik.WinControls.UI.RadButton RadButton_PasteModpackConfig; private TableLayoutPanel tableLayoutPanel1; private Telerik.WinControls.UI.RadButton radButton_RefreshConfig; - private Telerik.WinControls.UI.RadCheckBox radCheckBox_IncludeExtras; } } \ No newline at end of file diff --git a/ModpackUpdater/Form1.cs b/ModpackUpdater/Form1.cs index c772d0d..c52a5d7 100644 --- a/ModpackUpdater/Form1.cs +++ b/ModpackUpdater/Form1.cs @@ -35,7 +35,6 @@ public partial class Form1 RadButton_Install.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SvgImageSize.Small); RadButton_CheckForUpdates.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SvgImageSize.Small); - RadButton_EditModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.wrench, SvgImageSize.Small); radButton_RefreshConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.refresh, SvgImageSize.Small); RadButton_SearchMinecraftProfileFolder.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.opened_folder, SvgImageSize.Small); RadButton_SearchModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.opened_folder, SvgImageSize.Small); @@ -113,7 +112,6 @@ public partial class Form1 LoadUpdateConfigFile(modpackInfo.ConfigUrl); else RadButton_CheckForUpdates.PerformClick(); - radCheckBox_IncludeExtras.Checked = modpackInfo.IncludeExtras; } else ClearStatus(); @@ -262,12 +260,10 @@ public partial class Form1 { AppConfig.Instance.LastMinecraftProfilePath = RadTextBoxControl_MinecraftProfileFolder.Text; AppConfig.Instance.LastConfigFilePath = RadTextBoxControl_ModpackConfig.Text; - AppConfig.Instance.LastIncludeExtras = radCheckBox_IncludeExtras.Checked; } private void Form1_Load(object sender, EventArgs e) { - radCheckBox_IncludeExtras.Checked = updateOptions.IncludeExtraActions || AppConfig.Instance.LastIncludeExtras; if (Directory.Exists(AppConfig.Instance.LastMinecraftProfilePath)) LoadMinecraftProfile(AppConfig.Instance.LastMinecraftProfilePath); if (!string.IsNullOrWhiteSpace(AppConfig.Instance.LastConfigFilePath)) @@ -285,9 +281,4 @@ public partial class Form1 Application.Restart(); } } - - private void RadCheckBox_IncludeExtras_ToggleStateChanged(object sender, StateChangedEventArgs args) - { - updateOptions.IncludeExtraActions = radCheckBox_IncludeExtras.Checked; - } } \ No newline at end of file