Merge pull request #8 from RayDeeUx/main

v1.3.0: macOS support, `.wav`/`.ogg`/`.oga`/`.flac` support, behavioral corrections, etc

.github/workflows/multi-platform.yml

@@ -15,8 +15,8 @@ jobs:
           - name: Windows
             os: windows-latest
 
-          # - name: macOS
-          #   os: macos-latest
+          - name: macOS
+            os: macos-latest
 
           - name: Android32
             os: ubuntu-latest
@@ -35,9 +35,9 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
-          cli: "v3.0.0"
-          bindings: geode-sdk/bindings
-          bindings-ref: main
+          # cli: "v3.0.0" # not sure why this is here --raydeeux
+          bindings: RayDeeUx/bindings # comment this out to use geode-sdk/bindings
+          bindings-ref: i-know-this-is-behind-but-i-need-it-for-menulooprandomizer # comment this out to use default branch
           combine: true
           target: ${{ matrix.config.target }}
 

.gitignore

@@ -56,3 +56,4 @@ build-*/
 
 # Visual Studio
 .vs/
+/cmake-*/

about.md

@@ -2,22 +2,26 @@
 
 Are you bored of hearing the same menu song <cr>over & over</cr>? Well... **No more of that!**
 
-This mod allows you to randomize the menu song every time you open the game, picking from a random downloaded song from Newgrounds or your own songs.
+This mod allows you to randomize the menu song every time you open the game, picking from a random downloaded song from Newgrounds, RobTop's Music Library, or your own songs. `.mp3`, `.ogg`/`.oga`, `.wav`, and `.flac` files are supported.
 
 # How to add custom songs
 
-If you want to add your own songs to the mod you should go to the settings tab, then click the folder button.
+If you want to add your own songs to the mod you should go to the settings tab, then click the <cd>pink</c> folder button. Just like with grabbing songs you've downloaded from Newgrounds or RobTop's Music Library, `.mp3` and `.ogg` files are supported.
 
-![Screenshot on how to use it](elnexreal.menuloop_randomizer/screenshot.png)
+![Screenshot on how to use it. Install the mod to view this screenshot!](elnexreal.menuloop_randomizer/screenshot.png)
+
+`.oga`, `.flac` and `.wav` files are also supported for the few audiophiles who want the highest of audio quality out there.
 
 ## Android
 
-<co>*If you click the folder and you get sent to the geode folder itself, you should go to game/geode/config/elnexreal.menuloop_randomizer and put the songs there*</co>
+<co>*If you click the folder and you get sent to the geode folder itself, you should go to `game/geode/config/elnexreal.menuloop_randomizer` and put the songs there*</co>
 
 # Thanks to!
 
-- [hiimjustin000](https://github.com/hiimjustin000) <cj>for helping me with the bindings problem (i was using an outdated version of geode LMAO)</cj>
+- [hiimjustin000](https://github.com/hiimjustin000) <cj>for helping me with the bindings problem (i was using an outdated version of geode LMAO).</cj>
 - [km7dev](https://github.com/Kingminer7) <cj>for helping me with the constant crashes and testing.</cj>
-- <cj>Shaday for giving me the idea<cj>
+- <cj>Shaday for giving me the idea.<cj>
 - [dank_meme](https://github.com/dankmeme01) <cj>for helping me with singletons.</cj>
+- [ninxout](https://github.com/ninXout) <cj>for porting part of the mod to macOS, and adding Music Library support.</c>
+- [raydeeux](https://github.com/RayDeeUx) <cj>for porting part of the mod to macOS, and adding `.ogg`/`.oga`/`.wav`/`.flac` file support for custom songs.</cj>
 - [Feather Icons](https://feathericons.com) <cj>for providing the shuffle icon.</cj>

changelog.md

@@ -1,3 +1,15 @@
+# v1.3.0
+
+- Added macOS support (thx [ninxout](https://github.com/ninXout), [raydeeux](https://github.com/RayDeeUx), and [hiimjustin000](https://github.com/hiimjustin000))
+- Added support for `.wav`, `.ogg`/`.oga`, and `.flac` files for custom songs
+- Included artist name for all "Now Playing" notifications
+- Set Z order of the "Now Playing" notification to 200 for easier readability against most MenuLayer mods (such as Overcharged Main Menu)
+- Shuffling the song now generates a new "Now Playing" notification
+- Increase "Now Playing" notification maximum duration to 5 seconds
+- Add better slider control for adjusting notification duration
+- Added Node IDs to nodes added by this mod
+- Squash a few bugs, optimize a few things, minimize likelihood of potential crashes
+
 # v1.2.2
 
 - Added an option to enable the shuffle button (thx [reinmar](https://github.com/Reinmmar))

mod.json

@@ -1,10 +1,11 @@
 {
-	"geode": "3.2.0",
+	"geode": "3.4.0",
 	"gd": {
 		"win": "2.206",
+		"mac": "2.206",
 		"android": "2.206"
 	},
-	"version": "v1.2.2",
+	"version": "v1.3.0",
 	"id": "elnexreal.menuloop_randomizer",
 	"name": "Menu Loop Randomizer",
 	"developer": "elnexreal",
@@ -24,39 +25,48 @@
 			"type": "bool",
 			"default": true,
 			"description": "Enables the <cj>shuffle button</c> in the main menu",
-			"name": "Enable shuffle button"
+			"name": "Shuffle Button"
 		},
 		"enableNotification": {
 			"type": "bool",
 			"default": true,
 			"description": "Shows a notification with the name of the currently playing song.",
-			"name": "Show notification"
+			"name": "Show Notification"
 		},
 		"notificationTime": {
 			"type": "float",
 			"default": 0.5,
 			"min": 0.1,
-			"max": 2,
-			"description": "Modify the time that the notification is on screen",
-			"name": "Notification time"
+			"max": 5,
+			"description": "Adjust the time that the notification is on screen.",
+			"name": "Notification Time",
+			"control": {
+				"input": true,
+				"slider": true,
+				"arrows": true,
+				"big-arrows": true,
+				"arrow-step": 0.5,
+				"big-arrow-step": 1,
+				"slider-step": 0.1
+			}
 		},
 		"randomizeWhenExitingLevel": {
 			"type": "bool",
 			"default": true,
-			"description": "Randomize the song when you exit a level",
-			"name": "Randomize on level exit"
+			"description": "Randomize the song when you exit a level.",
+			"name": "Randomize on Level Exit"
 		},
 		"randomizeWhenExitingEditor": {
 			"type": "bool",
 			"default": true,
-			"description": "Randomize the song when you exit the editor",
-			"name": "Randomize on editor exit"
+			"description": "Randomize the song when you exit the editor.",
+			"name": "Randomize on Editor Exit"
 		},
 		"useCustomSongs": {
 			"type": "bool",
 			"default": false,
-			"description": "Use your own songs instead of Newgrounds's (instructions are on the about.md file)",
-			"name": "Use custom songs path"
+			"description": "Use your own songs instead of those you have downloaded from Newgrounds or RobTop's Music Library.\n\n<cy>Find instructions in the mod info popup.</c>",
+			"name": "Use Custom Songs Instead"
 		}
 	},
 	"resources": {