From e5c91624672b8615306ddbd183cba5c7a8743336 Mon Sep 17 00:00:00 2001
From: Fleeym <61891787+Fleeym@users.noreply.github.com>
Date: Sun, 26 Jan 2025 18:20:20 +0200
Subject: [PATCH] fix: fix the compilation errors (hopefully)

---
 jukebox/jukebox/hooks/custom_song_widget.cpp  |  7 +--
 .../jukebox/hooks/music_download_manager.cpp  |  2 +-
 jukebox/jukebox/main.cpp                      |  2 +
 jukebox/jukebox/managers/index_manager.cpp    |  5 +-
 jukebox/jukebox/managers/index_manager.hpp    | 36 ++++++-------
 jukebox/jukebox/managers/nong_manager.cpp     |  2 +
 jukebox/jukebox/managers/nong_manager.hpp     | 31 ++++++------
 jukebox/jukebox/ui/index_choose_popup.cpp     |  2 +
 jukebox/jukebox/ui/index_choose_popup.hpp     |  8 ++-
 jukebox/jukebox/ui/indexes_popup.cpp          |  2 +
 jukebox/jukebox/ui/indexes_popup.hpp          |  7 ++-
 jukebox/jukebox/ui/indexes_setting.cpp        |  2 +-
 jukebox/jukebox/ui/indexes_setting.hpp        | 18 +++----
 jukebox/jukebox/ui/list/index_cell.cpp        |  2 +
 jukebox/jukebox/ui/list/index_cell.hpp        | 11 ++--
 jukebox/jukebox/ui/list/index_song_cell.cpp   |  1 +
 jukebox/jukebox/ui/list/index_song_cell.hpp   | 36 ++++++-------
 jukebox/jukebox/ui/list/nong_cell.cpp         |  2 +
 jukebox/jukebox/ui/list/nong_cell.hpp         | 50 +++++++++----------
 jukebox/jukebox/ui/list/nong_list.hpp         |  6 +--
 jukebox/jukebox/ui/list/song_cell.hpp         | 15 +++---
 jukebox/jukebox/ui/nong_add_popup.cpp         |  1 +
 jukebox/jukebox/ui/nong_add_popup.hpp         | 44 ++++++++--------
 jukebox/jukebox/ui/nong_dropdown_layer.cpp    |  2 +
 jukebox/jukebox/ui/nong_dropdown_layer.hpp    | 26 +++++-----
 25 files changed, 165 insertions(+), 155 deletions(-)

diff --git a/jukebox/jukebox/hooks/custom_song_widget.cpp b/jukebox/jukebox/hooks/custom_song_widget.cpp
index 02e50ae..6d8f6d1 100644
--- a/jukebox/jukebox/hooks/custom_song_widget.cpp
+++ b/jukebox/jukebox/hooks/custom_song_widget.cpp
@@ -42,7 +42,8 @@ class $modify(JBSongWidget, CustomSongWidget) {
         bool searching = false;
         std::unordered_map<int, Nongs*> assetNongData;
         EventListener<NongManager::MultiAssetSizeTask> m_multiAssetListener;
-        std::unique_ptr<EventListener<EventFilter<event::SongStateChanged>>>
+        std::unique_ptr<
+            EventListener<EventFilter<jukebox::event::SongStateChanged>>>
             m_songStateListener;
     };
 
