diff --git a/Dalamud.Injector/EntryPoint.cs b/Dalamud.Injector/EntryPoint.cs index a7dca9392..f05b1ac08 100644 --- a/Dalamud.Injector/EntryPoint.cs +++ b/Dalamud.Injector/EntryPoint.cs @@ -260,7 +260,6 @@ namespace Dalamud.Injector for (var i = 2; i < args.Count; i++) { - Log.Information(args[i]); if (args[i].StartsWith(key = "--dalamud-working-directory=")) workingDirectory = args[i][key.Length..]; else if (args[i].StartsWith(key = "--dalamud-configuration-path=")) diff --git a/Dalamud/Game/SigScanner.cs b/Dalamud/Game/SigScanner.cs index 4d3a78830..b19024098 100644 --- a/Dalamud/Game/SigScanner.cs +++ b/Dalamud/Game/SigScanner.cs @@ -395,26 +395,6 @@ public class SigScanner : IDisposable, IServiceType } } - private unsafe class UnsafeCodeReader : CodeReader - { - private readonly int length; - private readonly byte* address; - private int pos; - public UnsafeCodeReader(byte* address, int length) - { - this.length = length; - this.address = address; - } - - public bool CanReadByte => this.pos < this.length; - - public override int ReadByte() - { - if (this.pos >= this.length) return -1; - return *(this.address + this.pos++); - } - } - /// /// Helper for ScanText to get the correct address for IDA sigs that mark the first JMP or CALL location. /// @@ -578,4 +558,25 @@ public class SigScanner : IDisposable, IServiceType Log.Error(ex, "Couldn't load cached sigs"); } } + + private unsafe class UnsafeCodeReader : CodeReader + { + private readonly int length; + private readonly byte* address; + private int pos; + + public UnsafeCodeReader(byte* address, int length) + { + this.length = length; + this.address = address; + } + + public bool CanReadByte => this.pos < this.length; + + public override int ReadByte() + { + if (this.pos >= this.length) return -1; + return *(this.address + this.pos++); + } + } } diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs index a1c2c3336..ec22ef8d7 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs @@ -55,5 +55,6 @@ public class SettingsTabExperimental : SettingsTab base.Draw(); ImGuiHelpers.SafeTextColoredWrapped(ImGuiColors.DalamudGrey, "Total memory used by Dalamud & Plugins: " + Util.FormatBytes(GC.GetTotalMemory(false))); + ImGuiHelpers.ScaledDummy(15); } } diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs index 9d36a1644..2c77ff528 100644 --- a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs +++ b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs @@ -147,7 +147,7 @@ internal class LocalPlugin : IDisposable } var pluginManager = Service.Get(); - this.IsBanned = pluginManager.IsManifestBanned(this.Manifest); + this.IsBanned = pluginManager.IsManifestBanned(this.Manifest) && !this.IsDev; this.BanReason = pluginManager.GetBanReason(this.Manifest); this.SaveManifest(); @@ -320,7 +320,7 @@ internal class LocalPlugin : IDisposable throw new ArgumentOutOfRangeException(this.State.ToString()); } - if (pluginManager.IsManifestBanned(this.Manifest)) + if (pluginManager.IsManifestBanned(this.Manifest) && !this.IsDev) throw new BannedPluginException($"Unable to load {this.Name}, banned"); if (this.Manifest.ApplicableVersion < startInfo.GameVersion)