chore: always respect the manifest name

electr0sheep · Aug 21, 2022 · 3f76a70 · 3f76a70
1 parent 9c03bc0
commit 3f76a70
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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
@@ -3,7 +3,7 @@
 
 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.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
@@ -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
@@ -182,7 +182,7 @@ public LocalPlugin(FileInfo dllFile, LocalPluginManifest? manifest)
     /// <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 @@ public async Task LoadAsync(PluginLoadReason reason, bool reloading = false)
             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);