diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f9220f6..9ab31c7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -28,17 +28,17 @@ jobs: uses: actions/checkout@v4 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Setup NuGet - uses: NuGet/setup-nuget@v1 + uses: NuGet/setup-nuget@v2 - name: Restore Packages run: nuget restore ${{ env.solutionFile }} - name: Get version from update.xml id: getVersion - uses: mavrosxristoforos/get-xml-info@1.2.1 + uses: mavrosxristoforos/get-xml-info@2.0 with: xml-file: update.xml xpath: //update/@version @@ -61,7 +61,7 @@ jobs: run: msbuild ${{ env.solutionFile }} -t:rebuild -property:Configuration=${{ matrix.configuration }} - name: Upload the build results as an artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.projectFolder }}/bin/${{ matrix.configuration }}/* name: ${{ env.projectName }}.Nightly.${{ matrix.configuration }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3da8d9..8e1fca6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,17 +34,17 @@ jobs: git config user.email "<>" - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Setup NuGet - uses: NuGet/setup-nuget@v1 + uses: NuGet/setup-nuget@v2 - name: Restore Packages run: nuget restore ${{ env.solutionFile }} - name: Get version from release name id: version - uses: mad9000/actions-find-and-replace-string@4 + uses: mad9000/actions-find-and-replace-string@5 with: source: "${{ github.event.release.tag_name }}" find: "v" @@ -68,7 +68,7 @@ jobs: run: msbuild ${{ env.solutionFile }} -t:rebuild -property:Configuration=${{ matrix.configuration }} - name: Upload the build results as an artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.projectFolder }}/bin/${{ matrix.configuration }}/* name: ${{ env.projectName }}.${{ github.event.release.tag_name }}.${{ matrix.configuration }} diff --git a/FunkeySelector/CustomFManager.cs b/FunkeySelector/CustomFManager.cs index e33e658..1760684 100644 --- a/FunkeySelector/CustomFManager.cs +++ b/FunkeySelector/CustomFManager.cs @@ -70,34 +70,34 @@ public static void SendFunkeyViaMB(string funkeyID) if (gamePtr == IntPtr.Zero) { MessageBox.Show("There is no instance of U.B. Funkeys currently running.", "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; } - else + + IntPtr ptrCopyData = IntPtr.Zero; + try { - IntPtr ptrCopyData = IntPtr.Zero; - try + COPYDATASTRUCT copyData = new() { - COPYDATASTRUCT copyData = new COPYDATASTRUCT - { - dwData = new IntPtr(238164658), //A strange data type that's required for the game to switch the Bitty. - cbData = idtosend.Length + 1, - lpData = Marshal.StringToHGlobalAnsi(idtosend) - }; + dwData = new IntPtr(238164658), // A strange data type that's required for the game to switch the Bitty. + cbData = idtosend.Length + 1, + lpData = Marshal.StringToHGlobalAnsi(idtosend) + }; - ptrCopyData = Marshal.AllocCoTaskMem(Marshal.SizeOf(copyData)); - Marshal.StructureToPtr(copyData, ptrCopyData, false); + ptrCopyData = Marshal.AllocCoTaskMem(Marshal.SizeOf(copyData)); + Marshal.StructureToPtr(copyData, ptrCopyData, false); - SendMessage(gamePtr, WM_COPYDATA, IntPtr.Zero, ptrCopyData); - } - catch (Exception ex) - { - MessageBox.Show(ex.ToString(), "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - finally - { - if (ptrCopyData != IntPtr.Zero) - Marshal.FreeCoTaskMem(ptrCopyData); - } + SendMessage(gamePtr, WM_COPYDATA, IntPtr.Zero, ptrCopyData); + } + catch (Exception ex) + { + MessageBox.Show(ex.ToString(), "FunkeySelectorGUI", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + finally + { + if (ptrCopyData != IntPtr.Zero) + Marshal.FreeCoTaskMem(ptrCopyData); } + } } } diff --git a/FunkeySelector/CustomFunkeys.Designer.cs b/FunkeySelector/CustomFunkeys.Designer.cs index b510c43..0295ece 100644 --- a/FunkeySelector/CustomFunkeys.Designer.cs +++ b/FunkeySelector/CustomFunkeys.Designer.cs @@ -91,14 +91,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 5; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 6; diff --git a/FunkeySelector/DaydreamOasis.Designer.cs b/FunkeySelector/DaydreamOasis.Designer.cs index c9a4b30..4bbb6cc 100644 --- a/FunkeySelector/DaydreamOasis.Designer.cs +++ b/FunkeySelector/DaydreamOasis.Designer.cs @@ -335,14 +335,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 19; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 20; diff --git a/FunkeySelector/FunkikiIsland.Designer.cs b/FunkeySelector/FunkikiIsland.Designer.cs index c638e11..4a79dcc 100644 --- a/FunkeySelector/FunkikiIsland.Designer.cs +++ b/FunkeySelector/FunkikiIsland.Designer.cs @@ -459,14 +459,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(641, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 27; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(680, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 28; diff --git a/FunkeySelector/HiddenRealm.Designer.cs b/FunkeySelector/HiddenRealm.Designer.cs index 27fbf25..bb7dd43 100644 --- a/FunkeySelector/HiddenRealm.Designer.cs +++ b/FunkeySelector/HiddenRealm.Designer.cs @@ -469,14 +469,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(641, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 27; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(680, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 28; diff --git a/FunkeySelector/LaputtaStation.Designer.cs b/FunkeySelector/LaputtaStation.Designer.cs index 29a36f9..1a2e705 100644 --- a/FunkeySelector/LaputtaStation.Designer.cs +++ b/FunkeySelector/LaputtaStation.Designer.cs @@ -366,14 +366,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(641, 16); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 21; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(680, 18); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 22; diff --git a/FunkeySelector/MagmaGorge.Designer.cs b/FunkeySelector/MagmaGorge.Designer.cs index b033b48..e00686e 100644 --- a/FunkeySelector/MagmaGorge.Designer.cs +++ b/FunkeySelector/MagmaGorge.Designer.cs @@ -335,14 +335,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(641, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 19; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(680, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 20; diff --git a/FunkeySelector/NightmareRift.Designer.cs b/FunkeySelector/NightmareRift.Designer.cs index aa39665..d994ead 100644 --- a/FunkeySelector/NightmareRift.Designer.cs +++ b/FunkeySelector/NightmareRift.Designer.cs @@ -335,14 +335,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 19; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 20; diff --git a/FunkeySelector/ParadoxGreen.Designer.cs b/FunkeySelector/ParadoxGreen.Designer.cs index 9bd54b9..8ba82e7 100644 --- a/FunkeySelector/ParadoxGreen.Designer.cs +++ b/FunkeySelector/ParadoxGreen.Designer.cs @@ -263,14 +263,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 14); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 15; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 16); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 16; diff --git a/FunkeySelector/Program.cs b/FunkeySelector/Program.cs index cd8ac91..e750f28 100644 --- a/FunkeySelector/Program.cs +++ b/FunkeySelector/Program.cs @@ -36,7 +36,7 @@ static void Main(string[] args) } } - Application.EnableVisualStyles(); + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); } diff --git a/FunkeySelector/RoyaltonRacingComplex.Designer.cs b/FunkeySelector/RoyaltonRacingComplex.Designer.cs index 1cda02a..f2edd5d 100644 --- a/FunkeySelector/RoyaltonRacingComplex.Designer.cs +++ b/FunkeySelector/RoyaltonRacingComplex.Designer.cs @@ -315,14 +315,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 19; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 20; diff --git a/FunkeySelector/UnusedFunkeys.Designer.cs b/FunkeySelector/UnusedFunkeys.Designer.cs index cc7fab9..527a6b0 100644 --- a/FunkeySelector/UnusedFunkeys.Designer.cs +++ b/FunkeySelector/UnusedFunkeys.Designer.cs @@ -294,14 +294,14 @@ private void InitializeComponent() // // minimizeButton // - this.minimizeButton.Location = new System.Drawing.Point(642, 15); + this.minimizeButton.Location = new System.Drawing.Point(642, 16); this.minimizeButton.Name = "minimizeButton"; this.minimizeButton.Size = new System.Drawing.Size(26, 22); this.minimizeButton.TabIndex = 17; // // closeButton // - this.closeButton.Location = new System.Drawing.Point(681, 17); + this.closeButton.Location = new System.Drawing.Point(681, 18); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(26, 20); this.closeButton.TabIndex = 18;