4 Commits

Author SHA1 Message Date
038f71ceb2 fix submodule 2025-12-20 10:37:07 +01:00
a1d5bb5be8 update submodule url 2025-12-20 10:25:39 +01:00
de382eca20 version bump 2025-08-13 07:45:17 +02:00
5b3beabac0 API13 2025-08-13 07:44:13 +02:00
6 changed files with 20 additions and 31 deletions

3
.gitmodules vendored
View File

@@ -1,4 +1,3 @@
[submodule "Pilz.Dalamud"]
path = Pilz.Dalamud
url = https://git.pilzinsel64.de/pilz-framework/pilz.dalamud.git
branch = master
url = https://git.pilzinsel64.de/Pilz.NET/Pilz.Dalamud.git

View File

@@ -3,7 +3,7 @@ using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Interface;
using Dalamud.Interface.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Lumina.Excel.Sheets;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.Icons;
@@ -558,7 +558,7 @@ public class PluginConfigurationUI
// Render the child nodes
if (isOpened)
{
ImGui.TreePush();
ImGui.TreePush(tag.GetHashCode().ToString());
foreach (var childTag in tag.Children.OrderBy(child => GetTreeItemName(child)).ToArray())
{
DrawTree(childTag);

View File

@@ -1,8 +1,8 @@
<Project Sdk="Dalamud.NET.Sdk/12.0.2">
<Project Sdk="Dalamud.NET.Sdk/13.0.0">
<PropertyGroup>
<Authors>r00telement;Pilzinsel64</Authors>
<Version>1.12.2.0</Version>
<Version>1.12.3.0</Version>
</PropertyGroup>
<PropertyGroup>

View File

@@ -1,4 +1,4 @@
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Lumina.Excel;
using Lumina.Excel.Sheets;
using System;
@@ -25,15 +25,7 @@ public static class UIColorHelper
private static UIColor[] s_UIColors = null!;
public static IEnumerable<UIColor> UIColors
{
get
{
s_UIColors ??= CreateUIColors();
return s_UIColors;
}
}
public static IEnumerable<UIColor> UIColors => s_UIColors ??= CreateUIColors();
public static Vector4 ToColor(UIColor uiColor)
{
@@ -50,9 +42,7 @@ public static class UIColorHelper
foreach (var uiColor in UIColors)
{
if ((ushort)uiColor.RowId == colorId)
{
return ToColor(uiColor);
}
}
return new Vector4();
@@ -68,30 +58,30 @@ public static class UIColorHelper
{
var leftColor = ToColor(left);
var rightColor = ToColor(right);
ImGui.ColorConvertRGBtoHSV(leftColor.X, leftColor.Y, leftColor.Z, out float leftHue, out float leftSaturation, out float leftValue);
ImGui.ColorConvertRGBtoHSV(rightColor.X, rightColor.Y, rightColor.Z, out float rightHue, out float rightSaturation, out float rightValue);
var leftHue = 0f;
var leftSaturation = 0f;
var leftValue = 0f;
var rightHue = 0f;
var rightSaturation = 0f;
var rightValue = 0f;
ImGui.ColorConvertRGBtoHSV(leftColor.X, leftColor.Y, leftColor.Z, ref leftHue, ref leftSaturation, ref leftValue);
ImGui.ColorConvertRGBtoHSV(rightColor.X, rightColor.Y, rightColor.Z, ref rightHue, ref rightSaturation, ref rightValue);
var hueDifference = leftHue.CompareTo(rightHue);
if (hueDifference != 0)
{
return hueDifference;
}
var valueDifference = leftValue.CompareTo(rightValue);
if (valueDifference != 0)
{
return valueDifference;
}
var saturationDifference = leftSaturation.CompareTo(rightSaturation);
if (saturationDifference != 0)
{
return saturationDifference;
}
return 0;
});
return filteredUIColors.ToArray();
return [.. filteredUIColors];
}
}

View File

@@ -4,9 +4,9 @@
"net9.0-windows7.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",