cleaner headers

Author: BlueWitherer

include/Events.hpp

@@ -2,14 +2,12 @@
 
 #include "Horrible.hpp"
 
-#include <Geode/Geode.hpp>
-
-using namespace geode::prelude;
+#include <Geode/loader/Event.hpp>
 
 // Container for Horrible Ideas API
 namespace horrible {
     // Event for option toggles
-    class HorribleOptionEvent : public Event {
+    class HorribleOptionEvent : public geode::Event {
     private:
         const std::string m_id; // Unique ID of the option
         const bool m_toggled; // Toggle boolean of the option
@@ -22,20 +20,20 @@ namespace horrible {
     };
 
     // Filter for option toggle event
-    class AWCW_HORRIBLE_API_DLL HorribleOptionEventFilter : public EventFilter<HorribleOptionEvent> {
+    class AWCW_HORRIBLE_API_DLL HorribleOptionEventFilter : public geode::EventFilter<HorribleOptionEvent> {
     private:
         const std::vector<std::string> m_ids; // Unique ID of the options to listen to
 
     public:
-        using Callback = ListenerResult(HorribleOptionEvent*);
+        using Callback = geode::ListenerResult(HorribleOptionEvent*);
 
         /**
          * Event handler
          *
          * @param fn Callback function containing a pointer to the event that fired
          * @param event Pointer to the event that fired
          */
-        ListenerResult handle(std::function<Callback> fn, HorribleOptionEvent* event);
+        geode::ListenerResult handle(std::function<Callback> fn, HorribleOptionEvent* event);
 
         HorribleOptionEventFilter() = default; // Constructor
         HorribleOptionEventFilter(std::string_view id); // Constructor (listens to one option's toggle)

include/Horrible.hpp

@@ -17,14 +17,12 @@
 #include "Events.hpp"
 #include "Option.hpp"
 
-#include <Geode/Geode.hpp>
-
-using namespace geode::prelude;
+#include <cocos2d.h>
 
 // Container for Horrible Ideas API functions
 namespace horrible {
     // Mod option manager for Horrible Ideas
-    class AWCW_HORRIBLE_API_DLL OptionManager : public CCObject {
+    class AWCW_HORRIBLE_API_DLL OptionManager : public cocos2d::CCObject {
     private:
         class Impl; // PImpl class
         std::unique_ptr<Impl> m_impl; // PImpl pointer

include/Option.hpp

@@ -4,8 +4,6 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 // Container for Horrible Ideas API
 namespace horrible {
     // How silly a mod option is
@@ -24,7 +22,7 @@ namespace horrible {
         std::string category; // Name of the category this option should be under
         SillyTier silly; // How silly the option is
         bool restart; // If the option requires a restart to take effect
-        std::vector<PlatformID> platforms; // Platforms that the option supports
+        std::vector<geode::PlatformID> platforms; // Platforms that the option supports
 
         Option() = default; // Default constructor
 
@@ -36,7 +34,7 @@ namespace horrible {
             std::string_view category,
             SillyTier silly = SillyTier::Low,
             bool restart = false,
-            std::vector<PlatformID> const& platforms = { PlatformID::Desktop, PlatformID::Mobile }
+            std::vector<geode::PlatformID> const& platforms = { geode::PlatformID::Desktop, geode::PlatformID::Mobile }
         ) : id(id),
             name(name),
             description(description),

include/OptionalAPI.hpp

@@ -2,19 +2,16 @@
 
 #include "Horrible.hpp"
 
-#include <Geode/Geode.hpp>
-
+#include <Geode/loader/Event.hpp>
 #include <Geode/loader/Dispatch.hpp>
 
 #ifdef MY_MOD_ID
 #undef MY_MOD_ID
 #endif
 #define MY_MOD_ID "arcticwoof.horrible_ideas"
 
-using namespace geode::prelude;
-
 namespace horrible {
-    class HorribleOptionEventV2 : public Event {
+    class HorribleOptionEventV2 : public geode::Event {
     private:
         const std::string m_id;
         const bool m_toggled;
@@ -27,19 +24,19 @@ namespace horrible {
         bool getToggled() const { return m_toggled; };
     };
 
-    class HorribleOptionEventFilterV2 : public EventFilter<HorribleOptionEventV2> {
+    class HorribleOptionEventFilterV2 : public geode::EventFilter<HorribleOptionEventV2> {
     private:
         const std::vector<std::string> m_ids;
 
     public:
-        using Callback = ListenerResult(HorribleOptionEventV2*);
+        using Callback = geode::ListenerResult(HorribleOptionEventV2*);
 
-        ListenerResult handle(std::function<Callback> fn, HorribleOptionEventV2* event) {
+        geode::ListenerResult handle(std::function<Callback> fn, HorribleOptionEventV2* event) {
             for (auto const& id : m_ids) {
                 if (event->getId() == id) return fn(event);
             };
 
-            return ListenerResult::Propagate;
+            return geode::ListenerResult::Propagate;
         };
 
         HorribleOptionEventFilterV2() = default;
@@ -49,13 +46,13 @@ namespace horrible {
 
     class OptionManagerV2 {
     public:
-        static Result<> registerOption(Option const& option)
+        static geode::Result<> registerOption(Option const& option)
             GEODE_EVENT_EXPORT(&OptionManagerV2::registerOption, (option));
 
-        static Result<bool> getOption(std::string_view id)
+        static geode::Result<bool> getOption(std::string_view id)
             GEODE_EVENT_EXPORT(&OptionManagerV2::getOption, (id));
 
-        static Result<bool> setOption(std::string_view id, bool enable)
+        static geode::Result<bool> setOption(std::string_view id, bool enable)
             GEODE_EVENT_EXPORT(&OptionManagerV2::setOption, (id, enable));
     };
 };

src/Keybinds.cpp

@@ -1,11 +1,8 @@
 #if !defined(GEODE_IS_IOS)
 #include <Utils.hpp>
 
-#include <Geode/Geode.hpp>
-
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 
-using namespace geode::prelude;
 using namespace horrible;
 using namespace keybinds;
 

src/Utils.hpp

@@ -6,6 +6,8 @@
 
 #include <Geode/Geode.hpp>
 
+#include <Geode/loader/SettingV3.hpp>
+
 #include <classes/Colors.hpp>
 #include <classes/Jumpscares.hpp>
 #include <classes/Menu.hpp>

src/hooks/Achievement.cpp

@@ -1,10 +1,6 @@
 #include <Utils.hpp>
-
-#include <Geode/Geode.hpp>
-
 #include <Geode/modify/CCMenuItem.hpp>
 
-using namespace geode::prelude;
 using namespace horrible;
 
 class $modify(AchievementCCMenuItem, CCMenuItem) {

src/hooks/Dementia.cpp

@@ -1,11 +1,8 @@
 #include <Utils.hpp>
 
-#include <Geode/Geode.hpp>
-
 #include <Geode/modify/PlayerObject.hpp>
 #include <Geode/modify/EnhancedGameObject.hpp>
 
-using namespace geode::prelude;
 using namespace horrible;
 
 class $modify(DementiaPlayerObject, PlayerObject) {

src/hooks/GJBaseGameLayer/FakeCrash.cpp

@@ -1,10 +1,7 @@
 #include <Utils.hpp>
 
-#include <Geode/Geode.hpp>
-
 #include <Geode/modify/GJBaseGameLayer.hpp>
 
-using namespace geode::prelude;
 using namespace horrible;
 
 class $modify(FakeCrashGJBaseGameLayer, GJBaseGameLayer) {

src/hooks/GJBaseGameLayer/RandomNoJump.cpp

@@ -1,10 +1,7 @@
 #include <Utils.hpp>
 
-#include <Geode/Geode.hpp>
-
 #include <Geode/modify/GJBaseGameLayer.hpp>
 
-using namespace geode::prelude;
 using namespace horrible;
 
 class $modify(NoJumpGJBaseGameLayer, GJBaseGameLayer) {