Merge pull request #510 from 4sval/dev

Dev
4sval · Oct 23, 2024 · d132bc4 · d132bc4
2 parents bcbda59 + c6c8cf2
commit d132bc4
Show file tree

Hide file tree

Showing 58 changed files with 1,898 additions and 390 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs
@@ -97,14 +97,16 @@ protected override void OnStartup(StartupEventArgs e)
         Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data"));
 
 #if DEBUG
-        Log.Logger = new LoggerConfiguration().WriteTo.Console(theme: AnsiConsoleTheme.Literate).CreateLogger();
+        Log.Logger = new LoggerConfiguration().WriteTo.Console(theme: AnsiConsoleTheme.Literate).WriteTo.File(
+            Path.Combine(UserSettings.Default.OutputDirectory, "Logs", $"FModel-Debug-Log-{DateTime.Now:yyyy-MM-dd}.txt"),
+            outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss} [FModel] [{Level:u3}] {Message:lj}{NewLine}{Exception}").CreateLogger();
 #else
         Log.Logger = new LoggerConfiguration().WriteTo.Console(theme: AnsiConsoleTheme.Literate).WriteTo.File(
             Path.Combine(UserSettings.Default.OutputDirectory, "Logs", $"FModel-Log-{DateTime.Now:yyyy-MM-dd}.txt"),
             outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss} [FModel] [{Level:u3}] {Message:lj}{NewLine}{Exception}").CreateLogger();
 #endif
 
-        Log.Information("Version {Version}", Constants.APP_VERSION);
+        Log.Information("Version {Version} ({CommitId})", Constants.APP_VERSION, Constants.APP_COMMIT_ID);
         Log.Information("{OS}", GetOperatingSystemProductName());
         Log.Information("{RuntimeVer}", RuntimeInformation.FrameworkDescription);
         Log.Information("Culture {SysLang}", CultureInfo.CurrentCulture);
