diff --git a/FantasyPlayer.Mock/FantasyPlayer.Mock.csproj b/FantasyPlayer.Mock/FantasyPlayer.Mock.csproj index b3d9894..532f821 100644 --- a/FantasyPlayer.Mock/FantasyPlayer.Mock.csproj +++ b/FantasyPlayer.Mock/FantasyPlayer.Mock.csproj @@ -9,7 +9,10 @@ - $(AppData)\XIVLauncher\addon\Hooks\dev\ + $(appdata)\XIVLauncher\addon\Hooks\dev\ + $(HOME)/.xlcore/dalamud/Hooks/dev/ + $(HOME)/Library/Application Support/XIV on Mac/dalamud/Hooks/dev/ + $(DALAMUD_HOME)/ @@ -56,17 +59,17 @@ - - + + - - - - + + + + @@ -88,6 +91,15 @@ Always + + Always + + + Always + + + Always + diff --git a/FantasyPlayer.Mock/MockPlugin.cs b/FantasyPlayer.Mock/MockPlugin.cs index a8b4f6c..e1a00aa 100644 --- a/FantasyPlayer.Mock/MockPlugin.cs +++ b/FantasyPlayer.Mock/MockPlugin.cs @@ -4,7 +4,6 @@ namespace FantasyPlayer.Mock; using DalaMock.Core.Mocks; using DalaMock.Core.Windows; using DalaMock.Shared.Interfaces; -using Dalamud.Interface.Windowing; using Dalamud.Plugin; using Dalamud.Plugin.Services; diff --git a/FantasyPlayer.Mock/cimgui.so b/FantasyPlayer.Mock/cimgui.so new file mode 100644 index 0000000..65d6c2e Binary files /dev/null and b/FantasyPlayer.Mock/cimgui.so differ diff --git a/FantasyPlayer.Mock/cimguizmo.so b/FantasyPlayer.Mock/cimguizmo.so new file mode 100644 index 0000000..c99e3f1 Binary files /dev/null and b/FantasyPlayer.Mock/cimguizmo.so differ diff --git a/FantasyPlayer.Mock/cimplot.so b/FantasyPlayer.Mock/cimplot.so new file mode 100644 index 0000000..7f3761b Binary files /dev/null and b/FantasyPlayer.Mock/cimplot.so differ diff --git a/FantasyPlayer/FantasyPlayer.csproj b/FantasyPlayer/FantasyPlayer.csproj index 04e20bb..45a29f9 100644 --- a/FantasyPlayer/FantasyPlayer.csproj +++ b/FantasyPlayer/FantasyPlayer.csproj @@ -37,8 +37,8 @@ - - + + diff --git a/FantasyPlayer/packages.lock.json b/FantasyPlayer/packages.lock.json index 8d76eab..e2bfd18 100644 --- a/FantasyPlayer/packages.lock.json +++ b/FantasyPlayer/packages.lock.json @@ -13,14 +13,15 @@ }, "DalaMock.Host": { "type": "Direct", - "requested": "[2.0.5, )", - "resolved": "2.0.5", - "contentHash": "aACvYvdMqmOokuO8XKjtoKClumw2xGXpniZVXJAFfz1PpfNWt7yZb8W60K+Q4acSzlDp4nd9ahZDxQjBrf2tOA==", + "requested": "[2.1.1, )", + "resolved": "2.1.1", + "contentHash": "qgdiiJ/vKRMna3GOzgwJ/GhaMlNI0xfCHND9lEob5u2xfJVSUHpI/g6KbY6Jp9xB4YOt6FGPPJ/qjbmJSrce8w==", "dependencies": { "Autofac.Extensions.DependencyInjection": "9.0.0", - "DalaMock.Shared": "2.0.5", + "DalaMock.Shared": "2.1.1", "Microsoft.Extensions.Hosting": "8.0.0", "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.ObjectPool": "9.0.0-preview.6.24328.4", "Serilog": "2.11.0", "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.Console": "4.0.1", @@ -29,9 +30,9 @@ }, "DalaMock.Shared": { "type": "Direct", - "requested": "[2.0.5, )", - "resolved": "2.0.5", - "contentHash": "CJOdmfCLFVXh70XQsaNq/J3X4HP8Wou7sBV9NmeM8ND9Y0RJyE2u5Lqsnl3bgzwFj2xOa2UI4ioRKSTLaFEIlA==", + "requested": "[2.1.1, )", + "resolved": "2.1.1", + "contentHash": "atV+mzv6vpepSMTO0IBAMyFDx1gSxVbjsKWAHIesRUVqetvC3BD6wpx4JaVAjS1OIVIRnXueDvyXV9UYMnGYNA==", "dependencies": { "Autofac.Extensions.DependencyInjection": "9.0.0", "Microsoft.Extensions.Hosting": "8.0.0", @@ -40,9 +41,9 @@ }, "DalamudPackager": { "type": "Direct", - "requested": "[2.1.13, )", - "resolved": "2.1.13", - "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ==" + "requested": "[11.0.0, )", + "resolved": "11.0.0", + "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" }, "SpotifyAPI.Web": { "type": "Direct", @@ -331,6 +332,11 @@ "System.Text.Json": "8.0.0" } }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "9.0.0-preview.6.24328.4", + "contentHash": "gtSoyW2B38YGz5TWzlZbi8AoPUryq00xvVBCGkN288lHU7e9oap/GSOwoi7bXGNOWnLJGske1yUZFDDj+3QGkw==" + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "8.0.0",