noexcept everywhere

BlueWitherer · BlueWitherer · commit 7b4120c0a519 · 2026-01-14T11:22:22.000-05:00
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A plethora of ways to ruin your gaming experience...
 ---
 
 ## About
-This silly lil' mod adds a mod menu filled to the brim with **over 30 crazy troll options** to mes around with! Spice up your gameplay by adding some truly terrible features to absolutely wreck your entire game.
+This silly lil' mod adds a mod menu filled to the brim with **over 35 crazy troll options** to mes around with! Spice up your gameplay by adding some truly terrible features to absolutely wreck your entire game.
 
 ---
 
diff --git a/about.md b/about.md
@@ -6,7 +6,7 @@
 ---
 
 ## About
-This silly lil' mod adds a mod menu filled to the brim with **over 30 crazy troll options** to mess around with! Spice up your gameplay by adding some truly terrible features to absolutely wreck your entire game.
+This silly lil' mod adds a mod menu filled to the brim with **over 35 crazy troll options** to mess around with! Spice up your gameplay by adding some truly terrible features to absolutely wreck your entire game.
 
 ---
 
diff --git a/include/Events.hpp b/include/Events.hpp
@@ -17,8 +17,8 @@ namespace horrible {
     public:
         OptionEvent(std::string id, bool toggled); // Constructor
 
-        AWCW_HORRIBLE_API_DLL std::string const& getId() const; // Get the unique ID of the option
-        AWCW_HORRIBLE_API_DLL bool getToggled() const; // Get the toggle boolean of the option
+        AWCW_HORRIBLE_API_DLL std::string_view getId() const noexcept; // Get the unique ID of the option
+        AWCW_HORRIBLE_API_DLL bool getToggled() const noexcept; // Get the toggle boolean of the option
     };
 
     // Filter for option toggle event
diff --git a/include/Horrible.hpp b/include/Horrible.hpp
@@ -45,13 +45,13 @@ namespace horrible {
          *
          * @returns Whether this option already exists or not
          */
-        bool doesOptionExist(std::string_view id) const;
+        bool doesOptionExist(std::string_view id) const noexcept;
 
         friend class OptionEventFilter;
 
     public:
         // Get option manager singleton
-        static OptionManager* get();
+        static OptionManager* get() noexcept;
 
         /**
          * Register a new option
@@ -65,7 +65,7 @@ namespace horrible {
          *
          * @returns An array of every registered option, main and external
          */
-        std::vector<Option> const& getOptions() const;
+        std::span<const Option> getOptions() const noexcept;
 
         /**
          * Returns the toggle state of an option
@@ -74,7 +74,7 @@ namespace horrible {
          *
          * @returns Boolean of the current value
          */
-        bool getOption(std::string_view id) const;
+        bool getOption(std::string_view id) const noexcept;
 
         /**
          * Set the toggle state of an option
@@ -84,13 +84,13 @@ namespace horrible {
          *
          * @returns Boolean of the old value
          */
-        bool setOption(std::string_view id, bool enable) const;
+        bool setOption(std::string_view id, bool enable) const noexcept;
 
         /**
          * Returns a reference to the array of all registered categories
          *
          * @returns An array of every category name
          */
-        std::vector<std::string> const& getCategories() const;
+        std::span<const std::string> getCategories() const noexcept;
     };
 };