@@ -140,7 +142,7 @@ private void OnUnhandledException(object sender, DispatcherUnhandledExceptionEve
         if (messageBox.Result == MessageBoxResult.Custom && (EErrorKind) messageBox.ButtonPressed.Id != EErrorKind.Ignore)
         {
             if ((EErrorKind) messageBox.ButtonPressed.Id == EErrorKind.ResetSettings)
-                UserSettings.Default = new UserSettings();
+                UserSettings.Delete();
 
             ApplicationService.ApplicationView.Restart();
         }

diff --git a/FModel/Constants.cs b/FModel/Constants.cs
@@ -1,12 +1,20 @@
-using System.Numerics;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Numerics;
 using System.Reflection;
 using CUE4Parse.UE4.Objects.Core.Misc;
+using FModel.Extensions;
 
 namespace FModel;
 
 public static class Constants
 {
-    public static readonly string APP_VERSION = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
+    public static readonly string APP_PATH = Path.GetFullPath(Environment.GetCommandLineArgs()[0]);
+    public static readonly string APP_VERSION = FileVersionInfo.GetVersionInfo(APP_PATH).FileVersion;
+    public static readonly string APP_COMMIT_ID = FileVersionInfo.GetVersionInfo(APP_PATH).ProductVersion.SubstringAfter('+');
+    public static readonly string APP_SHORT_COMMIT_ID = APP_COMMIT_ID[..7];
+
     public const string ZERO_64_CHAR = "0000000000000000000000000000000000000000000000000000000000000000";
     public static readonly FGuid ZERO_GUID = new(0U);
 
@@ -21,6 +29,9 @@ public static class Constants
     public const string BLUE = "#528BCC";
 
     public const string ISSUE_LINK = "https://github.com/4sval/FModel/discussions/categories/q-a";
+    public const string GH_REPO = "https://api.github.com/repos/4sval/FModel";
+    public const string GH_COMMITS_HISTORY = GH_REPO + "/commits";
+    public const string GH_RELEASES = GH_REPO + "/releases";
     public const string DONATE_LINK = "https://fmodel.app/donate";
     public const string DISCORD_LINK = "https://fmodel.app/discord";
 

diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs
@@ -31,25 +31,33 @@ public void ParseForReward(bool isUsingDisplayAsset)
     {
         // rarity
         if (Object.TryGetValue(out FPackageIndex series, "Series")) GetSeries(series);
-        else if (Object.TryGetValue(out FInstancedStruct[] dataList, "DataList")) GetSeries(dataList);
         else if (Object.TryGetValue(out FStructFallback componentContainer, "ComponentContainer")) GetSeries(componentContainer);
         else GetRarity(Object.GetOrDefault("Rarity", EFortRarity.Uncommon)); // default is uncommon
 
+        if (Object.TryGetValue(out FInstancedStruct[] dataList, "DataList"))
+        {
+            GetSeries(dataList);
+            Preview = Utils.GetBitmap(dataList);
+        }
+
         // preview
-        if (isUsingDisplayAsset && Utils.TryGetDisplayAsset(Object, out var preview))
-            Preview = preview;
-        else if (Object.TryGetValue(out FPackageIndex itemDefinition, "HeroDefinition", "WeaponDefinition"))
-            Preview = Utils.GetBitmap(itemDefinition);
-        else if (Object.TryGetValue(out FSoftObjectPath largePreview, "LargePreviewImage", "EntryListIcon", "SmallPreviewImage", "BundleImage", "ItemDisplayAsset", "LargeIcon", "ToastIcon", "SmallIcon"))
-            Preview = Utils.GetBitmap(largePreview);
-        else if (Object.TryGetValue(out string s, "LargePreviewImage") && !string.IsNullOrEmpty(s))
-            Preview = Utils.GetBitmap(s);
-        else if (Object.TryGetValue(out FPackageIndex otherPreview, "SmallPreviewImage", "ToastIcon", "access_item"))
-            Preview = Utils.GetBitmap(otherPreview);
-        else if (Object.TryGetValue(out UMaterialInstanceConstant materialInstancePreview, "EventCalloutImage"))
-            Preview = Utils.GetBitmap(materialInstancePreview);
-        else if (Object.TryGetValue(out FStructFallback brush, "IconBrush") && brush.TryGetValue(out UTexture2D res, "ResourceObject"))
-            Preview = Utils.GetBitmap(res);
+        if (Preview is null)
+        {
+            if (isUsingDisplayAsset && Utils.TryGetDisplayAsset(Object, out var preview))
+                Preview = preview;
+            else if (Object.TryGetValue(out FPackageIndex itemDefinition, "HeroDefinition", "WeaponDefinition"))
+                Preview = Utils.GetBitmap(itemDefinition);
+            else if (Object.TryGetValue(out FSoftObjectPath largePreview, "LargePreviewImage", "EntryListIcon", "SmallPreviewImage", "BundleImage", "ItemDisplayAsset", "LargeIcon", "ToastIcon", "SmallIcon"))
+                Preview = Utils.GetBitmap(largePreview);
+            else if (Object.TryGetValue(out string s, "LargePreviewImage") && !string.IsNullOrEmpty(s))
+                Preview = Utils.GetBitmap(s);
+            else if (Object.TryGetValue(out FPackageIndex otherPreview, "SmallPreviewImage", "ToastIcon", "access_item"))
+                Preview = Utils.GetBitmap(otherPreview);
+            else if (Object.TryGetValue(out UMaterialInstanceConstant materialInstancePreview, "EventCalloutImage"))
+                Preview = Utils.GetBitmap(materialInstancePreview);
+            else if (Object.TryGetValue(out FStructFallback brush, "IconBrush") && brush.TryGetValue(out UTexture2D res, "ResourceObject"))
+                Preview = Utils.GetBitmap(res);
+        }
 
         // text
         if (Object.TryGetValue(out FText displayName, "DisplayName", "ItemName", "BundleName", "DefaultHeaderText", "UIDisplayName", "EntryName", "EventCalloutTitle"))

diff --git a/FModel/Creator/Bases/FN/BaseMaterialInstance.cs b/FModel/Creator/Bases/FN/BaseMaterialInstance.cs
@@ -31,6 +31,7 @@ public override void ParseForInfo()
                 case "TextureA":
                 case "TextureB":
                 case "OfferImage":
+                case "CarTexture":
                     Preview = Utils.GetBitmap(texture);
                     break;
             }
@@ -88,4 +89,4 @@ public override SKBitmap[] Draw()
 
         return new[] { ret };
     }
-}
+}
diff --git a/FModel/Creator/Bases/FN/BaseOfferDisplayData.cs b/FModel/Creator/Bases/FN/BaseOfferDisplayData.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Material;
 using CUE4Parse.UE4.Assets.Objects;
