Cleanup

Author: AsgardXIV

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
         git config --global user.email "[email protected]"
         git fetch origin main && git checkout main
         $ver = '${{ github.event.inputs.version }}'
-        $path = './Resources/Templates/repo_template.json'
+        $path = './Resources/Templates/repo.tmpl'
         $new_path = './repo.json'
         $content = get-content -path $path
         $content = $content -replace '{version}',$ver

Brio/Game/World/FestivalService.cs

@@ -1,5 +1,6 @@
 using Brio.Core;
 using Brio.Game.GPose;
+using Brio.Game.World.Interop;
 using Brio.Utils;
 using Lumina.Excel.GeneratedSheets;
 using System.Collections.Generic;

Brio/Game/World/FestivalInterop.cs Brio/Game/World/Interop/FestivalInterop.cs

@@ -4,26 +4,26 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Brio.Game.World;
+namespace Brio.Game.World.Interop;
 
 // TODO: Move into ClientStructs
 // Tracking: https://github.com/aers/FFXIVClientStructs/pull/310 & https://github.com/aers/FFXIVClientStructs/pull/311
 
 [StructLayout(LayoutKind.Explicit, Size = 0x98)]
-public unsafe struct LayoutManager
+public unsafe struct LayoutManagerStruct
 {
     [FieldOffset(0x38)] public uint FestivalStatus; // SetActiveFestivals will not allow a change when not 5 or 0
     [FieldOffset(0x40)] public fixed uint ActiveFestivals[4];
 }
 
 public unsafe class LayoutManagerInterop
 {
-    private delegate void SetActiveFestivalsDelegate(LayoutManager* instance, uint* festivalArray);
+    private delegate void SetActiveFestivalsDelegate(LayoutManagerStruct* instance, uint* festivalArray);
 
     [Signature("E8 ?? ?? ?? ?? 8B C5 EB 6A", ScanType = ScanType.Text)]
     private SetActiveFestivalsDelegate _setActiveFestivals = null!;
 
-    public LayoutManagerInterop() 
+    public LayoutManagerInterop()
     {
         SignatureHelper.Initialise(this);
     }
@@ -33,7 +33,7 @@ public unsafe void SetActiveFestivals(uint* festivalArray)
         var world = LayoutWorld.Instance();
         if(world != null)
         {
-            var manager = (LayoutManager*) world->ActiveLayout;
+            var manager = (LayoutManagerStruct*)world->ActiveLayout;
             if(manager != null)
             {
                 _setActiveFestivals(manager, festivalArray);
@@ -48,7 +48,7 @@ public uint[] GetActiveFestivals()
         var world = LayoutWorld.Instance();
         if(world != null)
         {
-            var manager = (LayoutManager*)world->ActiveLayout;
+            var manager = (LayoutManagerStruct*)world->ActiveLayout;
             if(manager != null)
             {
                 for(int i = 0; i < 4; ++i)
@@ -68,7 +68,7 @@ public bool IsBusy
             var world = LayoutWorld.Instance();
             if(world != null)
             {
-                var manager = (LayoutManager*)world->ActiveLayout;
+                var manager = (LayoutManagerStruct*)world->ActiveLayout;
                 if(manager != null)
                 {
                     return manager->FestivalStatus != 0 && manager->FestivalStatus != 5;

Brio/UI/Components/Debug/DebugAddressControls.cs

@@ -0,0 +1,38 @@
+using FFXIVClientStructs.FFXIV.Client.Game;
+using FFXIVClientStructs.FFXIV.Client.LayoutEngine;
+using ImGuiNET;
+using static Brio.Game.World.WeatherService;
+using System;
+using System.Runtime.InteropServices;
+
+namespace Brio.UI.Components.Debug;
+public static class DebugAddressControls
+{
+    public unsafe static void Draw()
+    {
+        if(ImGui.Button("Copy Layout World Address"))
+        {
+            var addr = (nint)LayoutWorld.Instance();
+            ImGui.SetClipboardText(addr.ToString("X"));
+        }
+
+        if(ImGui.Button("Copy Layout Manager Address"))
+        {
+            var addr = (nint)LayoutWorld.Instance()->ActiveLayout;
+            ImGui.SetClipboardText(addr.ToString("X"));
+        }
+
+        if(ImGui.Button("Copy Game Main Address"))
+        {
+            var addr = (nint)GameMain.Instance();
+            ImGui.SetClipboardText(addr.ToString("X"));
+        }
+
+        if(ImGui.Button("Copy EnvManager Address"))
+        {
+            IntPtr rawWeather = Dalamud.SigScanner.GetStaticAddressFromSig("4C 8B 05 ?? ?? ?? ?? 41 8B 80 ?? ?? ?? ?? C1 E8 02");
+            IntPtr weatherSystem = Marshal.ReadIntPtr(rawWeather);  
+            ImGui.SetClipboardText(weatherSystem.ToString("X"));
+        }
+    }
+}

Brio/UI/Components/Debug/DebugSandboxControls.cs

@@ -1,23 +1,11 @@
-using FFXIVClientStructs.FFXIV.Client.Game;
-using FFXIVClientStructs.FFXIV.Client.LayoutEngine;
-using ImGuiNET;
+using ImGuiNET;
 
 namespace Brio.UI.Components.Debug;
 public static class DebugSandboxControls
 {
     public unsafe static void Draw()
     {
-       if(ImGui.Button("Copy Layout Address"))
-        {
-            var addr = (nint) LayoutWorld.Instance();
-            ImGui.SetClipboardText(addr.ToString("X"));
-        }
-
-        if(ImGui.Button("Copy Game Main Address"))
-        {
-            var addr = (nint)GameMain.Instance();
-            ImGui.SetClipboardText(addr.ToString("X"));
-        }
+       
 
     }
 }

Brio/UI/Components/Debug/DebugTab.cs

@@ -16,6 +16,11 @@ public unsafe static void Draw()
             DebugIPCControls.Draw();
         }
 
+        if(ImGui.CollapsingHeader("Addresses"))
+        {
+            DebugAddressControls.Draw();
+        }
+
         if(ImGui.CollapsingHeader("Sandbox"))
         {
             DebugSandboxControls.Draw();