From de8930c57486f894d262d8cfa830b2bd335fc3f7 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Mon, 15 Feb 2021 12:55:04 +0100 Subject: [PATCH] All Linebreaks to LF. --- Penumbra/Configuration.cs | 4 +- Penumbra/Game/RefreshActors.cs | 96 ++--- Penumbra/Importer/TexToolsImport.cs | 26 +- Penumbra/Models/Deduplicator.cs | 320 ++++++++--------- Penumbra/Models/GroupInformation.cs | 2 +- Penumbra/Models/ModMeta.cs | 26 +- Penumbra/Mods/ModManager.cs | 22 +- Penumbra/Mods/ResourceMod.cs | 4 +- Penumbra/Plugin.cs | 20 +- Penumbra/ResourceLoader.cs | 14 +- Penumbra/Structs/FileMode.cs | 2 +- Penumbra/Structs/ResourceHandle.cs | 2 +- Penumbra/Structs/SeFileDescriptor.cs | 2 +- Penumbra/UI/ImGuiFramedGroup.cs | 254 +++++++------- Penumbra/UI/ImGuiRenameableCombo.cs | 82 ++--- Penumbra/UI/ImGuiResizingTextInput.cs | 76 ++-- Penumbra/UI/ImGuiUtil.cs | 48 +-- Penumbra/UI/LaunchButton.cs | 68 ++-- Penumbra/UI/MenuBar.cs | 60 ++-- Penumbra/UI/SettingsInterface.cs | 54 +-- Penumbra/UI/SettingsMenu.cs | 86 ++--- Penumbra/UI/TabBrowser.cs | 22 +- Penumbra/UI/TabEffective.cs | 104 +++--- Penumbra/UI/TabImport.cs | 114 +++--- Penumbra/UI/TabInstalled.cs | 90 ++--- Penumbra/UI/TabInstalledDetailsEdit.cs | 2 +- Penumbra/UI/TabInstalledModPanel.cs | 446 ++++++++++++------------ Penumbra/UI/TabInstalledSelector.cs | 300 ++++++++-------- Penumbra/UI/TabSettings.cs | 220 ++++++------ Penumbra/Util/Crc32.cs | 2 +- Penumbra/Util/SingleOrArrayConverter.cs | 110 +++--- Penumbra/Util/StringPathExtensions.cs | 34 +- 32 files changed, 1356 insertions(+), 1356 deletions(-) diff --git a/Penumbra/Configuration.cs b/Penumbra/Configuration.cs index b8eae639..e3d1654d 100644 --- a/Penumbra/Configuration.cs +++ b/Penumbra/Configuration.cs @@ -1,4 +1,4 @@ -using Dalamud.Configuration; +using Dalamud.Configuration; using Dalamud.Plugin; using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ namespace Penumbra public bool IsEnabled { get; set; } = true; public bool ShowAdvanced { get; set; } - + public bool DisableFileSystemNotifications { get; set; } public bool EnableHttpApi { get; set; } diff --git a/Penumbra/Game/RefreshActors.cs b/Penumbra/Game/RefreshActors.cs index 16a8f934..2f294e28 100644 --- a/Penumbra/Game/RefreshActors.cs +++ b/Penumbra/Game/RefreshActors.cs @@ -1,54 +1,54 @@ -using System.Runtime.InteropServices; -using Dalamud.Game.ClientState.Actors; -using Dalamud.Game.ClientState.Actors.Types; +using System.Runtime.InteropServices; +using Dalamud.Game.ClientState.Actors; +using Dalamud.Game.ClientState.Actors.Types; using System.Threading.Tasks; namespace Penumbra { - public static class RefreshActors - { - private const int RenderModeOffset = 0x0104; - private const int RenderTaskPlayerDelay = 75; - private const int RenderTaskOtherDelay = 25; - private const int ModelInvisibilityFlag = 0b10; - - private static async void Redraw(Actor actor) - { - var ptr = actor.Address; - var renderModePtr = ptr + RenderModeOffset; - var renderStatus = Marshal.ReadInt32(renderModePtr); - - async void DrawObject(int delay) - { - Marshal.WriteInt32(renderModePtr, renderStatus | ModelInvisibilityFlag); - await Task.Delay(delay); - Marshal.WriteInt32(renderModePtr, renderStatus & ~ModelInvisibilityFlag); - } - - if (actor.ObjectKind == Dalamud.Game.ClientState.Actors.ObjectKind.Player) - { - DrawObject(RenderTaskPlayerDelay); - await Task.Delay(RenderTaskPlayerDelay); - } - else - DrawObject(RenderTaskOtherDelay); - - } - - public static void RedrawSpecific(ActorTable actors, string name) - { - if (name?.Length == 0) - RedrawAll(actors); - - foreach (var actor in actors) - if (actor.Name == name) - Redraw(actor); - } - - public static void RedrawAll(ActorTable actors) - { - foreach (var actor in actors) - Redraw(actor); - } + public static class RefreshActors + { + private const int RenderModeOffset = 0x0104; + private const int RenderTaskPlayerDelay = 75; + private const int RenderTaskOtherDelay = 25; + private const int ModelInvisibilityFlag = 0b10; + + private static async void Redraw(Actor actor) + { + var ptr = actor.Address; + var renderModePtr = ptr + RenderModeOffset; + var renderStatus = Marshal.ReadInt32(renderModePtr); + + async void DrawObject(int delay) + { + Marshal.WriteInt32(renderModePtr, renderStatus | ModelInvisibilityFlag); + await Task.Delay(delay); + Marshal.WriteInt32(renderModePtr, renderStatus & ~ModelInvisibilityFlag); + } + + if (actor.ObjectKind == Dalamud.Game.ClientState.Actors.ObjectKind.Player) + { + DrawObject(RenderTaskPlayerDelay); + await Task.Delay(RenderTaskPlayerDelay); + } + else + DrawObject(RenderTaskOtherDelay); + + } + + public static void RedrawSpecific(ActorTable actors, string name) + { + if (name?.Length == 0) + RedrawAll(actors); + + foreach (var actor in actors) + if (actor.Name == name) + Redraw(actor); + } + + public static void RedrawAll(ActorTable actors) + { + foreach (var actor in actors) + Redraw(actor); + } } } diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs index 91b5b02d..3cf1131b 100644 --- a/Penumbra/Importer/TexToolsImport.cs +++ b/Penumbra/Importer/TexToolsImport.cs @@ -55,9 +55,9 @@ namespace Penumbra.Importer case ".ttmp": case ".ttmp2": VerifyVersionAndImport(modPackFile); - break; - - default: + break; + + default: throw new ArgumentException( $"Unrecognized modpack format: {modPackFile.Extension}", nameof(modPackFile) ); } @@ -100,7 +100,7 @@ namespace Penumbra.Importer ImportV2ModPack(modPackFile, extractedModPack, modRaw); } else - { + { if (modPackFile.Extension != ".ttmp") PluginLog.Warning($"File {modPackFile.FullName} seems to be a V1 TTMP, but has the wrong extension."); ImportV1ModPack(modPackFile, extractedModPack, modRaw); @@ -223,11 +223,11 @@ namespace Penumbra.Importer // Iterate through all pages foreach( var page in modList.ModPackPages) { - foreach(var group in page.ModGroups) - { + foreach(var group in page.ModGroups) + { var groupFolder = new DirectoryInfo(Path.Combine(newModFolder.FullName, group.GroupName.ReplaceInvalidPathSymbols())); - foreach(var option in group.OptionList) - { + foreach(var option in group.OptionList) + { var optionFolder = new DirectoryInfo( Path.Combine( groupFolder.FullName, option.Name.ReplaceInvalidPathSymbols()) ); ExtractSimpleModList( optionFolder, option.ModsJsons, modData ); } @@ -249,7 +249,7 @@ namespace Penumbra.Importer GroupName = group.GroupName, Options = new List