From 1ced66e5b791a5d960b224bf5fae569bc545a4e5 Mon Sep 17 00:00:00 2001 From: Joshua Lui Date: Sat, 25 Feb 2023 10:53:25 +0100 Subject: [PATCH] - Bugfix: 'Load' was not working when the file location did not end in .json --- MakePlacePlugin.json | 8 ++++---- MakePlacePlugin/Gui/ConfigurationWindow.cs | 4 ---- MakePlacePlugin/MakePlacePlugin.cs | 7 +------ MakePlacePlugin/MakePlacePlugin.csproj | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/MakePlacePlugin.json b/MakePlacePlugin.json index 4362551..462ba07 100644 --- a/MakePlacePlugin.json +++ b/MakePlacePlugin.json @@ -2,7 +2,7 @@ "Author": "Jawslouis", "Name": "MakePlace Plugin", "InternalName": "MakePlacePlugin", - "AssemblyVersion": "2.20", + "AssemblyVersion": "2.21", "Punchline": "Automatically save & load furniture layouts in your house.", "Description": "Automatically save & load the positions of house furniture. Import/export layouts from the MakePlace program.", "ApplicableVersion": "any", @@ -17,9 +17,9 @@ "LoadPriority": 0, "IconUrl": "https://raw.githubusercontent.com/jawslouis/MakePlacePlugin/master/icon.png", "DownloadCount": 68397, - "DownloadLinkInstall": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.20/MakePlacePlugin.zip", - "DownloadLinkTesting": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.20/MakePlacePlugin.zip", - "DownloadLinkUpdate": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.20/MakePlacePlugin.zip", + "DownloadLinkInstall": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.21/MakePlacePlugin.zip", + "DownloadLinkTesting": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.21/MakePlacePlugin.zip", + "DownloadLinkUpdate": "https://github.com/jawslouis/MakePlacePlugin/releases/download/v2.21/MakePlacePlugin.zip", "_isDip17Plugin": false, "_Dip17Channel": null }] diff --git a/MakePlacePlugin/Gui/ConfigurationWindow.cs b/MakePlacePlugin/Gui/ConfigurationWindow.cs index c6860a8..3a8693b 100644 --- a/MakePlacePlugin/Gui/ConfigurationWindow.cs +++ b/MakePlacePlugin/Gui/ConfigurationWindow.cs @@ -230,10 +230,6 @@ unsafe private void DrawGeneralSettings() LogError("(Housing -> Indoor/Outdoor Furnishings)"); } - else if (!Config.SaveLocation.EndsWith(".json")) - { - LogError("Error: Json layout file not specified"); - } else { diff --git a/MakePlacePlugin/MakePlacePlugin.cs b/MakePlacePlugin/MakePlacePlugin.cs index 0cd38f7..d134954 100644 --- a/MakePlacePlugin/MakePlacePlugin.cs +++ b/MakePlacePlugin/MakePlacePlugin.cs @@ -122,7 +122,7 @@ public MakePlacePlugin( Memory.Init(Scanner); LayoutManager = new SaveLayoutManager(this, ChatGui, Config); - PluginLog.Log("MakePlace Plugin v2.20 initialized"); + PluginLog.Log("MakePlace Plugin v2.21 initialized"); } public void Initialize() { @@ -425,11 +425,6 @@ public unsafe void MatchLayout() houseItem.CorrectLocation = locationError.LengthSquared() < 0.0001; houseItem.CorrectRotation = localRotation - houseItem.Rotate < 0.001; - if (!houseItem.CorrectRotation) - { - Log($"localRotation: {localRotation}, houseItem rotation: {houseItem.Rotate * 180 / Math.PI}"); - } - houseItem.ItemStruct = (IntPtr)gameObject.Item; } diff --git a/MakePlacePlugin/MakePlacePlugin.csproj b/MakePlacePlugin/MakePlacePlugin.csproj index ec64900..ad214d8 100644 --- a/MakePlacePlugin/MakePlacePlugin.csproj +++ b/MakePlacePlugin/MakePlacePlugin.csproj @@ -2,7 +2,7 @@ $(AppData)\XIVLauncher\addon\Hooks\dev\ - 2.20 + 2.21