@@ -8,35 +9,35 @@ namespace FModel.Creator.Bases.FN;
 
 public class BaseOfferDisplayData : UCreator
 {
-    private BaseMaterialInstance[] _offerImages;
+    private readonly List<BaseMaterialInstance> _offerImages;
 
     public BaseOfferDisplayData(UObject uObject, EIconStyle style) : base(uObject, style)
     {
+        _offerImages = new List<BaseMaterialInstance>();
     }
 
     public override void ParseForInfo()
     {
         if (!Object.TryGetValue(out FStructFallback[] contextualPresentations, "ContextualPresentations"))
             return;
 
-        _offerImages = new BaseMaterialInstance[contextualPresentations.Length];
-        for (var i = 0; i < _offerImages.Length; i++)
+        for (var i = 0; i < contextualPresentations.Length; i++)
         {
             if (!contextualPresentations[i].TryGetValue(out FSoftObjectPath material, "Material") ||
                 !material.TryLoad(out UMaterialInterface presentation)) continue;
 
             var offerImage = new BaseMaterialInstance(presentation, Style);
             offerImage.ParseForInfo();
-            _offerImages[i] = offerImage;
+            _offerImages.Add(offerImage);
         }
     }
 
     public override SKBitmap[] Draw()
     {
-        var ret = new SKBitmap[_offerImages.Length];
+        var ret = new SKBitmap[_offerImages.Count];
         for (var i = 0; i < ret.Length; i++)
         {
-            ret[i] = _offerImages[i].Draw()[0];
+            ret[i] = _offerImages[i]?.Draw()[0];
         }
 
         return ret;

diff --git a/FModel/Creator/Bases/FN/BasePlaylist.cs b/FModel/Creator/Bases/FN/BasePlaylist.cs
@@ -34,7 +34,7 @@ public override void ParseForInfo()
             return;
 
         var playlist = _apiEndpointView.FortniteApi.GetPlaylist(playlistName.Text);
-        if (!playlist.IsSuccess || !playlist.Data.Images.HasShowcase ||
+        if (!playlist.IsSuccess || playlist.Data.Images is not { HasShowcase: true } ||
             !_apiEndpointView.FortniteApi.TryGetBytes(playlist.Data.Images.Showcase, out var image))
             return;
 
@@ -74,4 +74,4 @@ private void DrawMissionIcon(SKCanvas c)
         if (_missionIcon == null) return;
         c.DrawBitmap(_missionIcon, new SKPoint(5, 5), ImagePaint);
     }
-}
+}
diff --git a/FModel/Creator/CreatorPackage.cs b/FModel/Creator/CreatorPackage.cs
@@ -67,6 +67,8 @@ public bool TryConstructCreator(out UCreator creator)
             case "FortBadgeItemDefinition":
             case "SparksMicItemDefinition":
             case "FortAwardItemDefinition":
+            case "FortStackItemDefinition":
+            case "FortWorldItemDefinition":
             case "SparksAuraItemDefinition":
             case "SparksDrumItemDefinition":
             case "SparksBassItemDefinition":
