Skip to content

Commit f4e4155

Browse files
committed
fixed some bugs that were introduced with the latest commit
1 parent fc0db84 commit f4e4155

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/HyperMC/HyperMcView.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public HyperMcView(IForgeClient forgeClient, IServiceProvider provider, IFileMan
4545
private async void HyperMcView_Load(object sender, EventArgs e)
4646
{
4747
SetView(new ControlView(pnl_MainArea));
48-
var mods = await _fileManager.ReadFile<ModpackData[]>(_settings.ModPacksFilePath);
48+
var mods = await _fileManager.ReadFile<ModpackData[]>(_settings.ModPacksFile);
4949
if (mods != null)
5050
{
5151
foreach (var mod in mods)
@@ -126,7 +126,7 @@ private async void ModpacksUpdated(object? sender, NotifyCollectionChangedEventA
126126
}
127127

128128
SortModpacks();
129-
await _fileManager.WriteToFile(_modpacks.ToArray(), $@"{_settings.ModPacksFilePath}\packs.json");
129+
await _fileManager.WriteToFile(_modpacks.ToArray(), _settings.ModPacksFile);
130130
}
131131

132132
private ModpackBox CreateModpackBox(ModpackData data)

src/HyperMC/Settings/ApplicationSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class AppSettings
1515
{
1616
public string AppPath { get; set; }
1717
public string DeafultMinecraftPath { get; set; }
18-
public string DefaultModPacksFilePath { get; set; }
18+
public string ModPacksFile { get; set; }
1919
public string DefaultModPacksPath { get; set; }
2020
public string SettingsFile { get; set; }
2121
}

src/HyperMC/Settings/IUserSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface IUserSettings
1010
{
1111
string MinecraftPath { get; }
1212
string ModPacksPath { get; }
13-
string ModPacksFilePath { get; }
13+
string ModPacksFile { get; }
1414

1515
Task Initialize();
1616
}

src/HyperMC/Settings/UserSettings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class UserSettings : IUserSettings
1919

2020
public string MinecraftPath { get; private set; }
2121
public string ModPacksPath { get; private set; }
22-
public string ModPacksFilePath { get; }
22+
public string ModPacksFile { get; }
2323

2424
public UserSettings(IFileManager fileManager, IConfiguration config)
2525
{
@@ -31,7 +31,7 @@ public UserSettings(IFileManager fileManager, IConfiguration config)
3131

3232
MinecraftPath = string.Format(settings.DeafultMinecraftPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
3333
ModPacksPath = string.Format(settings.DefaultModPacksPath, MinecraftPath);
34-
ModPacksFilePath = string.Format(settings.DefaultModPacksFilePath, ModPacksPath);
34+
ModPacksFile = string.Format(settings.ModPacksFile, ModPacksPath);
3535
}
3636

3737
public async Task Initialize()
@@ -41,17 +41,17 @@ public async Task Initialize()
4141
Directory.CreateDirectory(_appPath);
4242
}
4343

44-
if (!Directory.Exists(ModPacksFilePath))
44+
if (!Directory.Exists(ModPacksPath))
4545
{
46-
Directory.CreateDirectory(ModPacksFilePath);
46+
Directory.CreateDirectory(ModPacksPath);
4747
}
4848

4949
var settings = await _fileManager.ReadFile<UserSettings>(_settingsFile);
5050

5151
if (settings != null)
5252
{
5353
MinecraftPath = settings.MinecraftPath;
54-
ModPacksPath = settings.ModPacksFilePath;
54+
ModPacksPath = settings.ModPacksPath;
5555
}
5656
}
5757

src/HyperMC/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"AppPath": "{0}\\.hypermc",
44
"DeafultMinecraftPath": "{0}\\.minecraft",
55
"DefaultModPacksPath": "{0}\\ModPacks",
6-
"DefaultModPacksFilePath": "{0}\\packs.json",
6+
"ModPacksFile": "{0}\\packs.json",
77
"SettingsFile": "{0}\\settings.json"
88
}
99
}

0 commit comments

Comments
 (0)