Merge remote-tracking branch 'origin/HEAD'

lilyvelour · lilyvelour · commit 8cefdc4c8cd9 · 2025-09-28T23:34:28.000-05:00
diff --git a/base_repo.json b/base_repo.json
@@ -10,7 +10,7 @@
     "InternalName": "Microdancer",
     "AssemblyVersion": "1.0.0.0",
     "ApplicableVersion": "any",
-    "DalamudApiLevel": 12,
+    "DalamudApiLevel": 13,
     "LoadPriority": 0,
     "IsHide": "False",
     "IsTestingExclusive": "False",
diff --git a/src/Managers/PartyManager.cs b/src/Managers/PartyManager.cs
@@ -85,7 +85,7 @@ private int GetPartyType()
                 //     2: Player is in a cross-world party
                 //     3: Player is in an alliance group
                 //    -1: Player is in none of the above. Trust party maybe?
-                var pList = (AddonPartyList*)_gameGui.GetAddonByName("_PartyList", 1);
+                var pList = (AddonPartyList*)_gameGui.GetAddonByName("_PartyList", 1).Address;
                 var pTypeNode = pList->PartyTypeTextNode;
                 string pType = pTypeNode->NodeText.ToString();
                 switch (pType)
diff --git a/src/Microdancer.csproj b/src/Microdancer.csproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.SDK/12.0.2">
+<Project Sdk="Dalamud.NET.SDK/13.0.0">
 	
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
diff --git a/src/Microdancer.json b/src/Microdancer.json
@@ -8,6 +8,6 @@
   "AssemblyVersion": "1.0.0.0",
   "ApplicableVersion": "any",
   "LoadPriority": 0,
-  "DalamudApiLevel": 12,
+  "DalamudApiLevel": 13,
   "IconUrl": "https://microdancer.s3.amazonaws.com/icon.png"
 }
diff --git a/src/UI/Components/Breadcrumb.cs b/src/UI/Components/Breadcrumb.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/ContentArea.cs b/src/UI/Components/ContentArea.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 using Dalamud.Interface.Utility;
 
 namespace Microdancer