diff --git a/include/OptionalAPI.hpp b/include/OptionalAPI.hpp
@@ -19,8 +19,8 @@ namespace horrible {
     public:
         OptionEventV2(std::string id, bool toggled) : m_id(std::move(id)), m_toggled(toggled) {};
 
-        std::string const& getId() const { return m_id; };
-        bool getToggled() const { return m_toggled; };
+        std::string_view getId() const noexcept { return m_id; };
+        bool getToggled() const noexcept { return m_toggled; };
     };
 
     class OptionEventFilterV2 : public geode::EventFilter<OptionEventV2> {
diff --git a/src/classes/Options.hpp b/src/classes/Options.hpp
@@ -11,7 +11,7 @@ namespace horrible {
              *
              * @returns An array of every registered option, main and external
              */
-            std::vector<horrible::Option> const& getAll();
+            std::span<const Option> getAll() noexcept;
 
             /**
              * Returns the toggle state of an option
@@ -20,7 +20,7 @@ namespace horrible {
              *
              * @returns Boolean of the current value
              */
-            bool get(std::string_view id);
+            bool get(std::string_view id) noexcept;
 
             /**
              * Returns the chance value for an option
@@ -46,14 +46,14 @@ namespace horrible {
              *
              * @returns An array of every registered option category, main and external
              */
-            std::vector<std::string> const& getAllCategories();
+            std::span<const std::string> getAllCategories() noexcept;
 
             /**
              * Returns if a category exists or not
              *
              * @param category The exact name of the category to check
              */
-            bool doesCategoryExist(std::string_view category);
+            bool doesCategoryExist(std::string_view category) noexcept;
         };
     };
 };
diff --git a/src/classes/src/Options.cpp b/src/classes/src/Options.cpp
@@ -5,14 +5,12 @@
 using namespace horrible;
 using namespace horrible::util;
 
