Macos support #28

to-fuu · 2025-03-06T19:43:32Z

Adds support for Macs builds and UnleahsedRecomp

Can be built from code using the following command

dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:UseAppHost=true -property:Configuration=Release -p:PublishSingleFile=true

TODO:

Fix the app's icon
Add support for other games
Add build commands to github workflows

IsaacMarovitz · 2025-03-06T20:58:49Z

This PR contains many unrelated changes to formatting as well as a version bump that are wholly out of scope. Additionally this conflicts with my PR #20. Changes regarding Unleashed Recompiled should not be merged before the official release. Things are not set in stone and stuff like the name of the bundle may be subject to change still, which would break functionality here.

phamtheman69 · 2025-03-06T22:07:40Z

jaydenpham@Skibidi-toilet-ohio-gyatt-rizz-sigma-alpha ~ % cd /Users/jaydenpham/Downloads/HedgeModManager/Source/HedgeModManager.UI
jaydenpham@Skibidi-toilet-ohio-gyatt-rizz-sigma-alpha HedgeModManager.UI % dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:UseAppHost=true -property:Configuration=Release -p:PublishSingleFile=true
HedgeModManager.UI failed with 1 error(s) (0.0s)
/Users/jaydenpham/Downloads/HedgeModManager/Source/HedgeModManager.UI/HedgeModManager.UI.csproj : error MSB4057: The target "BundleApp" does not exist in the project.

Build failed with 1 error(s) in 0.5s
jaydenpham@Skibidi-toilet-ohio-gyatt-rizz-sigma-alpha HedgeModManager.UI %

do you know a fix? since you've already successfully built it do you think you could just drop the .app file?

phamtheman69 · 2025-03-06T22:59:57Z

nevermind, I fixed it by using the command cd to go to the folder hedgemodmanager.ui, and then changing the terminal command to "dotnet publish -r osx-arm64 -c Release --self-contained true", which didn't create a .app file but it did give me what i needed to start the app with " ./HedgeModManager.UI".

to-fuu · 2025-03-07T01:12:06Z

This PR contains many unrelated changes to formatting as well as a version bump that are wholly out of scope. Additionally this conflicts with my PR #20. Changes regarding Unleashed Recompiled should not be merged before the official release. Things are not set in stone and stuff like the name of the bundle may be subject to change still, which would break functionality here.

There isn't a version bump. Not sure why it looks that way but the version is the same as what's in the main branch now.
Some formatting changes ,ade by Rider did get through. Can be fixed.
I can't see how this would conflict with your PR, considering the only pieces of code you made are in 3 files that were not touched in this PR. Other than maybe the fact I'm using a different build method
The PR itself does not have to be merged now. Yes the mac port of unleashed is not finalized, but the changes I made to mod loading and the run command have nothing to do with Unleahsed itself. Those are changes that have to made regardless of what the bundle will be named in the future. Commenting out the following line in ModdableGameLocator.cs will make Unleashed undetectable.

 { "Macos", new("UnleashedRecomp", "UnleashedRecomp") },

to-fuu · 2025-03-07T03:09:06Z

Status:

Removed dependency on Dotnet.Bundle for builds
Disabled detecting UnleashedRecom (line can be uncommented to re-enable)

fred64k · 2025-03-07T04:40:07Z

I got the mod manager to build, but it's saying it can't find games. Do I have to point to it in a config file or something?

to-fuu · 2025-03-07T04:43:57Z

I got the mod manager to build, but it's saying it can't find games. Do I have to point to it in a config file or something?

Keep in mind this only works with unleashed as of now

If you pulled the latest changes, you will find under HedgeModManager/ModdableGameLocator that line 136 is commented. You need to uncomment it before building.
Also make sure you have moved the game itself to the Application folder.

IsaacMarovitz · 2025-03-07T10:15:01Z

There isn't a version bump. Not sure why it looks that way but the version is the same as what's in the main branch now.

Odd, I think your branch needs a rebase

Some formatting changes ,ade by Rider did get through. Can be fixed.

FYI, I am pro a consistent formatting style but later using dotnet format, but just to keep this changeset properly scoped it shouldn't be included here.

I can't see how this would conflict with your PR, considering the only pieces of code you made are in 3 files that were not touched in this PR. Other than maybe the fact I'm using a different build method

