console is back

2026-08-25 10:54:35 -05:00 · 2021-07-03 12:14:39 +02:00
parent 3a16131954
commit 586d221573
10 changed files with 14 additions and 62 deletions
--- a/2
+++ b/2
--- a/FModel/App.xaml.cs
+++ b/FModel/App.xaml.cs
@@ -11,7 +11,6 @@ using FModel.Framework;
 using FModel.Services;
 using FModel.Settings;
 using Newtonsoft.Json;
-using Sentry;
 using Serilog.Sinks.SystemConsole.Themes;
 using MessageBox = AdonisUI.Controls.MessageBox;
 using MessageBoxImage = AdonisUI.Controls.MessageBoxImage;
@@ -24,22 +23,13 @@ namespace FModel
    /// </summary>
    public partial class App
    {
+        [DllImport("kernel32.dll")]
+        private static extern bool AttachConsole(int dwProcessId);
+        
        protected override void OnStartup(StartupEventArgs e)
        {
+            AttachConsole(-1);
            base.OnStartup(e);
-            SentrySdk.Init(options =>
-            {
-                options.Dsn = "https://2e872a5034c940e787015e5d07e7d82e@o811367.ingest.sentry.io/5805297";
-#if DEBUG
-                options.Environment = "dev";
-#elif RELEASE
-                options.Environment = "prod";
-#else
-                options.Environment = "what";
-#endif
-                options.TracesSampleRate = 1.0;
-                options.AddExceptionFilterForType<OperationCanceledException>();
-            });

            try
            {
@@ -86,7 +76,6 @@ namespace FModel
        private void OnUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
        {
            Log.Error("{Exception}", e.Exception);
-            SentrySdk.CaptureException(e.Exception);

            var messageBox = new MessageBoxModel
            {
--- a/FModel/Constants.cs
+++ b/FModel/Constants.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using CUE4Parse.UE4.Objects.Core.Misc;

 namespace FModel
@@ -23,41 +22,5 @@ namespace FModel

        public const string _FN_LIVE_TRIGGER = "fortnite-live.manifest";
        public const string _VAL_LIVE_TRIGGER = "valorant-live.manifest";
-
-        public static string GetRandomColor()
-        {
-            return _randomColors[_random.Next(0, 255)];
-        }
-
-        private static readonly Random _random = new(Environment.TickCount);
-        private static readonly string[] _randomColors =
-        {
-            "F44336", "FFEBEE", "FFCDD2", "EF9A9A", "E57373", "EF5350", "E53935", "D32F2F", "C62828", "B71C1C",
-            "FF8A80", "FF5252", "FF1744", "D50000", "FCE4EC", "F8BBD0", "F48FB1", "F06292", "EC407A", "E91E63",
-            "D81B60", "C2185B", "AD1457", "880E4F", "FF80AB", "FF4081", "F50057", "C51162", "F3E5F5", "E1BEE7",
-            "CE93D8", "BA68C8", "AB47BC", "9C27B0", "8E24AA", "7B1FA2", "6A1B9A", "4A148C", "EA80FC", "E040FB",
-            "D500F9", "AA00FF", "EDE7F6", "D1C4E9", "B39DDB", "9575CD", "7E57C2", "673AB7", "5E35B1", "512DA8",
-            "4527A0", "311B92", "B388FF", "7C4DFF", "651FFF", "6200EA", "E8EAF6", "C5CAE9", "9FA8DA", "7986CB",
-            "5C6BC0", "3F51B5", "3949AB", "303F9F", "283593", "1A237E", "8C9EFF", "536DFE", "3D5AFE", "304FFE",
-            "E3F2FD", "BBDEFB", "90CAF9", "64B5F6", "42A5F5", "2196F3", "1E88E5", "1976D2", "1565C0", "0D47A1",
-            "82B1FF", "448AFF", "2979FF", "2962FF", "E1F5FE", "B3E5FC", "81D4FA", "4FC3F7", "29B6F6", "03A9F4",
-            "039BE5", "0288D1", "0277BD", "01579B", "80D8FF", "40C4FF", "00B0FF", "0091EA", "E0F7FA", "B2EBF2",
-            "80DEEA", "4DD0E1", "26C6DA", "00BCD4", "00ACC1", "0097A7", "00838F", "006064", "84FFFF", "18FFFF",
-            "00E5FF", "00B8D4", "E0F2F1", "B2DFDB", "80CBC4", "4DB6AC", "26A69A", "009688", "00897B", "00796B",
-            "00695C", "004D40", "A7FFEB", "64FFDA", "1DE9B6", "00BFA5", "E8F5E9", "C8E6C9", "A5D6A7", "81C784",
-            "66BB6A", "4CAF50", "43A047", "388E3C", "2E7D32", "1B5E20", "B9F6CA", "69F0AE", "00E676", "00C853",
-            "F1F8E9", "DCEDC8", "C5E1A5", "AED581", "9CCC65", "8BC34A", "7CB342", "689F38", "558B2F", "33691E",
-            "CCFF90", "B2FF59", "76FF03", "64DD17", "F9FBE7", "F0F4C3", "E6EE9C", "DCE775", "D4E157", "CDDC39",
-            "C0CA33", "AFB42B", "9E9D24", "827717", "F4FF81", "EEFF41", "C6FF00", "AEEA00", "FFFDE7", "FFF9C4",
-            "FFF59D", "FFF176", "FFEE58", "FFEB3B", "FDD835", "FBC02D", "F9A825", "F57F17", "FFFF8D", "FFFF00",
-            "FFEA00", "FFD600", "FFF8E1", "FFECB3", "FFE082", "FFD54F", "FFCA28", "FFC107", "FFB300", "FFA000",
-            "FF8F00", "FF6F00", "FFE57F", "FFD740", "FFC400", "FFAB00", "FFF3E0", "FFE0B2", "FFCC80", "FFB74D",
-            "FFA726", "FF9800", "FB8C00", "F57C00", "EF6C00", "E65100", "FFD180", "FFAB40", "FF9100", "FF6D00",
-            "FBE9E7", "FFCCBC", "FFAB91", "FF8A65", "FF7043", "FF5722", "F4511E", "E64A19", "D84315", "BF360C",
-            "FF9E80", "FF6E40", "FF3D00", "DD2C00", "EFEBE9", "D7CCC8", "BCAAA4", "A1887F", "8D6E63", "795548",
-            "6D4C41", "5D4037", "4E342E", "3E2723", "FAFAFA", "F5F5F5", "EEEEEE", "E0E0E0", "BDBDBD", "9E9E9E",
-            "757575", "616161", "424242", "212121", "ECEFF1", "CFD8DC", "B0BEC5", "90A4AE", "78909C", "607D8B",
-            "546E7A", "455A64", "37474F", "263238", "000000",
-        };
    }
 }
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -111,7 +111,6 @@
    <PackageReference Include="NVorbis" Version="0.10.1" />
    <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
    <PackageReference Include="RestSharp" Version="106.11.7" />
-    <PackageReference Include="Sentry" Version="3.4.0" />
    <PackageReference Include="Serilog" Version="2.10.0" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2" />
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -12,7 +12,6 @@ using FModel.ViewModels;
 using FModel.Views;
 using FModel.Views.Resources.Controls;
 using ICSharpCode.AvalonEdit.Editing;
-using Sentry;

 namespace FModel
 {
@@ -54,7 +53,6 @@ namespace FModel
        {
            _applicationView.CustomDirectories.Save();
            _discordHandler.Dispose();
-            SentrySdk.Close();
        }

        private async void OnLoaded(object sender, RoutedEventArgs e)
--- a/FModel/Services/DiscordService.cs
+++ b/FModel/Services/DiscordService.cs
@@ -22,7 +22,7 @@ namespace FModel.Services

        private readonly Assets _staticAssets = new()
        {
-            LargeImageKey = "official_logo", SmallImageKey = "verified", SmallImageText = $"v{Constants.APP_VERSION[..5]}"
+            LargeImageKey = "official_logo", SmallImageKey = "verified", SmallImageText = $"v{Constants.APP_VERSION}"
        };

        private readonly Button[] _buttons =
--- a/FModel/ViewModels/Commands/LoadCommand.cs
+++ b/FModel/ViewModels/Commands/LoadCommand.cs
@@ -39,6 +39,12 @@ namespace FModel.ViewModels.Commands
        public override async void Execute(LoadingModesViewModel contextViewModel, object parameter)
        {
            if (_applicationView.CUE4Parse.GameDirectory.HasNoFile) return;
+            if (_applicationView.CUE4Parse.Game == FGame.FortniteGame &&
+                _applicationView.CUE4Parse.Provider.MappingsContainer == null)
+            {
+                FLogger.AppendError();
+                FLogger.AppendText("Mappings could not get pulled, extracting assets might not work properly. If so, press F12 or please restart.", Constants.WHITE, true);
+            }
 #if DEBUG
            var loadingTime = Stopwatch.StartNew();
 #endif
--- a/FModel/ViewModels/ThreadWorkerViewModel.cs
+++ b/FModel/ViewModels/ThreadWorkerViewModel.cs
@@ -4,7 +4,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using FModel.Views.Resources.Controls;
-using Sentry;
 using Serilog;

 namespace FModel.ViewModels
@@ -97,7 +96,6 @@ namespace FModel.ViewModels
                        CurrentCancellationTokenSource = null; // kill token

                        Log.Error("{Exception}", e);
-                        SentrySdk.CaptureException(e);
                        
                        FLogger.AppendError();
                        FLogger.AppendText(e.Message, Constants.WHITE, true);
--- a/FModel/Views/MapViewer.xaml
+++ b/FModel/Views/MapViewer.xaml
@@ -22,7 +22,7 @@
            
            <controls:OnTagDataTemplateSelector x:Key="TagTemplateSelector" />
            <DataTemplate x:Key="BrTemplate">
-                <StackPanel VerticalAlignment="Center" Margin="50">
+                <StackPanel VerticalAlignment="Center" Margin="25 0">
                    <CheckBox Content="Points Of Interest" Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" IsChecked="{Binding MapViewer.BrPois}"
                              DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.MapViewer}}}" IsEnabled="{Binding IsReady}" />
                    <CheckBox Content="Landmarks" Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" IsChecked="{Binding MapViewer.BrLandmarks}"
--- a/FModel/Views/SearchView.xaml.cs
+++ b/FModel/Views/SearchView.xaml.cs
@@ -40,7 +40,6 @@ namespace FModel.Views
            if (folder == null) return;
            
            MainWindow.YesWeCats.Activate();
-            MainWindow.YesWeCats.WindowState = WindowState.Normal;

            do { await Task.Delay(100); } while (MainWindow.YesWeCats.AssetsListName.Items.Count < folder.AssetsList.Assets.Count);
            MainWindow.YesWeCats.LeftTabControl.SelectedIndex = 2; // assets tab