Update for 7.0

lmcintyre · Jul 3, 2024 · 66d8de6 · 66d8de6
1 parent 8f192fd
commit 66d8de6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/Orchestrion/BGMSystem/BGMAddressResolver.cs b/Orchestrion/BGMSystem/BGMAddressResolver.cs
@@ -13,9 +13,9 @@ public static class BGMAddressResolver
 
     public static unsafe void Init()
     {
-        _baseAddress = DalamudApi.SigScanner.GetStaticAddressFromSig("48 8B 05 ?? ?? ?? ?? 48 85 C0 74 37 83 78 08 04");
-        AddRestartId = DalamudApi.SigScanner.ScanText("48 89 5C 24 ?? 57 48 83 EC 30 48 8B 41 20 48 8D 79 18");
-        GetSpecialMode = DalamudApi.SigScanner.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 8B 41 10 33 DB");
+        _baseAddress = DalamudApi.SigScanner.GetStaticAddressFromSig("48 8B 05 ?? ?? ?? ?? 48 85 C0 74 51 83 78 08 0B");
+        AddRestartId = DalamudApi.SigScanner.ScanText("E8 ?? ?? ?? ?? 88 9D ?? ?? ?? ?? 84 DB");
+        GetSpecialMode = DalamudApi.SigScanner.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 44 8B 41 10");
 
         DalamudApi.PluginLog.Debug($"[BGMAddressResolver] init: base address at {_baseAddress.ToInt64():X}");
 

diff --git a/Orchestrion/BGMSystem/BGMScene.cs b/Orchestrion/BGMSystem/BGMScene.cs
@@ -33,4 +33,6 @@ public unsafe struct BGMScene
 	private byte Unknown10;
 	private byte Unknown11;
 	private byte Unknown12;
+	private float Unknown13;
+	private uint Unknown14;
 }
diff --git a/Orchestrion/DalamudApi.cs b/Orchestrion/DalamudApi.cs
@@ -7,15 +7,15 @@ namespace Orchestrion;
 
 public class DalamudApi
 {
-    public static void Initialize(DalamudPluginInterface pluginInterface) => pluginInterface.Create<DalamudApi>();
+    public static void Initialize(IDalamudPluginInterface pluginInterface) => pluginInterface.Create<DalamudApi>();
 
     // [PluginService] public static IAetheryteList AetheryteList { get; private set; } = null;
     // [PluginService] public static IBuddyList BuddyList { get; private set; } = null;    
     [PluginService] public static IChatGui ChatGui { get; private set; } = null;
     [PluginService] public static IClientState ClientState { get; private set; } = null;
     [PluginService] public static ICommandManager CommandManager { get; private set; } = null;
     // [PluginService] public static ICondition Condition { get; private set; } = null;
-    [PluginService] public static DalamudPluginInterface PluginInterface { get; private set; } = null;
+    [PluginService] public static IDalamudPluginInterface PluginInterface { get; private set; } = null;
     [PluginService] public static IDataManager DataManager { get; private set; } = null;
     [PluginService] public static IDtrBar DtrBar { get; private set; } = null;
     // [PluginService] public static IFateTable FateTable { get; private set; } = null;

diff --git a/Orchestrion/Orchestrion.csproj b/Orchestrion/Orchestrion.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-    <PluginVersion>2.2.0.4</PluginVersion>
+    <PluginVersion>2.2.0.5</PluginVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <LangVersion>preview</LangVersion>
     <AssemblyName>orchestrion</AssemblyName>
     <AssemblyTitle>orchestrion</AssemblyTitle>
@@ -65,7 +65,7 @@
       <Private>False</Private>
     </Reference>
 
-    <PackageReference Include="DalamudPackager" Version="2.1.12" />
+    <PackageReference Include="DalamudPackager" Version="2.1.13" />
   </ItemGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="Data\xiv_bgm_en.csv">

diff --git a/Orchestrion/OrchestrionPlugin.cs b/Orchestrion/OrchestrionPlugin.cs
@@ -5,19 +5,16 @@
 using Dalamud.Plugin;
 using System.Linq;
 using System.Reflection;
-using System.Text.Unicode;
 using CheapLoc;
 using Dalamud;
 using Dalamud.Game.Gui.Dtr;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Interface;
 using Dalamud.Interface.GameFonts;
 using Dalamud.Interface.ManagedFontAtlas;
-using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using ImGuiNET;
 using Orchestrion.Audio;
 using Orchestrion.BGMSystem;
 using Orchestrion.Persistence;
@@ -43,11 +40,11 @@ public class OrchestrionPlugin : IDalamudPlugin
 	private readonly MainWindow _mainWindow;
 	private readonly SettingsWindow _settingsWindow;
 
-	private DtrBarEntry _dtrEntry;
+	private IDtrBarEntry _dtrEntry;
 
 	private SeString _songEchoMsg;
 
-	public OrchestrionPlugin(DalamudPluginInterface pi)
+	public OrchestrionPlugin(IDalamudPluginInterface pi)
 	{
 		DalamudApi.Initialize(pi);
 		LanguageChanged(DalamudApi.PluginInterface.UiLanguage);
@@ -121,7 +118,7 @@ public void Dispose()
 		DalamudApi.PluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
 		// DalamudApi.PluginInterface.UiBuilder.BuildFonts -= BuildFonts;
 		DalamudApi.CommandManager.RemoveHandler(CommandName);
-		_dtrEntry?.Dispose();
+		_dtrEntry?.Remove();
 		PlaylistManager.Dispose();
 		BGMManager.Dispose();
 		LargeFont?.Dispose();

diff --git a/Orchestrion/packages.lock.json b/Orchestrion/packages.lock.json
@@ -1,12 +1,12 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0-windows7.0": {
+    "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
       }
     }
   }