From 3f76a70425018253d9510409860993a56dc960fa Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Sun, 21 Aug 2022 15:41:53 +0200
Subject: [PATCH] chore: always respect the manifest name

---
 Dalamud.Injector/LegacyBlowfish.cs                            | 3 ---
 Dalamud/Game/Internal/AntiDebug.cs                            | 1 -
 Dalamud/Game/Internal/DalamudAtkTweaks.cs                     | 4 ++--
 .../Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs       | 4 ++--
 Dalamud/Plugin/Internal/Types/LocalPlugin.cs                  | 4 ++--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Dalamud.Injector/LegacyBlowfish.cs b/Dalamud.Injector/LegacyBlowfish.cs
index 576940521..28cc584e4 100644
--- a/Dalamud.Injector/LegacyBlowfish.cs
+++ b/Dalamud.Injector/LegacyBlowfish.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Dalamud.Injector
 {
diff --git a/Dalamud/Game/Internal/AntiDebug.cs b/Dalamud/Game/Internal/AntiDebug.cs
index aaecfe4b1..fd7569aed 100644
--- a/Dalamud/Game/Internal/AntiDebug.cs
+++ b/Dalamud/Game/Internal/AntiDebug.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-using Dalamud.Configuration.Internal;
 using Serilog;
 
 namespace Dalamud.Game.Internal
diff --git a/Dalamud/Game/Internal/DalamudAtkTweaks.cs b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
index 40bc1a26a..15a58cb99 100644
--- a/Dalamud/Game/Internal/DalamudAtkTweaks.cs
+++ b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 using CheapLoc;
 using Dalamud.Configuration.Internal;
-using Dalamud.Data;
+//using Dalamud.Data;
 //using Dalamud.Game.Gui.ContextMenus;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
@@ -12,7 +12,7 @@ using Dalamud.Hooking;
 using Dalamud.Interface.Internal;
 using Dalamud.Interface.Windowing;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using Lumina.Excel.GeneratedSheets;
+//using Lumina.Excel.GeneratedSheets;
 using Serilog;
 
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
index 76b6b59b2..66683373d 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
@@ -1,10 +1,10 @@
-using System;
+/*using System;
 
 using Dalamud.Data;
 using Dalamud.Utility;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
-using Serilog;
+using Serilog;*/
 
 namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
 {
diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs
index d9e4719c9..bd9351585 100644
--- a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs
+++ b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs
@@ -182,7 +182,7 @@ internal class LocalPlugin : IDisposable
     /// <summary>
     /// Gets the plugin name, directly from the plugin or if it is not loaded from the manifest.
     /// </summary>
-    public string Name => this.instance?.Name ?? this.Manifest.Name;
+    public string Name => this.Manifest.Name;
 
     /// <summary>
     /// Gets an optional reason, if the plugin is banned.
@@ -427,7 +427,7 @@ internal class LocalPlugin : IDisposable
             SignatureHelper.Initialise(this.instance);
 
             // In-case the manifest name was a placeholder. Can occur when no manifest was included.
-            if (this.instance.Name != this.Manifest.Name)
+            if (this.Manifest.Name.IsNullOrEmpty())
             {
                 this.Manifest.Name = this.instance.Name;
                 this.Manifest.Save(this.manifestFile);