[PR] Fix "disable Borderless" option

Updated to patch 7.0 and new API, fixed the "disable Borderless" option not being actually implemented. Closes #2.
PrincessRTFM · Jul 6, 2024 · 5273dd3 · 5273dd3
1 parent 7713fb4
commit 5273dd3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 26 deletions.
diff --git a/AutoMountBgm/AutoMountBgm.csproj b/AutoMountBgm/AutoMountBgm.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<Product>AutoMountBGM</Product>
-		<Version>2.2.0</Version>
+		<Version>2.2.1</Version>
 		<Description>Automatically enables/disables mount BGM depending on the mount you use</Description>
 		<Copyright>Copyleft VariableVixen 2023</Copyright>
 	</PropertyGroup>

diff --git a/AutoMountBgm/Configuration.cs b/AutoMountBgm/Configuration.cs
@@ -10,7 +10,7 @@ public class Configuration: IPluginConfiguration {
 	public int Version { get; set; } = 1;
 
 	public HashSet<ushort> BgmDisabledMounts { get; set; } = [];
-	public bool DisableBorderlessBgm = true;
+	public bool DisableBorderlessBgm { get; set; } = true;
 
 	public void Save() => Plugin.Interface.SavePluginConfig(this);
 

diff --git a/AutoMountBgm/Plugin.cs b/AutoMountBgm/Plugin.cs
@@ -11,6 +11,8 @@
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
+
 using Lumina.Excel.GeneratedSheets;
 
 using Character = FFXIVClientStructs.FFXIV.Client.Game.Character.Character;
@@ -25,7 +27,7 @@ public class Plugin: IDalamudPlugin {
 	public const string Name = "AutoMountBGM";
 	public static string Command => $"/{Name.ToLower()}";
 
-	[PluginService] public static DalamudPluginInterface Interface { get; private set; } = null!;
+	[PluginService] public static IDalamudPluginInterface Interface { 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 IChatGui ChatGui { get; private set; } = null!;
@@ -107,15 +109,15 @@ public static unsafe bool CheckMountUnlocked(ushort mountId) {
 
 	private unsafe ushort mountId {
 		get {
-			GameObject? player = ClientState.LocalPlayer;
+			IGameObject? player = ClientState.LocalPlayer;
 			if (player is null)
 				return 0;
 			Character* native = (Character*)player.Address;
 			if (native is null)
 				return 0;
 			if (!native->IsMounted()) // just in case
 				return 0;
-			Character.MountContainer? mount = native->Mount;
+			MountContainer? mount = native->Mount;
 			return mount?.MountId ?? 0;
 		}
 	}
@@ -129,6 +131,13 @@ private void onConditionChanged(ConditionFlag flag, bool value) {
 			return;
 		}
 
+		if (Config.DisableBorderlessBgm) {
+			if (mountData[mount].BgmId == BgmIdBorderless) {
+				GameConfig.Set(SystemConfigOption.SoundChocobo, false);
+				return;
+			}
+		}
+
 		if ((Config.DisableBorderlessBgm && mountData[mount].BgmId == BgmIdBorderless) || Config.BgmDisabledMounts.Contains(mount))
 			GameConfig.Set(SystemConfigOption.SoundChocobo, false);
 		else

diff --git a/AutoMountBgm/dalamud.props b/AutoMountBgm/dalamud.props
@@ -15,7 +15,7 @@
 	<Import Project="framework.props" />
 
 	<ItemGroup>
-		<PackageReference Include="DalamudPackager" Version="2.1.12" />
+		<PackageReference Include="DalamudPackager" Version="2.1.13" />
 		<Reference Include="Newtonsoft.Json">
 			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
 			<Private>False</Private>
@@ -44,6 +44,10 @@
 			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
+		<Reference Include="InteropGenerator.Runtime">
+			<HintPath>$(DalamudLibPath)InteropGenerator.Runtime.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/AutoMountBgm/framework.props b/AutoMountBgm/framework.props
@@ -41,8 +41,8 @@
 	-->
 
 	<PropertyGroup Condition=" '$(Product)' != '' ">
-		<AssemblyName Condition=" '$(AssemblyName)' == '' ">$(Product)</AssemblyName>
-		<PackageId Condition=" '$(PackageId)' == '' ">$(Product)</PackageId>
+		<AssemblyName Condition=" '$(AssemblyName)' == '' ">$(Product.Replace("-", "."))</AssemblyName>
+		<PackageId Condition=" '$(PackageId)' == '' ">$(Product.Replace("-", "."))</PackageId>
 		<Title Condition=" '$(Title)' == '' ">$(Product)</Title>
 		<PackageProjectUrl Condition=" '$(PackageProjectUrl)' == '' ">https://github.com/PrincessRTFM/$(Product)</PackageProjectUrl>
 	</PropertyGroup>

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