I was mainly referring to the build method. I spoke to SuperSonic16 and afaik she would prefer if it was all contained within one PR. I'm happy to PR to your branch or vice versa.

The PR itself does not have to be merged now. Yes the mac port of unleashed is not finalized, but the changes I made to mod loading and the run command have nothing to do with Unleahsed itself. Those are changes that have to made regardless of what the bundle will be named in the future. Commenting out the following line in ModdableGameLocator.cs will make Unleashed undetectable.

I will need to review these changes closely; Unleashed Recomp is an outlier; all other Sonic games on macOS will need to be launched through Wine.

IsaacMarovitz · 2025-03-07T10:39:48Z

I've rebased my changes on main

IsaacMarovitz · 2025-03-07T10:40:53Z

Source/HedgeModManager.UI/ViewModels/MainWindowViewModel.cs

                    if (SelectedGame.Game.ModLoaderConfiguration is ModLoaderConfiguration config)
-                        await config.Save(Path.Combine(SelectedGame.Game.Root, "cpkredir.ini"));
+                    {
+                        // For macos, save under the user's Application Support directory.


IsaacMarovitz · 2025-03-07T10:41:27Z

Source/HedgeModManager.UI/ViewModels/MainWindowViewModel.cs

+                        if (OperatingSystem.IsMacOS())
+                        {
+                            var appSupportDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+                            await config.Save(Path.Combine( appSupportDir,SelectedGame.Game.Executable, "cpkredir.ini"));


await config.Save(Path.Combine(appSupportDir, SelectedGame.Game.Executable, "cpkredir.ini"));

IsaacMarovitz · 2025-03-07T10:41:59Z

Source/HedgeModManager/GameSimple.cs

-            WorkingDirectory = Root,
-            UseShellExecute = true
-        });
+            // The command to launch macos apps is


IsaacMarovitz · 2025-03-07T10:42:34Z

Source/HedgeModManager/GameSimple.cs

-        });
+            // The command to launch macos apps is
+            // open -a path/to/my/app/appname
+            // When the app is inside the Application folder only the app's name is needed.


That being said, I think it would be better to opt for the full file path for specificity.

IsaacMarovitz · 2025-03-07T10:42:58Z

Source/HedgeModManager/ModdableGameLocator.cs

                    games.Add(game);
                }
            }
+            if (OperatingSystem.IsMacOS() && gameInfo.PlatformInfos.TryGetValue("Macos", out var macosDesktopInfo))


Correct Macos -> macOS

IsaacMarovitz · 2025-03-07T10:43:42Z

Source/HedgeModManager/ModdableGameLocator.cs

+
+                var gameSimple = new GameSimple(
+                    "Macos", macosDesktopInfo.ID, gameInfo.ID,
+                    "/Applications", macosDesktopInfo.Executable, "Macos", ""


You have to be careful assuming /Applications. Things can also be installed to ~/Applications

IsaacMarovitz · 2025-03-07T10:44:29Z

macos/generate-bundle.bash

+mkdir "$APP_NAME/Contents/Resources"
+
+# Create Info.plist inside the bundle
+cat > "$APP_NAME/Contents/Info.plist" << EOF


Would prefer if this was actually a file in the repo instead of being cat'd out

This was so in github workflows, the version and bundle name can be passed as arguments. Though I don't disagree

I would like this to be in its own file if it can be easily done. Maybe you could look into string substitution, I think some people had used the sed command.

IsaacMarovitz · 2025-03-07T10:45:43Z

docs/BUILDING.md

+```
+```bash 
+    cd macos
+    /bin/bash macos/generate-bundle.bash com.hedge_dev.hedgemodmanager 8.0.3


As of macOS Catalina, zsh is the default shell on Mac

IsaacMarovitz · 2025-03-07T10:46:19Z

docs/BUILDING.md

+
+## 2. Build the project
+
+###  Macos


Macos -> macOS

MarioMastr · 2025-03-07T11:03:32Z

Source/HedgeModManager/ModdableGameLocator.cs

            }
+            if (OperatingSystem.IsMacOS() && gameInfo.PlatformInfos.TryGetValue("Macos", out var macosDesktopInfo))
+            {
+                // The root is actually not necessary on macos


i feel like there should still be a root here as by default the data for unleashed is held in "~/Library/Application Support/UnleashedRecomp", and having the mod folder there makes it more similar to other platforms. maybe try something like this

Suggested change

// The root is actually not necessary on macos

string root = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),

