Macos support

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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

[to-fuu]

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]

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.

[to-fuu]

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.

1. 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.
2. Some formatting changes ,ade by Rider did get through. Can be fixed.
3. 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
4. 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]

Status:

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

[fred64k]

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]

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]

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]

I've rebased my changes on main

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

*macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

Correct Macos -> macOS

[IsaacMarovitz]

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

[IsaacMarovitz]

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

[to-fuu]

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

[thesupersonic16]

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]

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

[IsaacMarovitz]

Macos -> macOS

[MarioMastr]

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
	stringroot=Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
	"Library","Application Support","UnleashedRecomp");
	if(Directory.Exists(root))
	{
	vargameSimple=newGameSimple(
	"Macos", macosDesktopInfo.ID, gameInfo.ID,
	root,macosDesktopInfo.Executable,
	"Macos", "", ""
	);
	vargame=newModdableGameGeneric(gameSimple)
	{
	SupportsDirectLaunch=true,
	SupportsLauncher=false,
	Is64Bit=gameInfo.Is64Bit
	};
	game.ModDatabase.SupportsCodeCompilation=gameInfo.SupportsCodes;
	games.Add(game);
	}

[to-fuu]

Makes sense.
Will try the changes

[IsaacMarovitz]

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

[ArtisIan97]

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.

[thesupersonic16]

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]

my terminal says command not found dotnet what do i do

[to-fuu]

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

[adoobly]

is there a .app download?

[FlipTheFox]

@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]

@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.

[to-fuu]

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]

@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]

@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

[thesupersonic16]

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]

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]

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]

I will try to pick up where I left this weekend

[thesupersonic16]

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