-std::vector<Option> const& options::getAll() {
+std::span<const Option> options::getAll() noexcept {
     if (auto om = OptionManager::get()) return om->getOptions();
-
-    static const std::vector<Option> ret;
-    return ret;
+    return {};
 };
 
-bool options::get(std::string_view id) {
+bool options::get(std::string_view id) noexcept {
     if (auto om = OptionManager::get()) return om->getOption(id);
     return false;
 };
@@ -26,13 +24,14 @@ bool options::set(std::string_view id, bool enable) {
     return false;
 };
 
-std::vector<std::string> const& options::getAllCategories() {
+std::span<const std::string> options::getAllCategories() noexcept {
     if (auto om = OptionManager::get()) return om->getCategories();
 
     static const std::vector<std::string> ret;
     return ret;
 };
 
-bool options::doesCategoryExist(std::string_view category) {
-    return str::containsAny(category.data(), getAllCategories());
+bool options::doesCategoryExist(std::string_view category) noexcept {
+    auto cats = getAllCategories();
+    return str::containsAny(category.data(), { cats.begin(), cats.end() });
 };
diff --git a/src/classes/ui/MathQuiz.hpp b/src/classes/ui/MathQuiz.hpp
@@ -27,7 +27,7 @@ namespace horrible {
             void closeAfterFeedback(CCNode* node);
             void onAnswerClicked(CCObject* sender);
 
-            bool hasAnswer(int answer) const;
+            bool hasAnswer(int answer) const noexcept;
 
             void keyBackClicked() override;
             void update(float dt) override;
diff --git a/src/classes/ui/src/MathQuiz.cpp b/src/classes/ui/src/MathQuiz.cpp
@@ -299,7 +299,7 @@ void MathQuiz::onAnswerClicked(CCObject* sender) {
     };
 };
 
-bool MathQuiz::hasAnswer(int answer) const {
+bool MathQuiz::hasAnswer(int answer) const noexcept {
     for (auto const& a : m_impl->m_answers) {
         if (a == answer) return true;
     };
diff --git a/src/hooks/Achievement.cpp b/src/hooks/Achievement.cpp
@@ -18,6 +18,14 @@ class $modify(AchievementCCMenuItem, CCMenuItem) {
 
         auto f = m_fields.self();
 
+        this->template addEventListener<OptionEventFilter>(
+            [this, f](OptionEvent* ev) {
+                f->enabled = ev->getToggled();
+                return ListenerResult::Propagate;
+            },
+            "achieve"
+        );
+
         if (f->enabled) {
             if (auto fmod = FMODAudioEngine::sharedEngine()) {
                 int rnd = randng::fast();
diff --git a/src/hooks/Mock.cpp b/src/hooks/Mock.cpp
@@ -114,6 +114,20 @@ class $modify(MockPlayLayer, PlayLayer) {
         bool enabled = options::get("mock");
     };
 
+    void setupHasCompleted() {
+        PlayLayer::setupHasCompleted();
+
+        auto f = m_fields.self();
+
+        this->template addEventListener<OptionEventFilter>(
+            [this, f](OptionEvent* ev) {
+                f->enabled = ev->getToggled();
+                return ListenerResult::Propagate;
+            },
+            "mock"
+        );
+    };
+
     void showNewBest(bool newReward, int orbs, int diamonds, bool demonKey, bool noRetry, bool noTitle) {
         int id = m_level->m_levelID;
         int percentage = m_level->m_normalPercent;
diff --git a/src/include/Horrible.cpp b/src/include/Horrible.cpp
@@ -9,11 +9,11 @@ using namespace horrible;
 
 OptionEvent::OptionEvent(std::string id, bool toggled) : m_id(std::move(id)), m_toggled(toggled) {};
 
-std::string const& OptionEvent::getId() const {
+std::string_view OptionEvent::getId() const noexcept {
     return m_id;
 };
 
-bool OptionEvent::getToggled() const {
+bool OptionEvent::getToggled() const noexcept {
     return m_toggled;
 };
 
@@ -47,10 +47,11 @@ OptionManager::OptionManager() {
 OptionManager::~OptionManager() {};
 
 void OptionManager::registerCategory(std::string_view category) {
-    if (!utils::string::containsAny(category.data(), getCategories())) m_impl->categories.push_back(category.data());
+    auto cats = getCategories();
+    if (!utils::string::containsAny(category.data(), { cats.begin(), cats.end() })) m_impl->categories.push_back(category.data());
 };
 
-bool OptionManager::doesOptionExist(std::string_view id) const {
+bool OptionManager::doesOptionExist(std::string_view id) const noexcept {
     for (auto const& option : getOptions()) if (option.id == id) return true;
     return false;
 };
@@ -66,19 +67,19 @@ void OptionManager::registerOption(Option const& option) {
     };
 };
 
-std::vector<Option> const& OptionManager::getOptions() const {
+std::span<const Option> OptionManager::getOptions() const noexcept {
     return m_impl->options;
 };
 
-std::vector<std::string> const& OptionManager::getCategories() const {
+std::span<const std::string> OptionManager::getCategories() const noexcept {
     return m_impl->categories;
 };
 
-bool OptionManager::getOption(std::string_view id) const {
+bool OptionManager::getOption(std::string_view id) const noexcept {
     return Mod::get()->getSavedValue<bool>(id.data(), false);
 };
 
-bool OptionManager::setOption(std::string_view id, bool enable) const {
+bool OptionManager::setOption(std::string_view id, bool enable) const noexcept {
     auto event = new OptionEvent(id.data(), enable);
     event->postFromMod(Mod::get());
 
@@ -88,7 +89,7 @@ bool OptionManager::setOption(std::string_view id, bool enable) const {
     return Mod::get()->setSavedValue(id.data(), enable);
 };
 
-OptionManager* OptionManager::get() {
+OptionManager* OptionManager::get() noexcept {
     static auto inst = new OptionManager();
     return inst;
 };
diff --git a/src/main.cpp b/src/main.cpp
@@ -292,9 +292,7 @@ static std::vector<Option> defOpts = {
     if (auto om = OptionManager::get()) {
         log::debug("Registering {} default options...", defOpts.size());
 
-        for (auto const& option : defOpts) {
-            om->registerOption(option);
-        };
+        for (auto const& option : defOpts) om->registerOption(option);
 
         log::info("Done registering {} default options!", defOpts.size());
 
@@ -370,10 +368,14 @@ class $modify(HIPlayLayer, PlayLayer) {
 
     // safe mode prevents level completion
     void levelComplete() {
-        if (m_fields->safeMode) {
+        auto f = m_fields.self();
+
+        if (f->safeMode) {
+            log::info("Safe mode is enabled");
+
             bool testMode = m_isTestMode;
 
-            m_isTestMode = true;
+            m_isTestMode = f->safeMode;
             PlayLayer::levelComplete();
             m_isTestMode = testMode;
         } else {
diff --git a/src/menu/OptionCategoryItem.hpp b/src/menu/OptionCategoryItem.hpp
@@ -13,8 +13,8 @@ class CategoryEvent : public Event {
 public:
     CategoryEvent(std::string id, bool enabled = false);
 
-    std::string const& getId() const;
-    bool isEnabled() const;
+    std::string_view getId() const noexcept;
+    bool isEnabled() const noexcept;
 };
 
 // Filter for option toggle event
diff --git a/src/menu/OptionItem.hpp b/src/menu/OptionItem.hpp
@@ -27,6 +27,6 @@ class OptionItem : public CCMenu {
 public:
     static OptionItem* create(CCSize const& size, Option const& option);
 
-    Option getOption() const;
-    bool isCompatible() const;
+    Option getOption() const noexcept;
+    bool isCompatible() const noexcept;
 };
diff --git a/src/menu/OptionMenuButton.hpp b/src/menu/OptionMenuButton.hpp
@@ -20,7 +20,7 @@ class OptionMenuButton : public CCLayer {
     static OptionMenuButton* create();
 
 public:
-    static OptionMenuButton* get();
+    static OptionMenuButton* get() noexcept;
 
     void setOpacity(GLubyte opacity);
     void setShowInLevel(bool show);
@@ -35,7 +35,7 @@ class OptionMenuButton : public CCLayer {
     virtual void ccTouchMoved(CCTouch* touch, CCEvent* event) override;
     virtual void ccTouchEnded(CCTouch* touch, CCEvent* event) override;
 
-    int64_t getOpacitySetting() const;
-    float getScaleSetting() const;
-    bool showInLevel() const;
+    int64_t getOpacitySetting() const noexcept;
+    float getScaleSetting() const noexcept;
+    bool showInLevel() const noexcept;
 };
diff --git a/src/menu/OptionMenuPopup.hpp b/src/menu/OptionMenuPopup.hpp
@@ -9,17 +9,17 @@
 using namespace geode::prelude;
 using namespace horrible;
 
-struct FilterBtnInfo {
-    SillyTier tier;
-    const char* label;
-    ccColor3B color;
-};
-
 class OptionMenuPopup : public Popup<> {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;
 
+    struct SillyFilter {
+        SillyTier tier;
+        const char* label;
+        ccColor3B color;
+    };
+
 protected:
     static OptionMenuPopup* s_inst;
 
@@ -43,7 +43,7 @@ class OptionMenuPopup : public Popup<> {
 
     ListenerResult OnCategory(std::string_view category, bool enabled = true);
 
-    void filterOptions(std::vector<Option> const& optList, SillyTier tier = SillyTier::None, std::string_view category = "");
+    void filterOptions(std::span<const Option>  optList, SillyTier tier = SillyTier::None, std::string_view category = "");
     void filterTierCallback(CCObject*);
 
     void resetFilters(CCObject*);
@@ -61,5 +61,5 @@ class OptionMenuPopup : public Popup<> {
 public:
     static OptionMenuPopup* create();
 
-    static OptionMenuPopup* get();
+    static OptionMenuPopup* get() noexcept;
 };
diff --git a/src/menu/src/OptionCategoryItem.cpp b/src/menu/src/OptionCategoryItem.cpp
diff --git a/src/menu/src/OptionItem.cpp b/src/menu/src/OptionItem.cpp
diff --git a/src/menu/src/OptionMenuButton.cpp b/src/menu/src/OptionMenuButton.cpp
diff --git a/src/menu/src/OptionMenuPopup.cpp b/src/menu/src/OptionMenuPopup.cpp
