From 6b8d03adf2b0739b40863e08d82c75a71966ae11 Mon Sep 17 00:00:00 2001
From: Kayden Tebau <me@nullob.si>
Date: Sun, 18 Dec 2022 13:21:26 -0800
Subject: [PATCH] Move data folder out of app bundle

---
 .circleci/config.yml  | 1 +
 .gitignore            | 1 +
 package-macos.sh      | 2 +-
 src/ResourceLoader.hx | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16300614..2a7313b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -198,6 +198,7 @@ jobs:
             cp /usr/local/lib/libturbojpeg.0.2.0.dylib libturbojpeg.0.dylib
             cp /usr/local/lib/libvorbis.0.4.9.dylib libvorbis.0.4.9.dylib
             cp /usr/local/lib/libvorbisfile.3.3.8.dylib libvorbisfile.3.3.8.dylib
+            cp /usr/local/lib/libvorbisenc.2.0.12.dylib libvorbisenc.2.0.12.dylib
             cp /usr/local/lib/libz.1.2.13.dylib libz.1.dylib
             # These libraries have dangling RPATHs
             install_name_tool -delete_rpath /usr/local/lib libturbojpeg.0.dylib
diff --git a/.gitignore b/.gitignore
index b3a25e60..002f7226 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ package.json
 package-lock.json
 
 macos-dist/MarbleBlast Platinum.app/
+macos-dist/data/
 
 .DS_Store
 **/.DS_Store
diff --git a/package-macos.sh b/package-macos.sh
index 63f956fc..fe023d72 100755
--- a/package-macos.sh
+++ b/package-macos.sh
@@ -17,7 +17,7 @@ sed -i "" -e "s/@VERSION@/$1/" "macos-dist/MarbleBlast Platinum.app/Contents/Inf
 # Copy binary
 cp native/marblegame "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/marblegame" || exit $?
 # Copy data
-cp -r data "macos-dist/MarbleBlast Platinum.app/Contents/Resources/" || exit $?
+cp -r data "macos-dist/" || exit $?
 
 cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/"
 install_name_tool -change ui.hdll @rpath/ui.hdll \
diff --git a/src/ResourceLoader.hx b/src/ResourceLoader.hx
index cf923dbf..b0d3a4bb 100644
--- a/src/ResourceLoader.hx
+++ b/src/ResourceLoader.hx
@@ -23,7 +23,7 @@ import src.Settings;
 class ResourceLoader {
 	#if (hl && !android)
 		#if MACOS_BUNDLE
-	public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "Resources"])), null);
+	public static var fileSystem:FileSystem = new TorqueFileSystem(Path.normalize(Path.join([Path.directory(Sys.programPath()), "..", "..", ".."])), null);
 		#else
 	public static var fileSystem:FileSystem = new TorqueFileSystem(".", null);
 		#end