LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-11 10:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3dSkinRenderer

Browse Source
This commit is contained in:
miku-666
2024-08-09 19:29:40 +02:00
parent fac16190a7 9af1db72d4
commit 6d573fed14
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PCK-Studio/Internal/App/ApplicationScope.cs
View File

@@ -45,7 +45,6 @@ namespace PckStudio.Internal.App
_ = Tiles.ExperienceOrbImageList;
_ = Tiles.MoonPhaseImageList;
_ = Tiles.PaintingImageList;
SettingsManager.Initialize();
CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
Task.Run(GetContributors);
}

28
PCK-Studio/Internal/App/SettingsManager.cs
View File

@@ -23,21 +23,25 @@ using PckStudio.Properties;
namespace PckStudio.Internal.App
{
internal static class SettingsManager
internal sealed class SettingsManager
{
private static Dictionary<string, Action<object>> _registery = new Dictionary<string, Action<object>>();
public static SettingsManager Default { get; } = new SettingsManager(Settings.Default);
private static object _newValue = null;
private Dictionary<string, Action<object>> _registery = new Dictionary<string, Action<object>>();
internal static void Initialize()
private object _newValue = null;
private SettingsBase _settings = null;
internal SettingsManager(ApplicationSettingsBase settings)
{
Settings.Default.PropertyChanged += PropertyChangedHandler;
Settings.Default.SettingChanging += SettingChangingHandler;
_settings = settings;
settings.PropertyChanged += PropertyChangedHandler;
settings.SettingChanging += SettingChangingHandler;
}
internal static bool RegisterPropertyChangedCallback<TSettingsType>(string propertyName, Action<TSettingsType> callback)
internal bool RegisterPropertyChangedCallback<TSettingsType>(string propertyName, Action<TSettingsType> callback)
{
Type propertyType = Settings.Default[propertyName].GetType();
Type propertyType = _settings[propertyName].GetType();
if (!propertyType.Equals(typeof(TSettingsType)))
{
return false;
@@ -45,12 +49,12 @@ namespace PckStudio.Internal.App
return RegisterPropertyChangedCallback(propertyName, delegate (object obj) { callback((TSettingsType)obj); });
}
internal static bool RegisterPropertyChangedCallback(string propertyName, Action callback)
internal bool RegisterPropertyChangedCallback(string propertyName, Action callback)
{
return RegisterPropertyChangedCallback(propertyName, delegate (object _) { callback(); });
}
private static bool RegisterPropertyChangedCallback(string propertyName, Action<object> callback)
private bool RegisterPropertyChangedCallback(string propertyName, Action<object> callback)
{
if (_registery.ContainsKey(propertyName))
return false;
@@ -58,7 +62,7 @@ namespace PckStudio.Internal.App
return true;
}
private static void PropertyChangedHandler(object sender, PropertyChangedEventArgs e)
private void PropertyChangedHandler(object sender, PropertyChangedEventArgs e)
{
if (_registery.ContainsKey(e.PropertyName))
{
@@ -67,7 +71,7 @@ namespace PckStudio.Internal.App
}
}
private static void SettingChangingHandler(object sender, SettingChangingEventArgs e)
private void SettingChangingHandler(object sender, SettingChangingEventArgs e)
{
if (_registery.ContainsKey(e.SettingName))
{

2
PCK-Studio/Internal/Misc/RichPresenceClient.cs
View File

@@ -43,7 +43,7 @@ namespace PckStudio.Internal.Misc
{
Client.Initialize();
}
SettingsManager.RegisterPropertyChangedCallback<bool>(nameof(Settings.Default.ShowRichPresence), state =>
SettingsManager.Default.RegisterPropertyChangedCallback<bool>(nameof(Settings.Default.ShowRichPresence), state =>
{
if (state)
{

4
PCK-Studio/MainForm.cs
View File

@@ -163,11 +163,11 @@ namespace PckStudio
private void MainForm_Load(object sender, EventArgs e)
{
SettingsManager.RegisterPropertyChangedCallback<bool>(nameof(Settings.Default.UseLittleEndianAsDefault), state =>
SettingsManager.Default.RegisterPropertyChangedCallback<bool>(nameof(Settings.Default.UseLittleEndianAsDefault), state =>
{
LittleEndianCheckBox.Checked = state;
});
SettingsManager.RegisterPropertyChangedCallback(nameof(Settings.Default.LoadSubPcks), () =>
SettingsManager.Default.RegisterPropertyChangedCallback(nameof(Settings.Default.LoadSubPcks), () =>
{
if (currentPCK is not null)
{