"Library", "Application Support", "UnleashedRecomp");

if (Directory.Exists(root))

{

var gameSimple = new GameSimple(

"Macos", macosDesktopInfo.ID, gameInfo.ID,

root, macosDesktopInfo.Executable,

"Macos", "", ""

);

var game = new ModdableGameGeneric(gameSimple)

{

SupportsDirectLaunch = true,

SupportsLauncher = false,

Is64Bit = gameInfo.Is64Bit

};

game.ModDatabase.SupportsCodeCompilation = gameInfo.SupportsCodes;

games.Add(game);

}

Makes sense.
Will try the changes

Note that Application Support should be accessed using Environment.SpecialFolder.ApplicationData

When I tried to pull and build the project, it didn't work right. It wouldn't save config files or be able to boot the game. I tried fixing the code myself, but it still had trouble detecting mods and saving.

The suggested fixes above worked, and HMM runs great for me.

I have made changes to GameSimple, though it should be simple to work around for macOS. What I changed is making it work a bit more like running a command instead of executable and arguments.

Also please change all the Macos to macOS or MacOS, I think using the proper capitalisation would be good here.

adoobly · 2025-03-07T16:57:58Z

my terminal says command not found dotnet what do i do

to-fuu · 2025-03-07T17:16:39Z

As of the latest commit, uri schemes are now supported on macos

adoobly · 2025-03-07T17:33:26Z

is there a .app download?

FlipTheFox · 2025-03-07T23:40:15Z

@adoobly you need to install dotnet and then run ln -s /usr/local/share/dotnet/dotnet /usr/local/bin/ in a new terminal window

to-fuu · 2025-03-20T11:16:28Z

@thesupersonic16
For now changed the code to work with the new changes made to GameSimple. Move the .icns file and created an info.plist under /macos and used sed to update the version.
I will look at combining arm64 and x86 builds into one bundle.

thesupersonic16

I have made some comments and some change requests. Please reply to the comments.

Also make sure to update build-project.yml aswell.

Source/HedgeModManager.UI/Views/MainWindow.axaml.cs

Source/HedgeModManager/HedgeModManager.csproj

docs/BUILDING.md

Source/HedgeModManager.UI/Program.cs

README.md

.github/workflows/build-release.yml

docs/BUILDING.md

to-fuu · 2025-03-20T13:52:54Z

I have made some comments and some change requests. Please reply to the comments.

Also make sure to update build-project.yml aswell.

