last few changes

Author: Kingminer7

changelog.md

@@ -1,3 +1,10 @@
+# 1.4.11
+### Sound effect separation
+- <cy>Separate sound effects per server</c>
+
+# 1.4.10
+### Some bugfixes
+- <cy>Fix some bugs with save deletion</c>
 # 1.4.9
 - <cy>Bugfix.</c>
 # 1.4.8

mod.json

@@ -6,7 +6,7 @@
 		"mac": "2.2074",
 		"ios": "2.2074"
 	},
-	"version": "1.4.10",
+	"version": "1.4.11",
 	"id": "km7dev.gdps-switcher",
 	"name": "GDPS Switcher",
 	"developers": ["km7dev", "Alphii"],

src/hooks/MusicDownloadManager.cpp

@@ -8,25 +8,13 @@ using namespace geode::prelude;
 class $modify(GDPSMDL, MusicDownloadManager) {
 
     std::string pathForSFXFolder(int id) {
-        auto ret = MusicDownloadManager::pathForSFXFolder(id);
-        if (!GDPSMain::get()->isActive()) return ret;
-        log::info("{}", getGDPSPath(ret));
-        return getGDPSPath(ret);
+        if (!GDPSMain::get()->isActive()) return MusicDownloadManager::pathForSFXFolder(id);
+        auto server = GDPSMain::get()->m_servers[GDPSMain::get()->m_currentServer];
+        return string::pathToString(dirs::getSaveDir() / "gdpses" / server.saveDir / "");
     }
 
     std::string pathForSongFolder(int id) {
-        auto ret = MusicDownloadManager::pathForSongFolder(id);
-        if (!GDPSMain::get()->isActive()) return ret;
-        log::info("{}", getGDPSPath(ret));
-        return getGDPSPath(ret);
-    }
-
-    // cause gd::string
-    inline std::string getGDPSPath(const gd::string& path) {
-        return getGDPSPath(std::filesystem::path(path));
-    }
-
-    std::string getGDPSPath(const std::filesystem::path& orig) {
+        if (!GDPSMain::get()->isActive()) return MusicDownloadManager::pathForSongFolder(id);
         auto server = GDPSMain::get()->m_servers[GDPSMain::get()->m_currentServer];
         return string::pathToString(dirs::getSaveDir() / "gdpses" / server.saveDir / "");
     }