@@ -69,8 +70,8 @@ class $modify(JBSongWidget, CustomSongWidget) {
         m_fields->firstRun = false;
 
         m_fields->m_songStateListener = std::make_unique<
-            EventListener<EventFilter<event::SongStateChanged>>>(
-            ([this](event::SongStateChanged* event) {
+            EventListener<EventFilter<jukebox::event::SongStateChanged>>>(
+            ([this](jukebox::event::SongStateChanged* event) {
                 if (!m_songInfoObject) {
                     return ListenerResult::Propagate;
                 }
diff --git a/jukebox/jukebox/hooks/music_download_manager.cpp b/jukebox/jukebox/hooks/music_download_manager.cpp
index 5d17361..ea6fbc4 100644
--- a/jukebox/jukebox/hooks/music_download_manager.cpp
+++ b/jukebox/jukebox/hooks/music_download_manager.cpp
@@ -46,7 +46,7 @@ void JBMusicDownloadManager::onGetSongInfoCompleted(gd::string p1,
         return;
     }
 
-    event::GetSongInfo(obj->m_songName, obj->m_artistName, songID)
+    jukebox::event::GetSongInfo(obj->m_songName, obj->m_artistName, songID)
         .post();
 }
 
diff --git a/jukebox/jukebox/main.cpp b/jukebox/jukebox/main.cpp
index 52ed080..580f78b 100644
--- a/jukebox/jukebox/main.cpp
+++ b/jukebox/jukebox/main.cpp
@@ -7,6 +7,8 @@
 #include <jukebox/managers/nong_manager.hpp>
 #include <jukebox/ui/indexes_setting.hpp>
 
+using namespace geode::prelude;
+
 $execute {
     (void)Mod::get()->registerCustomSettingType("indexes",
                                                 &jukebox::IndexSetting::parse);
diff --git a/jukebox/jukebox/managers/index_manager.cpp b/jukebox/jukebox/managers/index_manager.cpp
index 48fd191..078a560 100644
--- a/jukebox/jukebox/managers/index_manager.cpp
+++ b/jukebox/jukebox/managers/index_manager.cpp
@@ -35,10 +35,11 @@
 #include <jukebox/nong/nong.hpp>
 #include <jukebox/ui/indexes_setting.hpp>
 
-namespace jukebox {
-
+using namespace geode::prelude;
 using namespace jukebox::index;
 
+namespace jukebox {
+
 bool IndexManager::init() {
     if (m_initialized) {
         return true;
diff --git a/jukebox/jukebox/managers/index_manager.hpp b/jukebox/jukebox/managers/index_manager.hpp
index 097e499..790ab92 100644
--- a/jukebox/jukebox/managers/index_manager.hpp
+++ b/jukebox/jukebox/managers/index_manager.hpp
@@ -6,26 +6,25 @@
 #include <unordered_map>
 #include <variant>
 
-#include <matjson.hpp>
 #include <Geode/Result.hpp>
 #include <Geode/loader/Event.hpp>
 #include <Geode/utils/Task.hpp>
 #include <Geode/utils/general.hpp>
+#include <matjson.hpp>
 
 #include <jukebox/events/start_download.hpp>
 #include <jukebox/nong/index.hpp>
 #include <jukebox/nong/nong.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class IndexManager {
 protected:
     bool m_initialized = false;
 
-    using FetchIndexTask = Task<Result<>, float>;
-    using DownloadSongTask = Task<Result<ByteVector>, float>;
+    using FetchIndexTask = geode::Task<geode::Result<>, float>;
+    using DownloadSongTask =
+        geode::Task<geode::Result<geode::ByteVector>, float>;
 
     IndexManager() = default;
 
@@ -36,30 +35,31 @@ class IndexManager {
     IndexManager& operator=(IndexManager&&) = delete;
 
     // index url -> task listener
-    std::unordered_map<std::string, EventListener<FetchIndexTask>>
+    std::unordered_map<std::string, geode::EventListener<FetchIndexTask>>
         m_indexListeners;
 
     std::unordered_map<int, std::vector<index::IndexSongMetadata*>>
         m_nongsForId;
     // song id -> download song task
-    std::unordered_map<std::string, EventListener<DownloadSongTask>>
+    std::unordered_map<std::string, geode::EventListener<DownloadSongTask>>
         m_downloadSongListeners;
     // song id -> current download progress (used when opening NongDropdownLayer
     // while a song is being downloaded)
     std::unordered_map<std::string, float> m_downloadProgress;
 
-    EventListener<EventFilter<event::StartDownload>> m_downloadSignalListener{
-        this, &IndexManager::onDownloadStart};
+    geode::EventListener<geode::EventFilter<jukebox::event::StartDownload>>
+        m_downloadSignalListener{this, &IndexManager::onDownloadStart};
 
-    geode::ListenerResult onDownloadStart(event::StartDownload* e);
+    geode::ListenerResult onDownloadStart(jukebox::event::StartDownload* e);
     void onDownloadProgress(int gdSongID, const std::string& uniqueId,
                             float progress);
     void onDownloadFinish(
         std::variant<index::IndexSongMetadata*, Song*>&& source,
-        Nongs* destination, ByteVector&& data);
-    Task<Result<matjson::Value>, float> fetchIndex(
+        Nongs* destination, geode::ByteVector&& data);
+    geode::Task<geode::Result<matjson::Value>, float> fetchIndex(
         const index::IndexSource& index);
-    void onIndexFetched(const std::string& url, Result<matjson::Value>* r);
+    void onIndexFetched(const std::string& url,
+                        geode::Result<matjson::Value>* r);
 
 public:
     bool init();
@@ -69,12 +69,12 @@ class IndexManager {
 
     bool initialized() const { return m_initialized; }
 
-    Result<> fetchIndexes();
+    geode::Result<> fetchIndexes();
 
-    Result<> loadIndex(std::filesystem::path path);
-    Result<> loadIndex(matjson::Value&& jsonObj);
+    geode::Result<> loadIndex(std::filesystem::path path);
+    geode::Result<> loadIndex(matjson::Value&& jsonObj);
 
-    Result<std::vector<index::IndexSource>> getIndexes();
+    geode::Result<std::vector<index::IndexSource>> getIndexes();
 
     std::optional<float> getSongDownloadProgress(const std::string& uniqueID);
     std::optional<std::string> getIndexName(const std::string& indexID);
@@ -83,7 +83,7 @@ class IndexManager {
 
     std::filesystem::path baseIndexesPath();
 
-    Result<> downloadSong(int gdSongID, const std::string& uniqueID);
+    geode::Result<> downloadSong(int gdSongID, const std::string& uniqueID);
 
     void registerIndexNongs(Nongs* destination);
 
diff --git a/jukebox/jukebox/managers/nong_manager.cpp b/jukebox/jukebox/managers/nong_manager.cpp
index 143f7af..b309fa5 100644
--- a/jukebox/jukebox/managers/nong_manager.cpp
+++ b/jukebox/jukebox/managers/nong_manager.cpp
@@ -24,6 +24,8 @@
 #include <jukebox/nong/nong_serialize.hpp>
 #include <jukebox/utils/random_string.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 std::optional<Nongs*> NongManager::getNongs(int songID) {
diff --git a/jukebox/jukebox/managers/nong_manager.hpp b/jukebox/jukebox/managers/nong_manager.hpp
index 2554252..bee7f43 100644
--- a/jukebox/jukebox/managers/nong_manager.hpp
+++ b/jukebox/jukebox/managers/nong_manager.hpp
@@ -14,8 +14,6 @@
 #include <jukebox/events/song_error.hpp>
 #include <jukebox/nong/nong.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class NongManager {
@@ -37,16 +35,18 @@ class NongManager {
         }
     }
 
-    Result<> saveNongs(std::optional<int> saveId = std::nullopt);
-    EventListener<EventFilter<jukebox::event::SongError>> m_songErrorListener;
-    EventListener<EventFilter<jukebox::event::GetSongInfo>> m_songInfoListener;
-    Result<std::unique_ptr<Nongs>> loadNongsFromPath(
+    geode::Result<> saveNongs(std::optional<int> saveId = std::nullopt);
+    geode::EventListener<geode::EventFilter<jukebox::event::SongError>>
+        m_songErrorListener;
+    geode::EventListener<geode::EventFilter<jukebox::event::GetSongInfo>>
+        m_songInfoListener;
+    geode::Result<std::unique_ptr<Nongs>> loadNongsFromPath(
         const std::filesystem::path& path);
 
-    Result<> migrateV2();
+    geode::Result<> migrateV2();
 
 public:
-    using MultiAssetSizeTask = Task<std::string>;
+    using MultiAssetSizeTask = geode::Task<std::string>;
     std::optional<Nongs*> m_currentlyPreparingNong;
 
     bool init();
@@ -55,12 +55,13 @@ class NongManager {
 
     std::filesystem::path baseManifestPath() {
         static std::filesystem::path path =
-            Mod::get()->getSaveDir() / "manifest";
+            geode::Mod::get()->getSaveDir() / "manifest";
         return path;
     }
 
     std::filesystem::path baseNongsPath() {
-        static std::filesystem::path path = Mod::get()->getSaveDir() / "nongs";
+        static std::filesystem::path path =
+            geode::Mod::get()->getSaveDir() / "nongs";
         return path;
     }
 
@@ -125,34 +126,34 @@ class NongManager {
      * Add NONGs
      * @param nong NONG to add
      */
-    Result<> addNongs(Nongs&& nong);
+    geode::Result<> addNongs(Nongs&& nong);
 
     /**
      * Set active song
      * @param gdSongID the id of the song in GD
      * @param uniqueID the unique id of the song in Jukebox
      */
-    Result<> setActiveSong(int gdSongID, std::string uniqueID);
+    geode::Result<> setActiveSong(int gdSongID, std::string uniqueID);
 
     /**
      * Delete a song
      * @param gdSongID the id of the song in GD
      * @param uniqueID the unique id of the song in Jukebox
      */
-    Result<> deleteSong(int gdSongID, std::string uniqueID);
+    geode::Result<> deleteSong(int gdSongID, std::string uniqueID);
 
     /**
      * Delete a song's audio file
      * @param gdSongID the id of the song in GD
      * @param uniqueID the unique id of the song in Jukebox
      */
-    Result<> deleteSongAudio(int gdSongID, std::string uniqueID);
+    geode::Result<> deleteSongAudio(int gdSongID, std::string uniqueID);
 
     /**
      * Delete all NONGs for a song ID
      * @param gdSongID id of the song
      */
-    Result<> deleteAllSongs(int gdSongID);
+    geode::Result<> deleteAllSongs(int gdSongID);
 
     /**
      * Get a path to a song file
diff --git a/jukebox/jukebox/ui/index_choose_popup.cpp b/jukebox/jukebox/ui/index_choose_popup.cpp
index 7dc8596..e2691d2 100644
--- a/jukebox/jukebox/ui/index_choose_popup.cpp
+++ b/jukebox/jukebox/ui/index_choose_popup.cpp
@@ -17,6 +17,8 @@
 
 #include <jukebox/managers/index_manager.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 bool IndexChoosePopup::setup(
diff --git a/jukebox/jukebox/ui/index_choose_popup.hpp b/jukebox/jukebox/ui/index_choose_popup.hpp
index d5be7fe..f7bd1b5 100644
--- a/jukebox/jukebox/ui/index_choose_popup.hpp
+++ b/jukebox/jukebox/ui/index_choose_popup.hpp
@@ -8,17 +8,15 @@
 #include <Geode/cocos/label_nodes/CCLabelBMFont.h>
 #include <Geode/ui/Popup.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class IndexChoosePopup
-    : public Popup<std::vector<std::string>,
-                   std::function<void(const std::string& indexID)>> {
+    : public geode::Popup<std::vector<std::string>,
+                          std::function<void(const std::string& indexID)>> {
 protected:
     std::vector<std::string> m_indexIDs;
     std::function<void(const std::string& indexID)> m_chooseIndex;
-    CCLabelBMFont* m_label = nullptr;
+    cocos2d::CCLabelBMFont* m_label = nullptr;
     int m_currentIndex = 0;
 
     bool setup(
diff --git a/jukebox/jukebox/ui/indexes_popup.cpp b/jukebox/jukebox/ui/indexes_popup.cpp
index b9d25b5..83f5e3a 100644
--- a/jukebox/jukebox/ui/indexes_popup.cpp
+++ b/jukebox/jukebox/ui/indexes_popup.cpp
@@ -13,6 +13,8 @@
 #include <jukebox/nong/index.hpp>
 #include <jukebox/ui/list/index_cell.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 using namespace jukebox::index;
diff --git a/jukebox/jukebox/ui/indexes_popup.hpp b/jukebox/jukebox/ui/indexes_popup.hpp
index a00dad6..9f4e41b 100644
--- a/jukebox/jukebox/ui/indexes_popup.hpp
+++ b/jukebox/jukebox/ui/indexes_popup.hpp
@@ -9,15 +9,14 @@
 
 #include <jukebox/nong/index.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 using namespace jukebox::index;
 
 using IndexesCallback = std::function<void(std::vector<IndexSource>)>;
 
-class IndexesPopup : public Popup<std::vector<IndexSource>, IndexesCallback> {
+class IndexesPopup
+    : public geode::Popup<std::vector<IndexSource>, IndexesCallback> {
 protected:
     std::vector<IndexSource> m_indexes;
     IndexesCallback m_setIndexesCallback;
@@ -26,7 +25,7 @@ class IndexesPopup : public Popup<std::vector<IndexSource>, IndexesCallback> {
     bool setup(std::vector<IndexSource>,
                IndexesCallback setIndexesCallback) override;
     void createList();
-    CCSize getPopupSize();
+    cocos2d::CCSize getPopupSize();
     void onClose(CCObject*) override;
     void onAdd(CCObject*);
 
diff --git a/jukebox/jukebox/ui/indexes_setting.cpp b/jukebox/jukebox/ui/indexes_setting.cpp
index 32ab4d7..54096f5 100644
--- a/jukebox/jukebox/ui/indexes_setting.cpp
+++ b/jukebox/jukebox/ui/indexes_setting.cpp
@@ -21,7 +21,7 @@ namespace jukebox {
 
 using namespace jukebox::index;
 
-bool Indexes::operator==(const Indexes& other) {
+bool Indexes::operator==(const Indexes& other) const {
     return this->indexes == other.indexes;
 }
 
diff --git a/jukebox/jukebox/ui/indexes_setting.hpp b/jukebox/jukebox/ui/indexes_setting.hpp
index 7161e3b..96d8c45 100644
--- a/jukebox/jukebox/ui/indexes_setting.hpp
+++ b/jukebox/jukebox/ui/indexes_setting.hpp
@@ -13,27 +13,25 @@
 #include <jukebox/nong/index.hpp>
 #include <jukebox/nong/index_serialize.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 using namespace jukebox::index;
 
 struct Indexes {
     std::vector<IndexSource> indexes;
-    bool operator==(const Indexes& other);
+    bool operator==(const Indexes& other) const;
 };
 
-class IndexSetting : public SettingBaseValueV3<Indexes> {
+class IndexSetting : public geode::SettingBaseValueV3<Indexes> {
 public:
-    static Result<std::shared_ptr<SettingV3>> parse(const std::string& key,
-                                                    const std::string& modID,
-                                                    const matjson::Value& json);
+    static geode::Result<std::shared_ptr<SettingV3>> parse(
+        const std::string& key, const std::string& modID,
+        const matjson::Value& json);
 
-    SettingNodeV3* createNode(float width) override;
+    geode::SettingNodeV3* createNode(float width) override;
 };
 
-class IndexSettingNode : public SettingValueNodeV3<IndexSetting> {
+class IndexSettingNode : public geode::SettingValueNodeV3<IndexSetting> {
 protected:
     CCMenuItemSpriteExtra* m_resetBtn;
 
@@ -73,6 +71,6 @@ struct matjson::Serialize<jukebox::Indexes> {
                 matjson::Serialize<jukebox::IndexSource>::fromJson(elem));
             ret.indexes.push_back(source);
         }
-        return Ok(ret);
+        return geode::Ok(ret);
     }
 };
diff --git a/jukebox/jukebox/ui/list/index_cell.cpp b/jukebox/jukebox/ui/list/index_cell.cpp
index 0203b88..2954d57 100644
--- a/jukebox/jukebox/ui/list/index_cell.cpp
+++ b/jukebox/jukebox/ui/list/index_cell.cpp
@@ -12,6 +12,8 @@
 
 #include <jukebox/nong/index.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 bool IndexCell::init(IndexesPopup* parentPopup, IndexSource* index,
diff --git a/jukebox/jukebox/ui/list/index_cell.hpp b/jukebox/jukebox/ui/list/index_cell.hpp
index d12a683..665fbf3 100644
--- a/jukebox/jukebox/ui/list/index_cell.hpp
+++ b/jukebox/jukebox/ui/list/index_cell.hpp
@@ -2,21 +2,20 @@
 
 #include <functional>
 
-#include <Geode/binding/CCMenuItemToggler.hpp>
 #include <Geode/cocos/base_nodes/CCNode.h>
+#include <Geode/cocos/cocoa/CCGeometry.h>
 #include <Geode/cocos/cocoa/CCObject.h>
+#include <Geode/binding/CCMenuItemToggler.hpp>
 
 #include <jukebox/nong/index.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 using namespace jukebox::index;
 
 class IndexesPopup;
 
-class IndexCell : public CCNode {
+class IndexCell : public cocos2d::CCNode {
 protected:
     IndexesPopup* m_parentPopup;
     IndexSource* m_index;
@@ -25,12 +24,12 @@ class IndexCell : public CCNode {
     CCMenuItemToggler* m_toggleButton;
 
     bool init(IndexesPopup* parentPopup, IndexSource* index,
-              std::function<void()> onDelete, CCSize const& size);
+              std::function<void()> onDelete, cocos2d::CCSize const& size);
 
 public:
     static IndexCell* create(IndexesPopup* parentPopup, IndexSource* index,
                              std::function<void()> onDelete,
-                             CCSize const& size);
+                             cocos2d::CCSize const& size);
     void updateUI();
     void onToggle(CCObject*);
     void onDelete(CCObject*);
diff --git a/jukebox/jukebox/ui/list/index_song_cell.cpp b/jukebox/jukebox/ui/list/index_song_cell.cpp
index 65b4142..807c5d7 100644
--- a/jukebox/jukebox/ui/list/index_song_cell.cpp
+++ b/jukebox/jukebox/ui/list/index_song_cell.cpp
@@ -18,6 +18,7 @@
 #include <jukebox/nong/index.hpp>
 
 using namespace jukebox::index;
+using namespace geode::prelude;
 
 namespace jukebox {
 
diff --git a/jukebox/jukebox/ui/list/index_song_cell.hpp b/jukebox/jukebox/ui/list/index_song_cell.hpp
index 1914171..ecdf02f 100644
--- a/jukebox/jukebox/ui/list/index_song_cell.hpp
+++ b/jukebox/jukebox/ui/list/index_song_cell.hpp
@@ -14,45 +14,45 @@
 #include <jukebox/events/song_download_progress.hpp>
 #include <jukebox/nong/index.hpp>
 
-using namespace geode::prelude;
-using namespace jukebox::index;
-
 namespace jukebox {
 
-class IndexSongCell : public CCNode {
+class IndexSongCell : public cocos2d::CCNode {
 protected:
-    IndexSongMetadata* m_song = nullptr;
+    index::IndexSongMetadata* m_song = nullptr;
     int m_gdId;
 
     CCNode* m_songInfoNode = nullptr;
-    CCLabelBMFont* m_songNameLabel = nullptr;
-    CCLabelBMFont* m_artistLabel = nullptr;
-    CCLabelBMFont* m_indexNameLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_songNameLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_artistLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_indexNameLabel = nullptr;
 
-    CCMenu* m_downloadMenu = nullptr;
+    cocos2d::CCMenu* m_downloadMenu = nullptr;
     CCMenuItemSpriteExtra* m_downloadButton = nullptr;
 
-    CCNode* m_progressContainer = nullptr;
-    CCProgressTimer* m_progressBar = nullptr;
-    CCSprite* m_progressBarBack = nullptr;
+    cocos2d::CCNode* m_progressContainer = nullptr;
+    cocos2d::CCProgressTimer* m_progressBar = nullptr;
+    cocos2d::CCSprite* m_progressBarBack = nullptr;
 
     bool m_downloading = false;
 
-    EventListener<EventFilter<event::SongDownloadProgress>> m_downloadListener;
-    EventListener<EventFilter<event::SongDownloadFailed>>
+    geode::EventListener<
+        geode::EventFilter<jukebox::event::SongDownloadProgress>>
+        m_downloadListener;
+    geode::EventListener<geode::EventFilter<jukebox::event::SongDownloadFailed>>
         m_downloadFailedListener{this, &IndexSongCell::onDownloadFailed};
 
-    bool init(IndexSongMetadata* song, int gdId, const CCSize& size);
+    bool init(index::IndexSongMetadata* song, int gdId,
+              const cocos2d::CCSize& size);
 
     void onDownload(CCObject*);
     geode::ListenerResult onDownloadProgress(event::SongDownloadProgress* e);
     geode::ListenerResult onDownloadFailed(event::SongDownloadFailed* e);
 
 public:
-    IndexSongMetadata* song() const { return m_song; }
+    index::IndexSongMetadata* song() const { return m_song; }
 
-    static IndexSongCell* create(IndexSongMetadata* song, int gdId,
-                                 const CCSize& size);
+    static IndexSongCell* create(index::IndexSongMetadata* song, int gdId,
+                                 const cocos2d::CCSize& size);
 };
 
 }  // namespace jukebox
diff --git a/jukebox/jukebox/ui/list/nong_cell.cpp b/jukebox/jukebox/ui/list/nong_cell.cpp
index 9f7c5c8..c7c850c 100644
--- a/jukebox/jukebox/ui/list/nong_cell.cpp
+++ b/jukebox/jukebox/ui/list/nong_cell.cpp
@@ -24,6 +24,8 @@
 #include <jukebox/managers/nong_manager.hpp>
 #include <jukebox/nong/nong.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 constexpr float PADDING_X = 12.0f;
diff --git a/jukebox/jukebox/ui/list/nong_cell.hpp b/jukebox/jukebox/ui/list/nong_cell.hpp
index 6a7643e..dd0ce7c 100644
--- a/jukebox/jukebox/ui/list/nong_cell.hpp
+++ b/jukebox/jukebox/ui/list/nong_cell.hpp
@@ -14,21 +14,19 @@
 #include <jukebox/events/song_state_changed.hpp>
 #include <jukebox/nong/nong.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class NongDropdownLayer;
 
-class NongCell : public CCNode {
+class NongCell : public cocos2d::CCNode {
 protected:
     int m_songID;
     std::string m_uniqueID;
-    CCLabelBMFont* m_songNameLabel = nullptr;
-    CCLabelBMFont* m_authorNameLabel = nullptr;
-    CCLabelBMFont* m_metadataLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_songNameLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_authorNameLabel = nullptr;
+    cocos2d::CCLabelBMFont* m_metadataLabel = nullptr;
 
-    CCNode* m_songInfoNode = nullptr;
+    cocos2d::CCNode* m_songInfoNode = nullptr;
 
     std::function<void()> m_onSelect;
     std::function<void()> m_onDelete;
@@ -40,39 +38,39 @@ class NongCell : public CCNode {
     bool m_isDownloaded;
     bool m_isDownloadable;
 
-    CCMenu* m_buttonMenu = nullptr;
+    cocos2d::CCMenu* m_buttonMenu = nullptr;
     CCMenuItemSpriteExtra* m_fixButton = nullptr;
     CCMenuItemSpriteExtra* m_downloadButton = nullptr;
     CCMenuItemSpriteExtra* m_selectButton = nullptr;
-    CCMenu* m_downloadProgressContainer = nullptr;
-    CCProgressTimer* m_downloadProgress = nullptr;
-
-    EventListener<EventFilter<event::SongDownloadProgress>> m_progressListener{
-        this, &NongCell::onDownloadProgress};
-    EventListener<EventFilter<event::GetSongInfo>> m_songInfoListener{
-        this, &NongCell::onGetSongInfo};
-    EventListener<EventFilter<event::SongDownloadFinished>>
+    cocos2d::CCMenu* m_downloadProgressContainer = nullptr;
+    cocos2d::CCProgressTimer* m_downloadProgress = nullptr;
+
+    geode::EventListener<geode::EventFilter<event::SongDownloadProgress>>
+        m_progressListener{this, &NongCell::onDownloadProgress};
+    geode::EventListener<geode::EventFilter<event::GetSongInfo>>
+        m_songInfoListener{this, &NongCell::onGetSongInfo};
+    geode::EventListener<geode::EventFilter<event::SongDownloadFinished>>
         m_downloadSuccessListener{this, &NongCell::onDownloadFinish};
-    EventListener<EventFilter<event::SongDownloadFailed>>
+    geode::EventListener<geode::EventFilter<event::SongDownloadFailed>>
         m_downloadFailedListener{this, &NongCell::onDownloadFailed};
-    EventListener<EventFilter<event::SongStateChanged>> m_stateListener{
-        this, &NongCell::onStateChange};
+    geode::EventListener<geode::EventFilter<event::SongStateChanged>>
+        m_stateListener{this, &NongCell::onStateChange};
 
     bool init(int songID, Song*, bool isDefault, bool selected,
-              CCSize const& size, std::function<void()> onSelect,
+              const cocos2d::CCSize& size, std::function<void()> onSelect,
               std::function<void()> onDelete, std::function<void()> onDownload,
               std::function<void()> onEdit);
 
-    ListenerResult onDownloadProgress(event::SongDownloadProgress* e);
-    ListenerResult onGetSongInfo(event::GetSongInfo* e);
-    ListenerResult onDownloadFailed(event::SongDownloadFailed* e);
-    ListenerResult onDownloadFinish(event::SongDownloadFinished* e);
-    ListenerResult onStateChange(event::SongStateChanged* e);
+    geode::ListenerResult onDownloadProgress(event::SongDownloadProgress* e);
+    geode::ListenerResult onGetSongInfo(event::GetSongInfo* e);
+    geode::ListenerResult onDownloadFailed(event::SongDownloadFailed* e);
+    geode::ListenerResult onDownloadFinish(event::SongDownloadFinished* e);
+    geode::ListenerResult onStateChange(event::SongStateChanged* e);
 
 public:
     Song* m_songInfo = nullptr;
     static NongCell* create(int songID, Song* song, bool isDefault,
-                            bool selected, CCSize const& size,
+                            bool selected, const cocos2d::CCSize& size,
                             std::function<void()> onSelect,
                             std::function<void()> onDelete,
                             std::function<void()> onDownload,
diff --git a/jukebox/jukebox/ui/list/nong_list.hpp b/jukebox/jukebox/ui/list/nong_list.hpp
index 44ec5b8..f215eca 100644
--- a/jukebox/jukebox/ui/list/nong_list.hpp
+++ b/jukebox/jukebox/ui/list/nong_list.hpp
@@ -42,11 +42,11 @@ class NongList : public cocos2d::CCNode {
 
     std::vector<NongCell*> listedNongCells;
 
-    geode::EventListener<EventFilter<event::SongDownloadFinished>>
+    geode::EventListener<geode::EventFilter<event::SongDownloadFinished>>
         m_downloadFinishedListener = {this, &NongList::onDownloadFinish};
-    geode::EventListener<EventFilter<event::NongDeleted>>
+    geode::EventListener<geode::EventFilter<event::NongDeleted>>
         m_nongDeletedListener = {this, &NongList::onNongDeleted};
-    geode::EventListener<EventFilter<event::ManualSongAdded>>
+    geode::EventListener<geode::EventFilter<event::ManualSongAdded>>
         m_nongAddedListener = {this, &NongList::onSongAdded};
 
     static constexpr float s_padding = 10.0f;
diff --git a/jukebox/jukebox/ui/list/song_cell.hpp b/jukebox/jukebox/ui/list/song_cell.hpp
index f0221a4..d0828d9 100644
--- a/jukebox/jukebox/ui/list/song_cell.hpp
+++ b/jukebox/jukebox/ui/list/song_cell.hpp
@@ -10,27 +10,26 @@
 
 #include <jukebox/nong/nong.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class NongDropdownLayer;
 
-class SongCell : public CCNode {
+class SongCell : public cocos2d::CCNode {
 protected:
     SongMetadata* m_active;
-    CCLabelBMFont* m_songNameLabel;
-    CCLabelBMFont* m_authorNameLabel;
-    CCLabelBMFont* m_songIDLabel;
+    cocos2d::CCLabelBMFont* m_songNameLabel;
+    cocos2d::CCLabelBMFont* m_authorNameLabel;
+    cocos2d::CCLabelBMFont* m_songIDLabel;
     int m_songID;
 
     std::function<void()> m_callback;
 
-    bool init(int id, SongMetadata* songInfo, const CCSize& size,
+    bool init(int id, SongMetadata* songInfo, const cocos2d::CCSize& size,
               std::function<void()> selectCallback);
 
 public:
-    static SongCell* create(int id, SongMetadata* songInfo, const CCSize& size,
+    static SongCell* create(int id, SongMetadata* songInfo,
+                            const cocos2d::CCSize& size,
                             std::function<void()> selectCallback) {
         auto ret = new SongCell();
         if (ret && ret->init(id, songInfo, size, selectCallback)) {
diff --git a/jukebox/jukebox/ui/nong_add_popup.cpp b/jukebox/jukebox/ui/nong_add_popup.cpp
index 5712adf..020d3e2 100644
--- a/jukebox/jukebox/ui/nong_add_popup.cpp
+++ b/jukebox/jukebox/ui/nong_add_popup.cpp
@@ -41,6 +41,7 @@
 #include <jukebox/ui/index_choose_popup.hpp>
 #include <jukebox/utils/random_string.hpp>
 
+using namespace geode::prelude;
 using namespace jukebox::index;
 
 void setInputProps(TextInput* i) {
diff --git a/jukebox/jukebox/ui/nong_add_popup.hpp b/jukebox/jukebox/ui/nong_add_popup.hpp
index 280014d..ed34495 100644
--- a/jukebox/jukebox/ui/nong_add_popup.hpp
+++ b/jukebox/jukebox/ui/nong_add_popup.hpp
@@ -19,13 +19,11 @@
 #include <jukebox/nong/nong.hpp>
 #include <jukebox/ui/nong_dropdown_layer.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class NongDropdownLayer;
 
-class NongAddPopup : public Popup<int, std::optional<Song*>> {
+class NongAddPopup : public geode::Popup<int, std::optional<Song*>> {
 protected:
     enum class SongType {
         LOCAL,
@@ -47,13 +45,13 @@ class NongAddPopup : public Popup<int, std::optional<Song*>> {
 
     std::optional<std::filesystem::path> m_localPath = std::nullopt;
 
-    CCNode* m_container = nullptr;
-    TextInput* m_songNameInput = nullptr;
-    TextInput* m_artistNameInput = nullptr;
-    TextInput* m_levelNameInput = nullptr;
-    TextInput* m_startOffsetInput = nullptr;
+    cocos2d::CCNode* m_container = nullptr;
+    geode::TextInput* m_songNameInput = nullptr;
+    geode::TextInput* m_artistNameInput = nullptr;
+    geode::TextInput* m_levelNameInput = nullptr;
+    geode::TextInput* m_startOffsetInput = nullptr;
 
-    CCMenu* m_switchMenu = nullptr;
+    cocos2d::CCMenu* m_switchMenu = nullptr;
     ButtonSprite* m_switchLocalSpr = nullptr;
     CCMenuItemSpriteExtra* m_switchLocalButton = nullptr;
     ButtonSprite* m_switchYTSpr = nullptr;
@@ -61,32 +59,34 @@ class NongAddPopup : public Popup<int, std::optional<Song*>> {
     ButtonSprite* m_switchHostedSpr = nullptr;
     CCMenuItemSpriteExtra* m_switchHostedButton = nullptr;
 
-    CCNode* m_specialInfoNode = nullptr;
-    TextInput* m_specialInput = nullptr;
-    CCMenu* m_localSongMenu = nullptr;
+    cocos2d::CCNode* m_specialInfoNode = nullptr;
+    geode::TextInput* m_specialInput = nullptr;
+    cocos2d::CCMenu* m_localSongMenu = nullptr;
     CCMenuItemSpriteExtra* m_localSongButton = nullptr;
 
-    CCMenu* m_addSongMenu = nullptr;
+    cocos2d::CCMenu* m_addSongMenu = nullptr;
     CCMenuItemSpriteExtra* m_addSongButton = nullptr;
     CCMenuItemSpriteExtra* m_publishSongButton = nullptr;
 
     SongType m_songType;
 
-    EventListener<Task<Result<std::filesystem::path>>> m_pickListener;
+    geode::EventListener<geode::Task<geode::Result<std::filesystem::path>>>
+        m_pickListener;
 
     std::optional<Song*> m_replacedNong;
 
     bool setup(int songID, std::optional<Song*> replacedNong) override;
     void addPathLabel(std::string const& path);
-    void onFileOpen(Task<Result<std::filesystem::path>>::Event* event);
+    void onFileOpen(
+        geode::Task<geode::Result<std::filesystem::path>>::Event* event);
     void setSongType(SongType type);
-    void onSwitchToLocal(CCObject*);
-    void onSwitchToYT(CCObject*);
-    void onSwitchToHosted(CCObject*);
+    void onSwitchToLocal(cocos2d::CCObject*);
+    void onSwitchToYT(cocos2d::CCObject*);
+    void onSwitchToHosted(cocos2d::CCObject*);
 
-    CCSize getPopupSize();
-    void openFile(CCObject*);
-    void addSong(CCObject*);
+    cocos2d::CCSize getPopupSize();
+    void openFile(cocos2d::CCObject*);
+    void addSong(cocos2d::CCObject*);
     geode::Result<> addLocalSong(const std::string& songName,
                                  const std::string& artistName,
                                  const std::optional<std::string> levelName,
@@ -99,7 +99,7 @@ class NongAddPopup : public Popup<int, std::optional<Song*>> {
                                   const std::string& artistName,
                                   const std::optional<std::string> levelName,
                                   int offset);
-    void onPublish(CCObject*);
+    void onPublish(cocos2d::CCObject*);
     std::optional<ParsedMetadata> tryParseMetadata(std::filesystem::path path);
 
 public:
diff --git a/jukebox/jukebox/ui/nong_dropdown_layer.cpp b/jukebox/jukebox/ui/nong_dropdown_layer.cpp
index 1cd360f..ed5f2d2 100644
--- a/jukebox/jukebox/ui/nong_dropdown_layer.cpp
+++ b/jukebox/jukebox/ui/nong_dropdown_layer.cpp
@@ -29,6 +29,8 @@
 #include <jukebox/ui/list/nong_list.hpp>
 #include <jukebox/ui/nong_add_popup.hpp>
 
+using namespace geode::prelude;
+
 namespace jukebox {
 
 bool NongDropdownLayer::setup(std::vector<int> ids, CustomSongWidget* parent,
diff --git a/jukebox/jukebox/ui/nong_dropdown_layer.hpp b/jukebox/jukebox/ui/nong_dropdown_layer.hpp
index 991f28a..8b2b13a 100644
--- a/jukebox/jukebox/ui/nong_dropdown_layer.hpp
+++ b/jukebox/jukebox/ui/nong_dropdown_layer.hpp
@@ -19,26 +19,26 @@
 #include <jukebox/ui/list/song_cell.hpp>
 #include <jukebox/ui/nong_add_popup.hpp>
 
-using namespace geode::prelude;
-
 namespace jukebox {
 
 class NongDropdownLayer
-    : public Popup<std::vector<int>, CustomSongWidget*, int> {
+    : public geode::Popup<std::vector<int>, CustomSongWidget*, int> {
 protected:
     std::vector<int> m_songIDS;
     std::optional<int> m_currentSongID = std::nullopt;
     int m_defaultSongID;
-    Ref<CustomSongWidget> m_parentWidget;
+    geode::Ref<CustomSongWidget> m_parentWidget;
     NongList* m_list = nullptr;
 
     CCMenuItemSpriteExtra* m_addBtn = nullptr;
     CCMenuItemSpriteExtra* m_discordBtn = nullptr;
     CCMenuItemSpriteExtra* m_deleteBtn = nullptr;
 
-    EventListener<EventFilter<event::SongError>> m_songErrorListener;
-    EventListener<EventFilter<event::GetSongInfo>> m_songInfoListener;
-    EventListener<EventFilter<event::SongDownloadFailed>>
+    geode::EventListener<geode::EventFilter<jukebox::event::SongError>>
+        m_songErrorListener;
+    geode::EventListener<geode::EventFilter<jukebox::event::GetSongInfo>>
+        m_songInfoListener;
+    geode::EventListener<geode::EventFilter<jukebox::event::SongDownloadFailed>>
         m_downloadFailedListener;
 
     bool m_fetching = false;
@@ -46,15 +46,15 @@ class NongDropdownLayer
     bool setup(std::vector<int> ids, CustomSongWidget* parent,
                int defaultSongID) override;
     void createList();
-    CCSize getCellSize() const;
-    void deleteAllNongs(CCObject*);
-    void fetchSongFileHub(CCObject*);
-    void onSettings(CCObject*);
-    void openAddPopup(CCObject*);
+    cocos2d::CCSize getCellSize() const;
+    void deleteAllNongs(cocos2d::CCObject*);
+    void fetchSongFileHub(cocos2d::CCObject*);
+    void onSettings(cocos2d::CCObject*);
+    void openAddPopup(cocos2d::CCObject*);
 
 public:
     void onSelectSong(int songID);
-    void onDiscord(CCObject*);
+    void onDiscord(cocos2d::CCObject*);
     void setActiveSong(int gdSongID, const std::string& uniqueID);
     void deleteSong(int gdSongID, const std::string& uniqueID, bool onlyAudio,
                     bool confirm);