I'll go through the change requests.
Will update the build file once I figure out how to bundle the builds for both architectures together (Still haven't had time to look at it)

to-fuu · 2025-03-23T00:21:09Z

@thesupersonic16 Reverted the change to saving cpkredir.ini as the root path now points to the application support dir.
For now I guess we can wait for the mac port to be released, update the bundle name and test again

IsaacMarovitz · 2025-03-23T02:23:44Z

@thesupersonic16 Reverted the change to saving cpkredir.ini as the root path now points to the application support dir.

For now I guess we can wait for the mac port to be released, update the bundle name and test again

Check your PRs on your fork

phamtheman69 · 2025-05-16T08:26:44Z

Adds support for Macs builds and UnleahsedRecomp

Can be built from code using the following command
dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:UseAppHost=true -property:Configuration=Release -p:PublishSingleFile=true
TODO:

Fix the app's icon

Add support for other games

Add build commands to github workflows

When do you think support for other games will be added? Hedgemodmanager 7/8 beta don't work through crossover

thesupersonic16 · 2025-05-18T04:46:00Z

I believe it's the mod loaders that don't work with crossover. There is an issue on the HMM 7 repo about that. Ideally a standard needs to be made for this as I never heard macOS having a Steam client that runs the games. After that is worked out, code could be added to setup whatever is needed get the games running with the mod loaders.

I really do not want HMM 8 to have code designed just to run under wine/crossover.

MarioMastr · 2025-08-12T10:36:23Z

macOS support has been merged into the main repo of UnleashedRecomp, I hope to see this PR cleaned up and merged soon to accompany that

thesupersonic16 · 2025-08-12T10:39:07Z

I cannot work on macOS support without having a machine that runs it. I am currently waiting for when this PR is ready for another review.

to-fuu · 2025-08-12T10:57:19Z

I will try to pick up where I left this weekend

thesupersonic16 · 2025-08-12T11:43:41Z

You also have a PR on your repo, so you may want to look into that aswell.

thesupersonic16 and others added 3 commits March 7, 2025 04:17

Initial Macos Support

67b59ce

Initial Macos Support

8c956b4

Add building instructions

6f941d9

to-fuu added 2 commits March 7, 2025 10:11

Make self contained

409d8a0

Remove log

70d5b0b

to-fuu added 5 commits March 7, 2025 12:01

add build command

6aee6fe

remove Dotnet.Bundle dependencies

2a4b84f

Update icon

db07d96

Disable detecting UnleashedRecomp

e0ed516

Update build docs

f1e7c13

Fix menu bar showing Avalonia Application

b8b3adb

Support URI Schemes

a2ae2a1

IsaacMarovitz suggested changes Mar 7, 2025

View reviewed changes

MarioMastr reviewed Mar 7, 2025

View reviewed changes

Support URI Schemes

73e5474

to-fuu added 2 commits March 8, 2025 14:28

Fix build command

2993c29

change bash to zsh

e758958

to-fuu added 7 commits March 20, 2025 19:59

move .icns file to macos folder

b88eacd

move info.plist out

f11c76a

update locating on macos

56f7431

use the game's ID

b6b158e

change to macOS

9bb00f0

update docs

37f9d2d

update output folder

bc7f08a

thesupersonic16 requested changes Mar 20, 2025

View reviewed changes

thesupersonic16 reviewed Mar 20, 2025

View reviewed changes

docs/BUILDING.md Outdated Show resolved Hide resolved

to-fuu added 9 commits March 20, 2025 23:39

fix rebase

dbe4881

remove version requirement

a3b7422

improve build docs

1b08a77

remove version from docs

0a3be97

remove empty space

25decd2

use Executable for root

964a1d7

remove empty line

c456b48

update build release

32b4237

revert changes

83ace70

thesupersonic16 mentioned this pull request Jun 21, 2025

Macos thesupersonic16/HedgeModManager#1070

Closed

thesupersonic16 mentioned this pull request Oct 4, 2025

Just a suggestion #102

Open

-                // The root is actually not necessary on macos
+                string root = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    "Library", "Application Support", "UnleashedRecomp");
+                if (Directory.Exists(root))
+                {
+                    var gameSimple = new GameSimple(
+                        "Macos", macosDesktopInfo.ID, gameInfo.ID,
+                        root, macosDesktopInfo.Executable,
+                        "Macos", "", ""
+                    );
+                    var game = new ModdableGameGeneric(gameSimple)
+                    {
+                        SupportsDirectLaunch = true,
+                        SupportsLauncher = false,
+                        Is64Bit = gameInfo.Is64Bit
+                    };
+                    game.ModDatabase.SupportsCodeCompilation = gameInfo.SupportsCodes;
+                    games.Add(game);
+                }

Macos support #28

Are you sure you want to change the base?

Macos support #28

Uh oh!

Conversation

to-fuu commented Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

IsaacMarovitz commented Mar 6, 2025

Uh oh!

phamtheman69 commented Mar 6, 2025

Uh oh!

phamtheman69 commented Mar 6, 2025

Uh oh!

to-fuu commented Mar 7, 2025

Uh oh!

to-fuu commented Mar 7, 2025

Uh oh!

fred64k commented Mar 7, 2025

Uh oh!

to-fuu commented Mar 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

IsaacMarovitz commented Mar 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

IsaacMarovitz commented Mar 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

to-fuu Mar 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thesupersonic16 Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adoobly commented Mar 7, 2025

Uh oh!

to-fuu commented Mar 7, 2025

Uh oh!

adoobly commented Mar 7, 2025

Uh oh!

FlipTheFox commented Mar 7, 2025

Uh oh!

to-fuu commented Mar 20, 2025

Uh oh!

thesupersonic16 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

to-fuu commented Mar 6, 2025 •

edited

Loading

to-fuu commented Mar 7, 2025 •

edited

Loading

IsaacMarovitz commented Mar 7, 2025 •

edited

Loading

to-fuu Mar 7, 2025 •

edited

Loading

thesupersonic16 Mar 17, 2025 •

edited

Loading

thesupersonic16 left a comment •

edited

Loading