@@ -76,35 +78,43 @@ public bool TryConstructCreator(out UCreator creator)
             case "FortGiftBoxItemDefinition":
             case "FortOutpostItemDefinition":
             case "FortVehicleItemDefinition":
+            case "FortMissionItemDefinition":
+            case "FortAccountItemDefinition":
             case "SparksGuitarItemDefinition":
             case "FortCardPackItemDefinition":
             case "FortDefenderItemDefinition":
             case "FortCurrencyItemDefinition":
             case "FortResourceItemDefinition":
             case "FortBackpackItemDefinition":
             case "FortEventQuestMapDataAsset":
+            case "FortBuildingItemDefinition":
             case "FortWeaponModItemDefinition":
             case "FortCodeTokenItemDefinition":
             case "FortSchematicItemDefinition":
+            case "FortAlterableItemDefinition":
             case "SparksKeyboardItemDefinition":
             case "FortWorldMultiItemDefinition":
             case "FortAlterationItemDefinition":
             case "FortExpeditionItemDefinition":
             case "FortIngredientItemDefinition":
+            case "FortConsumableItemDefinition":
             case "StWFortAccoladeItemDefinition":
             case "FortAccountBuffItemDefinition":
             case "FortWeaponMeleeItemDefinition":
             case "FortPlayerPerksItemDefinition":
             case "FortPlaysetPropItemDefinition":
+            case "FortPrerollDataItemDefinition":
             case "JunoRecipeBundleItemDefinition":
             case "FortHomebaseNodeItemDefinition":
             case "FortNeverPersistItemDefinition":
             case "FortPlayerAugmentItemDefinition":
             case "FortSmartBuildingItemDefinition":
+            case "FortGiftBoxUnlockItemDefinition":
             case "FortWeaponModItemDefinitionOptic":
             case "RadioContentSourceItemDefinition":
             case "FortPlaysetGrenadeItemDefinition":
             case "JunoWeaponCreatureItemDefinition":
+            case "FortEventDependentItemDefinition":
             case "FortPersonalVehicleItemDefinition":
             case "FortGameplayModifierItemDefinition":
             case "FortHardcoreModifierItemDefinition":
@@ -113,11 +123,13 @@ public bool TryConstructCreator(out UCreator creator)
             case "FortConversionControlItemDefinition":
             case "FortAccountBuffCreditItemDefinition":
             case "JunoBuildInstructionsItemDefinition":
+            case "FortCharacterCosmeticItemDefinition":
             case "JunoBuildingSetAccountItemDefinition":
             case "FortEventCurrencyItemDefinitionRedir":
             case "FortPersistentResourceItemDefinition":
             case "FortWeaponMeleeOffhandItemDefinition":
             case "FortHomebaseBannerIconItemDefinition":
+            case "FortVehicleCosmeticsVariantTokenType":
             case "JunoBuildingPropAccountItemDefinition":
             case "FortCampaignHeroLoadoutItemDefinition":
             case "FortConditionalResourceItemDefinition":
@@ -129,6 +141,7 @@ public bool TryConstructCreator(out UCreator creator)
             case "FortVehicleCosmeticsItemDefinition_Skin":
             case "FortVehicleCosmeticsItemDefinition_Wheel":
             case "FortCreativeRealEstatePlotItemDefinition":
+            case "FortDeployableBaseCloudSaveItemDefinition":
             case "FortVehicleCosmeticsItemDefinition_Booster":
             case "AthenaDanceItemDefinition_AdHocSquadsJoin_C":
             case "FortVehicleCosmeticsItemDefinition_DriftSmoke":

diff --git a/FModel/Creator/Utils.cs b/FModel/Creator/Utils.cs
@@ -11,6 +11,7 @@
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.UE4.Versions;
 using CUE4Parse_Conversion.Textures;
+using CUE4Parse.UE4.Assets.Objects;
 using FModel.Framework;
 using FModel.Extensions;
 using FModel.Services;
