Explorar el Código

Net 7 update and style changes

Dragon hace 3 años
padre
commit
8bf01c844d

+ 1 - 1
HuntBuddy/Configuration.cs

@@ -13,7 +13,7 @@ namespace HuntBuddy
 		public bool HideLocalHuntBackground;
 		public bool HideCompletedHunts;
 		public float IconScale = 1f;
-		public Vector4 IconBackgroundColour = new(0.76f, 0.75f, 0.76f, 0.8f);
+		public Vector4 IconBackgroundColour = new (0.76f, 0.75f, 0.76f, 0.8f);
 
 		[JsonIgnore] public uint IconBackgroundColourU32;
 

+ 4 - 4
HuntBuddy/HuntBuddy.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net7.0-windows</TargetFramework>
         <Nullable>enable</Nullable>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <FileVersion>1.0.0.0</FileVersion>
+        <AssemblyVersion>1.0.0.1</AssemblyVersion>
+        <FileVersion>1.0.0.1</FileVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RootNamespace>HuntBuddy</RootNamespace>
         <IsPackable>false</IsPackable>
@@ -54,6 +54,6 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.8" />
+        <PackageReference Include="DalamudPackager" Version="2.1.10" />
     </ItemGroup>
 </Project>

+ 1 - 1
HuntBuddy/Interface.cs

@@ -379,7 +379,7 @@ namespace HuntBuddy
 			ImGui.InvisibleButton("canvas", imageSize);
 
 			var drawList = ImGui.GetWindowDrawList();
-			if (mobHuntEntry.ExpansionId == 4 && !mobHuntEntry.IsEliteMark) // Endwalker uses circle for non elite mobs
+			if (mobHuntEntry is { ExpansionId: 4, IsEliteMark: false }) // Endwalker uses circle for non elite mobs
 			{
 				drawList.AddCircleFilled(
 					cursorPos + (imageSize / 2f),

+ 2 - 4
HuntBuddy/Location.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
-using FFXIVClientStructs.FFXIV.Client.UI;
 using Lumina.Excel.GeneratedSheets;
 using MapType = FFXIVClientStructs.FFXIV.Client.UI.Agent.MapType;
 
@@ -17,11 +15,11 @@ namespace HuntBuddy
 
 			public float Y { get; init; }
 
-			public Vector2 Coordinate => new(this.X, this.Y);
+			public Vector2 Coordinate => new (this.X, this.Y);
 		}
 
 		// MobHuntId as key
-		public static readonly Dictionary<uint, PositionInfo> Database = new()
+		public static readonly Dictionary<uint, PositionInfo> Database = new ()
 		{
 			// Heavensward
 			// Coerthas Western Highlands

+ 4 - 4
HuntBuddy/packages.lock.json

@@ -1,12 +1,12 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0-windows7.0": {
+    "net7.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.8, )",
-        "resolved": "2.1.8",
-        "contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A=="
+        "requested": "[2.1.10, )",
+        "resolved": "2.1.10",
+        "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw=="
       }
     }
   }