diff --git a/.gitignore b/.gitignore index b6f3f18..254e188 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.vs/ -obj/ -dist/ -*.user \ No newline at end of file +/dist +/obj +/bin +/.idea +*.user diff --git a/SliceIsRight.csproj b/SliceIsRight.csproj index 9bfea97..55b5983 100644 --- a/SliceIsRight.csproj +++ b/SliceIsRight.csproj @@ -3,7 +3,7 @@ - 6.1 + 7.0 Slice is Right. https://github.com/carvelli/Slice-Is-Right @@ -32,7 +32,7 @@ - + $(DalamudLibPath)FFXIVClientStructs.dll false @@ -49,10 +49,6 @@ $(DalamudLibPath)ImGui.NET.dll false - - $(DalamudLibPath)ImGuiScene.dll - false - $(DalamudLibPath)Lumina.dll false diff --git a/SlightIsRightPlugin.cs b/SlightIsRightPlugin.cs index b0b3d28..be39c99 100644 --- a/SlightIsRightPlugin.cs +++ b/SlightIsRightPlugin.cs @@ -1,9 +1,5 @@ -using Dalamud.Game.ClientState; -using Dalamud.Game.ClientState.Objects; -using Dalamud.Game.ClientState.Objects.Enums; +using Dalamud.Game.ClientState.Objects.Enums; using Dalamud.Game.ClientState.Objects.Types; -using Dalamud.Game.Gui; -using Dalamud.Interface; using Dalamud.IoC; using Dalamud.Plugin; using ImGuiNET; @@ -11,6 +7,8 @@ using System; using System.Collections.Generic; using System.Numerics; using System.Runtime.InteropServices; +using Dalamud.Interface.Utility; +using Dalamud.Plugin.Services; namespace SliceIsRight; @@ -22,20 +20,18 @@ public sealed class SliceIsRightPlugin : IDalamudPlugin private static readonly uint ColourGreen = ImGui.GetColorU32(ImGui.ColorConvertFloat4ToU32(new Vector4(0.0f, 1f, 0.0f, 0.15f))); private static readonly uint ColourRed = ImGui.GetColorU32(ImGui.ColorConvertFloat4ToU32(new Vector4(1, 0, 0, 0.4f))); - public string Name => "Slice is Right"; - [PluginService] [RequiredVersion("1.0")] private DalamudPluginInterface PluginInterface { get; set; } = null!; [PluginService] - private ObjectTable ObjectTable { get; set; } = null!; + private IObjectTable ObjectTable { get; set; } = null!; [PluginService] - private GameGui GameGui { get; set; } = null!; + private IGameGui GameGui { get; set; } = null!; [PluginService] - private ClientState ClientState { get; set; } = null!; + private IClientState ClientState { get; set; } = null!; private const ushort GoldSaucerTerritoryId = 144; private bool IsInGoldSaucer { get; set; } @@ -54,7 +50,7 @@ public sealed class SliceIsRightPlugin : IDalamudPlugin } #pragma warning restore CS8618 - private void TerritoryChanged(object? sender, ushort e) + private void TerritoryChanged(ushort e) { IsInGoldSaucer = e == GoldSaucerTerritoryId; }