ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: always respect the manifest name

Browse source
This commit is contained in:
goat 2022-08-21 15:41:53 +02:00
parent 9c03bc0fe6
commit 3f76a70425
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud.Injector/LegacyBlowfish.cs
View file

@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Dalamud.Injector
{

1
Dalamud/Game/Internal/AntiDebug.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using Dalamud.Configuration.Internal;
using Serilog;
namespace Dalamud.Game.Internal

4
Dalamud/Game/Internal/DalamudAtkTweaks.cs
View file

@ -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;

4
Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
View file

@ -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
{

4
Dalamud/Plugin/Internal/Types/LocalPlugin.cs
View file

@ -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);