@@ -71,6 +72,7 @@ public static SKBitmap GetBitmap(FPackageIndex packageIndex)
                     return GetBitmap(material);
                 default:
                 {
+                    if (export.TryGetValue(out FInstancedStruct[] dataList, "DataList")) return GetBitmap(dataList);
                     if (export.TryGetValue(out FSoftObjectPath previewImage, "LargePreviewImage", "SmallPreviewImage")) return GetBitmap(previewImage);
                     if (export.TryGetValue(out string largePreview, "LargePreviewImage")) return GetBitmap(largePreview);
                     if (export.TryGetValue(out FPackageIndex smallPreview, "SmallPreviewImage"))
@@ -85,6 +87,21 @@ public static SKBitmap GetBitmap(FPackageIndex packageIndex)
         }
     }
 
+    public static SKBitmap GetBitmap(FInstancedStruct[] structs)
+    {
+        if (structs.FirstOrDefault(d => d.NonConstStruct?.TryGetValue(out FSoftObjectPath p, "LargeIcon") == true && !p.AssetPathName.IsNone) is { NonConstStruct: not null } isl)
+        {
+            return GetBitmap(isl.NonConstStruct.Get<FSoftObjectPath>("LargeIcon"));
+        }
+
+        if (structs.FirstOrDefault(d => d.NonConstStruct?.TryGetValue(out FSoftObjectPath p, "Icon") == true && !p.AssetPathName.IsNone) is { NonConstStruct: not null } isi)
+        {
+            return GetBitmap(isi.NonConstStruct.Get<FSoftObjectPath>("Icon"));
+        }
+
+        return null;
+    }
+
     public static SKBitmap GetBitmap(UMaterialInstanceConstant material)
     {
         if (material == null) return null;
@@ -400,4 +417,4 @@ public static List<string> SplitLines(string text, SKPaint paint, float maxWidth
 
         return ret;
     }
-}
+}
diff --git a/FModel/Enums.cs b/FModel/Enums.cs
@@ -20,8 +20,7 @@ public enum EErrorKind
 public enum SettingsOut
 {
     ReloadLocres,
-    ReloadMappings,
-    CheckForUpdates
+    ReloadMappings
 }
 
 public enum EStatusKind
@@ -64,15 +63,15 @@ public enum ELoadingMode
     AllButModified
 }
 
-public enum EUpdateMode
-{
-    [Description("Stable")]
-    Stable,
-    [Description("Beta")]
-    Beta,
-    [Description("QA Testing")]
-    Qa
-}
+// public enum EUpdateMode
+// {
+//     [Description("Stable")]
+//     Stable,
+//     [Description("Beta")]
+//     Beta,
+//     [Description("QA Testing")]
+//     Qa
+// }
 
 public enum ECompressedAudio
 {

diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>FModel.ico</ApplicationIcon>
-    <Version>4.4.3.6</Version>
-    <AssemblyVersion>4.4.3.6</AssemblyVersion>
-    <FileVersion>4.4.3.6</FileVersion>
+    <Version>4.4.4.0</Version>
+    <AssemblyVersion>4.4.4.0</AssemblyVersion>
+    <FileVersion>4.4.4.0</FileVersion>
     <IsPackable>false</IsPackable>
     <IsPublishable>true</IsPublishable>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
@@ -148,21 +148,21 @@
   <ItemGroup>
     <PackageReference Include="AdonisUI" Version="1.17.1" />
     <PackageReference Include="AdonisUI.ClassicTheme" Version="1.17.1" />
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.8.5" />
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="CSCore" Version="1.2.1.2" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageReference Include="EpicManifestParser" Version="2.2.1" />
-    <PackageReference Include="ImGui.NET" Version="1.90.1.1" />
+    <PackageReference Include="EpicManifestParser" Version="2.3.3" />
+    <PackageReference Include="ImGui.NET" Version="1.91.0.1" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NVorbis" Version="0.10.5" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageReference Include="OpenTK" Version="4.8.2" />
-    <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
+    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
   </ItemGroup>