Skip to content

Commit 3a89a5a

Browse files
committed
up 整合包特殊文件位置
1 parent bf40377 commit 3a89a5a

7 files changed

Lines changed: 19 additions & 9 deletions

File tree

src/ColorMC.Core/Helpers/CurseForgeHelper.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static FileItemObj MakeDownloadObj(this CurseForgeModObj.CurseForgeDataOb
9090
{
9191
Url = data.DownloadUrl,
9292
Name = data.DisplayName,
93-
Local = Path.Combine(obj.GetGamePath(), info.File, data.FileName),
93+
Local = Path.Combine(obj.GetGamePath(), info.FilePath, data.FileName),
9494
Sha1 = data.Hashes.Where(a => a.Algo == 1)
9595
.Select(a => a.Value).FirstOrDefault()
9696
};
@@ -331,7 +331,7 @@ public static async Task<ItemPathRes> GetItemPathAsync(this GameSettingObj game,
331331
{
332332
var item1 = new ItemPathRes()
333333
{
334-
File = game.GetModsPath(),
334+
FilePath = game.GetModsPath(),
335335
Path = Names.NameGameModDir,
336336
FileType = FileType.Mod
337337
};
@@ -347,24 +347,31 @@ public static async Task<ItemPathRes> GetItemPathAsync(this GameSettingObj game,
347347
if (info1.Data.Categories.Any(item => item.ClassId == CurseForgeAPI.ClassResourcepack)
348348
|| info1.Data.ClassId == CurseForgeAPI.ClassResourcepack)
349349
{
350-
item1.File = game.GetResourcepacksPath();
350+
item1.FilePath = game.GetResourcepacksPath();
351351
item1.Path = Names.NameGameResourcepackDir;
352352
item1.FileType = FileType.Resourcepack;
353353
}
354354
else if (info1.Data.Categories.Any(item => item.ClassId == CurseForgeAPI.ClassShaderpack)
355355
|| info1.Data.ClassId == CurseForgeAPI.ClassShaderpack)
356356
{
357-
item1.File = game.GetShaderpacksPath();
357+
item1.FilePath = game.GetShaderpacksPath();
358358
item1.Path = Names.NameGameShaderpackDir;
359359
item1.FileType = FileType.Shaderpack;
360360
}
361361
else if (info1.Data.Categories.Any(item => item.ClassId == CurseForgeAPI.ClassWorld)
362362
|| info1.Data.ClassId == CurseForgeAPI.ClassWorld)
363363
{
364-
item1.File = game.GetSavesPath();
364+
item1.FilePath = game.GetSavesPath();
365365
item1.Path = Names.NameGameSavesDir;
366366
item1.FileType = FileType.Save;
367367
}
368+
else if (info1.Data.Categories.Any(item => item.ClassId == CurseForgeAPI.ClassOpenLoaderDataPack)
369+
|| info1.Data.ClassId == CurseForgeAPI.ClassOpenLoaderDataPack)
370+
{
371+
item1.FilePath = Path.Combine(game.GetConfigPath(), Names.NameOpenLoaderDir, Names.NameDataDir);
372+
item1.Path = $"{Names.NameGameConfigDir}/{Names.NameOpenLoaderDir}/{Names.NameDataDir}";
373+
item1.FileType = FileType.OpenLoaderDataPack;
374+
}
368375
}
369376

370377
return item1;

src/ColorMC.Core/Names.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public static class Names
2929
public const string NameJavaDir = "java";
3030
public const string NameJsonDir = "patches";
3131
public const string NameDefaultDir = "default";
32+
public const string NameOpenLoaderDir = "openloader";
33+
public const string NameDataDir = "data";
3234

3335
public const string NameModInfoFile = "modfileinfo.json";
3436
public const string NameGameFile = "game.json";

src/ColorMC.Core/Net/Apis/CurseForgeAPI.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public static class CurseForgeAPI
1919
public const int ClassWorld = 17;
2020
public const int ClassResourcepack = 12;
2121
public const int ClassShaderpack = 6552;
22+
public const int ClassOpenLoaderDataPack = 6945;
2223

2324
public const int CategoryIdDataPacks = 5193;
2425

src/ColorMC.Core/Objs/Enums.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public enum FileType
117117
Modpack, Mod, Save, Shaderpack, Resourcepack, DataPacks, Schematic,
118118
Java, Game, Config, AuthConfig, Pic, Optifine, Skin, Music,
119119
Text, GameIcon, Head, JavaZip, Loader, InputConfig,
120-
User, Cmd, Icon, StartIcon, File
120+
User, Cmd, Icon, StartIcon, File, OpenLoaderDataPack
121121
}
122122

123123
/// <summary>

src/ColorMC.Core/Objs/Results.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public record MakeDownloadItemsRes : BaseRes
127127
/// </summary>
128128
public record ItemPathRes
129129
{
130-
public string File;
130+
public string FilePath;
131131
public string Path;
132132
public FileType FileType;
133133
}

src/ColorMC.Gui/Resource/ResourceDictionary1.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</StackPanel>
4949
</DataTemplate>
5050
<DataTemplate x:Key="ModCell1" DataType="vm:ModNodeModel">
51-
<CheckBox IsChecked="{Binding Enable, Mode=TwoWay}" />
51+
<CheckBox IsChecked="{Binding Enable, Mode=TwoWay}" IsEnabled="False" />
5252
</DataTemplate>
5353
<DataTemplate x:Key="ModCell2" DataType="vm:ModNodeModel">
5454
<TextBlock Text="{Binding Text, Mode=TwoWay}" />

src/ColorMC.Gui/UI/Controls/GameEdit/Tab4Control.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void DataGrid1_DoubleTapped(object? sender, RoutedEventArgs e)
6262
{
6363
if (node.IsGroup)
6464
{
65-
model.DisableEnableMod(node.Children);
65+
//model.DisableEnableMod(node.Children);
6666
}
6767
else
6868
{

0 commit comments

Comments
 (0)