diff --git a/src/UI/Components/CreateButtons.cs b/src/UI/Components/CreateButtons.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/DisplayLibrary.cs b/src/UI/Components/DisplayLibrary.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/DisplayNode.cs b/src/UI/Components/DisplayNode.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/FileContents.cs b/src/UI/Components/FileContents.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
@@ -15,7 +15,7 @@ public bool Draw(Micro micro)
         {
             _info = new MicroInfo(micro);
 
-            ImGui.InvisibleButton($"file-contents-spacer-{micro.Id}", new(-1, 0.0f));
+            ImGui.InvisibleButton($"file-contents-spacer-{micro.Id}", new(-1, 0.01f));
 
             var framePadding = ImGui.GetStyle().FramePadding;
             var fileContentsSize = ImGui.GetContentRegionAvail();
diff --git a/src/UI/Components/Link.cs b/src/UI/Components/Link.cs
@@ -2,11 +2,11 @@
 using System.IO;
 using System.Numerics;
 using System.Threading.Tasks;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/NodeContextMenu.cs b/src/UI/Components/NodeContextMenu.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/PlaybackControls.cs b/src/UI/Components/PlaybackControls.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/RegionBar.cs b/src/UI/Components/RegionBar.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
@@ -133,7 +133,7 @@ public bool Draw(Micro micro)
 
                     ImGuiExt.TextTooltip(region.Name);
 
-                    if (ImGui.BeginPopupContextItem())
+                    if (ImGui.BeginPopupContextItem("###regionBarPopupContext"))
                     {
                         if (ImGui.Selectable($"Copy run command"))
                         {
diff --git a/src/UI/Components/Settings/LibraryPath.cs b/src/UI/Components/Settings/LibraryPath.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/Settings/NewFileTemplate.cs b/src/UI/Components/Settings/NewFileTemplate.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Numerics;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 
 namespace Microdancer
 {
@@ -19,7 +19,7 @@ public bool Draw()
             if (!Directory.Exists(Config.LibraryPath))
             {
                 ImGui.TextColored(
-                    new(1.0f, 0.0f, 0.0f, 1.0f),
+                    new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
                     "Please create or select a library before making a template.");
                 return true;
             }
@@ -28,7 +28,7 @@ public bool Draw()
             if (!File.Exists(templatePath))
             {
                 ImGui.TextColored(
-                    new(1.0f, 1.0f, 0.0f, 1.0f),
+                    new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
                     "A template file has not been created. Create one now?");
                 if (ImGui.Button("Create Default Template"))
                 {
diff --git a/src/UI/Components/Settings/ServerCredentials.cs b/src/UI/Components/Settings/ServerCredentials.cs
@@ -3,8 +3,8 @@
 using System.Numerics;
 using System.Security.Cryptography;
 using System.Text;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
@@ -20,8 +20,8 @@ public bool Draw()
 
             ImGui.Text("Microdancer can optionally be run with a server backend.");
             ImGui.Text("This lets users quickly share micro files between each other when connected to the same server.");
-            ImGui.TextColored(new(1.0f, 1.0f, 0.0f, 1.0f), "Only connect to Microdancer servers that you trust!");
-            ImGui.TextColored(new(1.0f, 1.0f, 0.0f, 1.0f), "Servers can see your player name, world, party members, nearby players, and your shared micro files.");
+            ImGui.TextColored(new Vector4(1.0f, 1.0f, 0.0f, 1.0f), "Only connect to Microdancer servers that you trust!");
+            ImGui.TextColored(new Vector4(1.0f, 1.0f, 0.0f, 1.0f), "Servers can see your player name, world, party members, nearby players, and your shared micro files.");
             ImGui.Spacing();
             ImGui.Spacing();
 
diff --git a/src/UI/Components/Settings/ThemeSettings.cs b/src/UI/Components/Settings/ThemeSettings.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/Components/Timeline.cs b/src/UI/Components/Timeline.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/UI/MicrodancerUi.cs b/src/UI/MicrodancerUi.cs
@@ -1,11 +1,11 @@
-﻿using ImGuiNET;
-using System.Numerics;
+﻿using System.Numerics;
 using System.Collections.Generic;
 using System;
 using System.Linq;
 using Dalamud.Plugin.Services;
 using Dalamud.Interface.Utility;
 using System.IO;
+using Dalamud.Bindings.ImGui;
 
 namespace Microdancer.UI
 {
@@ -67,7 +67,7 @@ public override void Draw()
                 else if (_clientState.LocalPlayer == null)
                 {
                     ImGui.BeginChildFrame(123456, new Vector2(-1, -1), ImGuiWindowFlags.NoBackground);
-                    ImGui.TextColored(new(0.67f, 0.67f, 0.67f, 1.0f), "Please wait....");
+                    ImGui.TextColored(new Vector4(0.67f, 0.67f, 0.67f, 1.0f), "Please wait....");
                     ImGui.EndChildFrame();
                 }
                 else
@@ -262,7 +262,7 @@ private void DrawMainContent()
             ImGui.PushStyleColor(ImGuiCol.TitleBgActive, Vector4.Zero);
             ImGui.PushStyleColor(ImGuiCol.DockingEmptyBg, Vector4.Zero);
 
-            ImGui.DockSpace(439839, new(-1, -1));
+            ImGui.DockSpace(439839, new Vector2(-1, -1));
 
             ImGui.PopStyleColor(3);
 
diff --git a/src/UI/SettingsUi.cs b/src/UI/SettingsUi.cs
@@ -1,7 +1,7 @@
-﻿using ImGuiNET;
-using System.Numerics;
+﻿using System.Numerics;
 using Dalamud.Plugin.Services;
 using Dalamud.Interface.Utility;
+using Dalamud.Bindings.ImGui;
 
 namespace Microdancer.UI
 {
diff --git a/src/UI/Themes/DefaultTheme.cs b/src/UI/Themes/DefaultTheme.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Numerics;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 
 namespace Microdancer
 {
diff --git a/src/UI/Themes/Theme.cs b/src/UI/Themes/Theme.cs
@@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using System.Numerics;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/Utility/ImGuiExt.cs b/src/Utility/ImGuiExt.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 
 namespace Microdancer
 {
diff --git a/src/packages.lock.json b/src/packages.lock.json
@@ -4,9 +4,9 @@
     "net9.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[12.0.0, )",
-        "resolved": "12.0.0",
-        "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw=="
+        "requested": "[13.0.0, )",
+        "resolved": "13.0.0",
+        "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`"AssemblyVersion": "1.0.0.0",`
`9`	`9`	`"ApplicableVersion": "any",`
`10`	`10`	`"LoadPriority": 0,`
`11`		`- "DalamudApiLevel": 12,`
	`11`	`+ "DalamudApiLevel": 13,`
`12`	`12`	`"IconUrl": "https://microdancer.s3.amazonaws.com/icon.png"`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using Dalamud.Bindings.ImGui;`
`3`	`4`	`using Dalamud.Interface;`
`4`		`-using ImGuiNET;`
`5`	`5`
`6`	`6`	`namespace Microdancer`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Numerics;`
	`2`	`+using Dalamud.Bindings.ImGui;`
`2`	`3`	`using Dalamud.Interface;`
`3`	`4`	`using Dalamud.Interface.Utility;`
`4`		`-using ImGuiNET;`
`5`	`5`
`6`	`6`	`namespace Microdancer`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.IO;`
`2`	`2`	`using System.Numerics;`
	`3`	`+using Dalamud.Bindings.ImGui;`
`3`	`4`	`using Dalamud.Interface;`
`4`		`-using ImGuiNET;`
`5`	`5`
`6`	`6`	`namespace Microdancer`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Numerics;`
	`3`	`+using Dalamud.Bindings.ImGui;`
`3`	`4`	`using Dalamud.Interface;`
`4`	`5`	`using Dalamud.Interface.Utility;`
`5`		`-using ImGuiNET;`
`6`	`6`
`7`	`7`	`namespace Microdancer`
`8`	`8`	`{`