diff --git a/DrahsidLib b/DrahsidLib index 34d9bd2..617be46 160000 --- a/DrahsidLib +++ b/DrahsidLib @@ -1 +1 @@ -Subproject commit 34d9bd239a95ecdc8cab5180db657d41c8fe3f74 +Subproject commit 617be463a128ba0621770b793b5ac14edc0c8763 diff --git a/HybridCamera.sln b/HybridCamera.sln index 31fa56a..c431065 100644 --- a/HybridCamera.sln +++ b/HybridCamera.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.34931.43 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HybridCamera", "HybridCamera\HybridCamera.csproj", "{96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrahsidLib", "DrahsidLib\DrahsidLib.csproj", "{36FCE424-621F-404F-A842-C400D674654C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU {96A11C55-C1E2-410E-A6AC-300BFCEF4F5D}.Release|Any CPU.Build.0 = Release|Any CPU + {36FCE424-621F-404F-A842-C400D674654C}.Debug|Any CPU.ActiveCfg = Debug|x64 + {36FCE424-621F-404F-A842-C400D674654C}.Debug|Any CPU.Build.0 = Debug|x64 + {36FCE424-621F-404F-A842-C400D674654C}.Release|Any CPU.ActiveCfg = Release|x64 + {36FCE424-621F-404F-A842-C400D674654C}.Release|Any CPU.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/HybridCamera/HybridCamera.csproj b/HybridCamera/HybridCamera.csproj index 3853372..dfaa558 100644 --- a/HybridCamera/HybridCamera.csproj +++ b/HybridCamera/HybridCamera.csproj @@ -1,10 +1,4 @@ - - - - net9.0 - preview - 1701;1702;CA1416 - + false diff --git a/HybridCamera/HybridCamera.json b/HybridCamera/HybridCamera.json index d328b4d..2ecd838 100644 --- a/HybridCamera/HybridCamera.json +++ b/HybridCamera/HybridCamera.json @@ -5,6 +5,7 @@ "Description": "Hybrid camera/movement mode! Move freely!", "Punchline": "Legacy and standard movement in one! Move freely!", "RepoUrl": "https://github.com/Drahsid/HybridCamera", + "tags": ["camera", "qol", "gameplay"] } diff --git a/HybridCamera/MovementHook.cs b/HybridCamera/MovementHook.cs index db9238b..7a18338 100644 --- a/HybridCamera/MovementHook.cs +++ b/HybridCamera/MovementHook.cs @@ -318,7 +318,7 @@ public static unsafe void MovementDirectionUpdate(MoveControllerSubMemberForMine shouldContinue = false; } - MovementDirectionUpdateHook.Original(thisx, wishdir_h, wishdir_v, rotatedir, align_with_camera, autorun, dont_rotate_with_camera); + MovementDirectionUpdateHook?.Original(thisx, wishdir_h, wishdir_v, rotatedir, align_with_camera, autorun, dont_rotate_with_camera); if (!shouldContinue) return; @@ -387,12 +387,12 @@ public static unsafe void MovementDirectionUpdate(MoveControllerSubMemberForMine public static unsafe void MovementUpdate(MoveControllerSubMemberForMine* thisx, float wishdir_h, float wishdir_v, char arg4, byte align_with_camera, Vector3* direction) { - MovementUpdateHook.Original(thisx, wishdir_h, wishdir_v, arg4, align_with_camera, direction); + MovementUpdateHook?.Original(thisx, wishdir_h, wishdir_v, arg4, align_with_camera, direction); } public static unsafe void MovementUpdate2(MoveControllerSubMemberForMine* thisx, Vector3* direction, byte arg3, UInt64 align_with_camera, byte arg5, byte arg6, Vector3* arg7, UInt64 arg8) { - MovementUpdate2Hook.Original(thisx, direction, arg3, align_with_camera, arg5, arg6, arg7, arg8); // thisx->Moved indirectly gets updated in here if direction is laterally non-zero + MovementUpdate2Hook?.Original(thisx, direction, arg3, align_with_camera, arg5, arg6, arg7, arg8); // thisx->Moved indirectly gets updated in here if direction is laterally non-zero } public static unsafe void MovementSpeedUpdate(MoveControllerSubMemberForMine* thisx) diff --git a/HybridCamera/packages.lock.json b/HybridCamera/packages.lock.json index 3facbaa..fea9fd0 100644 --- a/HybridCamera/packages.lock.json +++ b/HybridCamera/packages.lock.json @@ -1,23 +1,23 @@ { "version": 1, "dependencies": { - "net9.0": { + "net10.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[13.0.0, )", - "resolved": "13.0.0", - "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w==" + "requested": "[14.0.1, )", + "resolved": "14.0.1", + "contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA==" }, "DotNet.ReproducibleBuilds": { "type": "Direct", - "requested": "[1.2.25, )", - "resolved": "1.2.25", - "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg==" + "requested": "[1.2.39, )", + "resolved": "1.2.39", + "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg==" }, "drahsidlib": { "type": "Project", "dependencies": { - "DalamudPackager": "[13.0.0, )" + "DalamudPackager": "[14.0.1, )" } } }